diff --git a/.yarn/cache/mini-create-react-context-npm-0.4.1-06f382591b-f8cb2c7738.zip b/.yarn/cache/mini-create-react-context-npm-0.4.1-06f382591b-f8cb2c7738.zip
deleted file mode 100644
index d4a3699a4ac..00000000000
Binary files a/.yarn/cache/mini-create-react-context-npm-0.4.1-06f382591b-f8cb2c7738.zip and /dev/null differ
diff --git a/.yarn/cache/path-to-regexp-npm-1.8.0-a1904f5c44-709f6f083c.zip b/.yarn/cache/path-to-regexp-npm-1.8.0-a1904f5c44-709f6f083c.zip
deleted file mode 100644
index 3528453a618..00000000000
Binary files a/.yarn/cache/path-to-regexp-npm-1.8.0-a1904f5c44-709f6f083c.zip and /dev/null differ
diff --git a/.yarn/cache/react-router-dom-npm-5.3.0-aa9adb5bec-47584fd629.zip b/.yarn/cache/react-router-dom-npm-5.3.0-aa9adb5bec-47584fd629.zip
deleted file mode 100644
index dc607b9dcc7..00000000000
Binary files a/.yarn/cache/react-router-dom-npm-5.3.0-aa9adb5bec-47584fd629.zip and /dev/null differ
diff --git a/.yarn/cache/react-router-dom-npm-6.1.1-33b6fb184b-211d9c4bb9.zip b/.yarn/cache/react-router-dom-npm-6.1.1-33b6fb184b-211d9c4bb9.zip
new file mode 100644
index 00000000000..bc1cb186b9e
Binary files /dev/null and b/.yarn/cache/react-router-dom-npm-6.1.1-33b6fb184b-211d9c4bb9.zip differ
diff --git a/.yarn/cache/react-router-npm-5.2.1-ea754d7473-7daae084bf.zip b/.yarn/cache/react-router-npm-5.2.1-ea754d7473-7daae084bf.zip
deleted file mode 100644
index 224f8698c02..00000000000
Binary files a/.yarn/cache/react-router-npm-5.2.1-ea754d7473-7daae084bf.zip and /dev/null differ
diff --git a/.yarn/cache/react-router-npm-6.1.1-d51e81ed1c-d290d4646b.zip b/.yarn/cache/react-router-npm-6.1.1-d51e81ed1c-d290d4646b.zip
new file mode 100644
index 00000000000..7c866b02437
Binary files /dev/null and b/.yarn/cache/react-router-npm-6.1.1-d51e81ed1c-d290d4646b.zip differ
diff --git a/package.json b/package.json
index cd341147ad8..6bf98214f43 100644
--- a/package.json
+++ b/package.json
@@ -146,9 +146,9 @@
     "react-dom": "17.0.2",
     "react-helmet": "6.1.0",
     "react-lazyload": "3.2.0",
-    "react-router": "5.2.1",
+    "react-router": "6.1.1",
     "react-router-config": "5.1.1",
-    "react-router-dom": "5.3.0",
+    "react-router-dom": "6.1.1",
     "url-parse": "1.5.3",
     "uuid": "8.3.2",
     "winston": "3.3.3"
diff --git a/yarn.lock b/yarn.lock
index ee9e2887125..e0100fcdc15 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12478,7 +12478,7 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"history@npm:4.10.1, history@npm:^4.9.0":
+"history@npm:4.10.1":
   version: 4.10.1
   resolution: "history@npm:4.10.1"
   dependencies:
@@ -12521,7 +12521,7 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"hoist-non-react-statics@npm:^3.1.0, hoist-non-react-statics@npm:^3.3.0, hoist-non-react-statics@npm:^3.3.1":
+"hoist-non-react-statics@npm:^3.3.0, hoist-non-react-statics@npm:^3.3.1":
   version: 3.3.2
   resolution: "hoist-non-react-statics@npm:3.3.2"
   dependencies:
@@ -15076,7 +15076,7 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"loose-envify@npm:^1.0.0, loose-envify@npm:^1.1.0, loose-envify@npm:^1.2.0, loose-envify@npm:^1.3.1, loose-envify@npm:^1.4.0":
+"loose-envify@npm:^1.0.0, loose-envify@npm:^1.1.0, loose-envify@npm:^1.2.0, loose-envify@npm:^1.4.0":
   version: 1.4.0
   resolution: "loose-envify@npm:1.4.0"
   dependencies:
@@ -15637,19 +15637,6 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"mini-create-react-context@npm:^0.4.0":
-  version: 0.4.1
-  resolution: "mini-create-react-context@npm:0.4.1"
-  dependencies:
-    "@babel/runtime": ^7.12.1
-    tiny-warning: ^1.0.3
-  peerDependencies:
-    prop-types: ^15.0.0
-    react: ^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
-  checksum: f8cb2c7738aac355fe9ce7e8425f371b7fa90daddd5133edda4ccfdc18c49043b2ec04be6f3abf09b60a0f52549d54f158d5bfd81cdfb1a658531e5b9fe7bc6a
-  languageName: node
-  linkType: hard
-
 "minimalistic-assert@npm:^1.0.0, minimalistic-assert@npm:^1.0.1":
   version: 1.0.1
   resolution: "minimalistic-assert@npm:1.0.1"
@@ -17070,15 +17057,6 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"path-to-regexp@npm:^1.7.0":
-  version: 1.8.0
-  resolution: "path-to-regexp@npm:1.8.0"
-  dependencies:
-    isarray: 0.0.1
-  checksum: 709f6f083c0552514ef4780cb2e7e4cf49b0cc89a97439f2b7cc69a608982b7690fb5d1720a7473a59806508fc2dae0be751ba49f495ecf89fd8fbc62abccbcd
-  languageName: node
-  linkType: hard
-
 "path-to-regexp@npm:^2.2.1":
   version: 2.4.0
   resolution: "path-to-regexp@npm:2.4.0"
@@ -18282,20 +18260,16 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"react-router-dom@npm:5.3.0":
-  version: 5.3.0
-  resolution: "react-router-dom@npm:5.3.0"
+"react-router-dom@npm:6.1.1":
+  version: 6.1.1
+  resolution: "react-router-dom@npm:6.1.1"
   dependencies:
-    "@babel/runtime": ^7.12.13
-    history: ^4.9.0
-    loose-envify: ^1.3.1
-    prop-types: ^15.6.2
-    react-router: 5.2.1
-    tiny-invariant: ^1.0.2
-    tiny-warning: ^1.0.0
+    history: ^5.1.0
+    react-router: 6.1.1
   peerDependencies:
-    react: ">=15"
-  checksum: 47584fd629ecca52398d7888cab193b8a74057cc99a7ef44410c405d4082f618c3c0399db5325bc3524f9c511404086169570013b61a94dfa6acdfdc850d7a1f
+    react: ">=16.8"
+    react-dom: ">=16.8"
+  checksum: 211d9c4bb94037a7c8654506fcfd535bccfc11812204fd1743b1871d63da61cdaccd12d65a95a7ac4a53ad79b35e7d52f5d2a5925587d4ca1bc5f234805bab1c
   languageName: node
   linkType: hard
 
@@ -18312,26 +18286,6 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"react-router@npm:5.2.1":
-  version: 5.2.1
-  resolution: "react-router@npm:5.2.1"
-  dependencies:
-    "@babel/runtime": ^7.12.13
-    history: ^4.9.0
-    hoist-non-react-statics: ^3.1.0
-    loose-envify: ^1.3.1
-    mini-create-react-context: ^0.4.0
-    path-to-regexp: ^1.7.0
-    prop-types: ^15.6.2
-    react-is: ^16.6.0
-    tiny-invariant: ^1.0.2
-    tiny-warning: ^1.0.0
-  peerDependencies:
-    react: ">=15"
-  checksum: 7daae084bf64531eb619cc5f4cc40ce5ae0a541b64f71d74ec71a38cbf6130ebdbb7cf38f157303fad5846deec259401f96c4d6c7386466dcc989719e01f9aaa
-  languageName: node
-  linkType: hard
-
 "react-router@npm:6.0.2, react-router@npm:^6.0.0":
   version: 6.0.2
   resolution: "react-router@npm:6.0.2"
@@ -18343,6 +18297,17 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
+"react-router@npm:6.1.1":
+  version: 6.1.1
+  resolution: "react-router@npm:6.1.1"
+  dependencies:
+    history: ^5.1.0
+  peerDependencies:
+    react: ">=16.8"
+  checksum: d290d4646b894f8166797b65d298950c63b7c841ff954c8fe7dc1bd469714402611bff52da17c8c69c793c952e22c2123925615a594b57b474e7f52bf8c6a77b
+  languageName: node
+  linkType: hard
+
 "react-select@npm:^3.2.0":
   version: 3.2.0
   resolution: "react-select@npm:3.2.0"
@@ -19701,9 +19666,9 @@ resolve@^2.0.0-next.3:
     react-dom: 17.0.2
     react-helmet: 6.1.0
     react-lazyload: 3.2.0
-    react-router: 5.2.1
+    react-router: 6.1.1
     react-router-config: 5.1.1
-    react-router-dom: 5.3.0
+    react-router-dom: 6.1.1
     react-test-renderer: 17.0.2
     retry: 0.13.1
     start-server-nestjs-webpack-plugin: 2.2.5
@@ -21061,7 +21026,7 @@ resolve@^2.0.0-next.3:
   languageName: node
   linkType: hard
 
-"tiny-warning@npm:^1.0.0, tiny-warning@npm:^1.0.3":
+"tiny-warning@npm:^1.0.0":
   version: 1.0.3
   resolution: "tiny-warning@npm:1.0.3"
   checksum: da62c4acac565902f0624b123eed6dd3509bc9a8d30c06e017104bedcf5d35810da8ff72864400ad19c5c7806fc0a8323c68baf3e326af7cb7d969f846100d71