diff --git a/package-lock.json b/package-lock.json
index ce928f9ced..7ebfdbb50e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -183,7 +183,7 @@
         "sass-loader": "^10.5.2",
         "speed-measure-webpack-plugin": "^1.5.0",
         "storybook": "^9.0.0-beta.11",
-        "storybook-addon-remix-react-router": "^3.1",
+        "storybook-addon-remix-react-router": "^5.0",
         "storybook-dark-mode": "^4.0.2",
         "style-loader": "^3.3.4",
         "stylelint": "^15.11.0",
@@ -4450,6 +4450,30 @@
         "react": ">=16"
       }
     },
+    "node_modules/@mjackson/form-data-parser": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@mjackson/form-data-parser/-/form-data-parser-0.4.0.tgz",
+      "integrity": "sha512-zDQ0sFfXqn2bJaZ/ypXfGUe0lUjCzXybBHYEoyWaO2w1dZ0nOM9nRER8tVVv3a8ZIgO/zF6p2I5ieWJAUOzt3w==",
+      "dev": true,
+      "dependencies": {
+        "@mjackson/multipart-parser": "^0.6.1"
+      }
+    },
+    "node_modules/@mjackson/headers": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/@mjackson/headers/-/headers-0.5.1.tgz",
+      "integrity": "sha512-sJpFgecPT/zJvwk3GRNVWNs8EkwaJoUNU2D0VMlp+gDJs6cuSTm1q/aCZi3ZtuV6CgDEQ4l2ZjUG3A9JrQlbNA==",
+      "dev": true
+    },
+    "node_modules/@mjackson/multipart-parser": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/@mjackson/multipart-parser/-/multipart-parser-0.6.3.tgz",
+      "integrity": "sha512-aQhySnM6OpAYMMG+m7LEygYye99hB1md/Cy1AFE0yD5hfNW+X4JDu7oNVY9Gc6IW8PZ45D1rjFLDIUdnkXmwrA==",
+      "dev": true,
+      "dependencies": {
+        "@mjackson/headers": "^0.5.0"
+      }
+    },
     "node_modules/@mswjs/interceptors": {
       "version": "0.39.5",
       "resolved": "https://registry.npmjs.org/@mswjs/interceptors/-/interceptors-0.39.5.tgz",
@@ -5242,35 +5266,6 @@
         "node": ">=18"
       }
     },
-    "node_modules/@storybook/blocks": {
-      "version": "8.6.3",
-      "resolved": "https://registry.npmjs.org/@storybook/blocks/-/blocks-8.6.3.tgz",
-      "integrity": "sha512-Ieu6kwqdeAcrLzcX2QIqnCd0XWZi46i4eem8W54JRiOMQMYUpZ7onbciRAP58qxEWrZWqgxPS+tiCTaJe48VVQ==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "@storybook/icons": "^1.2.12",
-        "ts-dedent": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
-        "storybook": "^8.6.3"
-      },
-      "peerDependenciesMeta": {
-        "react": {
-          "optional": true
-        },
-        "react-dom": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@storybook/builder-webpack5": {
       "version": "9.0.18",
       "resolved": "https://registry.npmjs.org/@storybook/builder-webpack5/-/builder-webpack5-9.0.18.tgz",
@@ -5432,21 +5427,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/@storybook/channels": {
-      "version": "8.6.12",
-      "resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-8.6.12.tgz",
-      "integrity": "sha512-31hhRuAcEJjb8whU9nlbStD/5SK2lPW3dDfJLg8+LqHh8MadXKPXbZYG08oETrP53jZadVPhhZU6th1duF2Gcg==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
-      },
-      "peerDependencies": {
-        "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0"
-      }
-    },
     "node_modules/@storybook/components": {
       "version": "8.6.3",
       "resolved": "https://registry.npmjs.org/@storybook/components/-/components-8.6.3.tgz",
@@ -5671,21 +5651,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@storybook/preview-api": {
-      "version": "8.6.3",
-      "resolved": "https://registry.npmjs.org/@storybook/preview-api/-/preview-api-8.6.3.tgz",
-      "integrity": "sha512-y2Ic6eHBQD/AwaCHctKOJ4tOM1r7/mPXfhGh0I+Qf8kZPlDTgQcJ6Z7/Ruma1L+ijXPBWouDaPw51gipcX+t9Q==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
-      },
-      "peerDependencies": {
-        "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0"
-      }
-    },
     "node_modules/@storybook/react": {
       "version": "9.0.18",
       "resolved": "https://registry.npmjs.org/@storybook/react/-/react-9.0.18.tgz",
@@ -24523,26 +24488,21 @@
       }
     },
     "node_modules/storybook-addon-remix-react-router": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/storybook-addon-remix-react-router/-/storybook-addon-remix-react-router-3.1.0.tgz",
-      "integrity": "sha512-h6cOD+afyAddNrDz5ezoJGV6GBSeH7uh92VAPDz+HLuay74Cr9Ozz+aFmlzMEyVJ1hhNIMOIWDsmK56CueZjsw==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/storybook-addon-remix-react-router/-/storybook-addon-remix-react-router-5.0.0.tgz",
+      "integrity": "sha512-XjNGLD8vhI7DhjPgkjkU9rjqjF6YSRvRjBignwo2kCGiz5HIR4TZTDRRABuwYo35/GoC2aMtxFs7zybJ4pVlsg==",
       "dev": true,
-      "license": "Apache-2.0",
+      "hasInstallScript": true,
       "dependencies": {
+        "@mjackson/form-data-parser": "^0.4.0",
         "compare-versions": "^6.0.0",
         "react-inspector": "6.0.2"
       },
       "peerDependencies": {
-        "@storybook/blocks": "^8.0.0",
-        "@storybook/channels": "^8.0.0",
-        "@storybook/components": "^8.0.0",
-        "@storybook/core-events": "^8.0.0",
-        "@storybook/manager-api": "^8.0.0",
-        "@storybook/preview-api": "^8.0.0",
-        "@storybook/theming": "^8.0.0",
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
         "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
-        "react-router-dom": "^6.4.0 || ^7.0.0"
+        "react-router": "^7.0.2",
+        "storybook": "^9.0.0"
       },
       "peerDependenciesMeta": {
         "react": {
@@ -31002,6 +30962,30 @@
         "@types/mdx": "^2.0.0"
       }
     },
+    "@mjackson/form-data-parser": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@mjackson/form-data-parser/-/form-data-parser-0.4.0.tgz",
+      "integrity": "sha512-zDQ0sFfXqn2bJaZ/ypXfGUe0lUjCzXybBHYEoyWaO2w1dZ0nOM9nRER8tVVv3a8ZIgO/zF6p2I5ieWJAUOzt3w==",
+      "dev": true,
+      "requires": {
+        "@mjackson/multipart-parser": "^0.6.1"
+      }
+    },
+    "@mjackson/headers": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/@mjackson/headers/-/headers-0.5.1.tgz",
+      "integrity": "sha512-sJpFgecPT/zJvwk3GRNVWNs8EkwaJoUNU2D0VMlp+gDJs6cuSTm1q/aCZi3ZtuV6CgDEQ4l2ZjUG3A9JrQlbNA==",
+      "dev": true
+    },
+    "@mjackson/multipart-parser": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/@mjackson/multipart-parser/-/multipart-parser-0.6.3.tgz",
+      "integrity": "sha512-aQhySnM6OpAYMMG+m7LEygYye99hB1md/Cy1AFE0yD5hfNW+X4JDu7oNVY9Gc6IW8PZ45D1rjFLDIUdnkXmwrA==",
+      "dev": true,
+      "requires": {
+        "@mjackson/headers": "^0.5.0"
+      }
+    },
     "@mswjs/interceptors": {
       "version": "0.39.5",
       "resolved": "https://registry.npmjs.org/@mswjs/interceptors/-/interceptors-0.39.5.tgz",
@@ -31461,17 +31445,6 @@
         "swc-loader": "^0.2.6"
       }
     },
-    "@storybook/blocks": {
-      "version": "8.6.3",
-      "resolved": "https://registry.npmjs.org/@storybook/blocks/-/blocks-8.6.3.tgz",
-      "integrity": "sha512-Ieu6kwqdeAcrLzcX2QIqnCd0XWZi46i4eem8W54JRiOMQMYUpZ7onbciRAP58qxEWrZWqgxPS+tiCTaJe48VVQ==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "@storybook/icons": "^1.2.12",
-        "ts-dedent": "^2.0.0"
-      }
-    },
     "@storybook/builder-webpack5": {
       "version": "9.0.18",
       "resolved": "https://registry.npmjs.org/@storybook/builder-webpack5/-/builder-webpack5-9.0.18.tgz",
@@ -31581,14 +31554,6 @@
         }
       }
     },
-    "@storybook/channels": {
-      "version": "8.6.12",
-      "resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-8.6.12.tgz",
-      "integrity": "sha512-31hhRuAcEJjb8whU9nlbStD/5SK2lPW3dDfJLg8+LqHh8MadXKPXbZYG08oETrP53jZadVPhhZU6th1duF2Gcg==",
-      "dev": true,
-      "peer": true,
-      "requires": {}
-    },
     "@storybook/components": {
       "version": "8.6.3",
       "resolved": "https://registry.npmjs.org/@storybook/components/-/components-8.6.3.tgz",
@@ -31717,14 +31682,6 @@
         }
       }
     },
-    "@storybook/preview-api": {
-      "version": "8.6.3",
-      "resolved": "https://registry.npmjs.org/@storybook/preview-api/-/preview-api-8.6.3.tgz",
-      "integrity": "sha512-y2Ic6eHBQD/AwaCHctKOJ4tOM1r7/mPXfhGh0I+Qf8kZPlDTgQcJ6Z7/Ruma1L+ijXPBWouDaPw51gipcX+t9Q==",
-      "dev": true,
-      "peer": true,
-      "requires": {}
-    },
     "@storybook/react": {
       "version": "9.0.18",
       "resolved": "https://registry.npmjs.org/@storybook/react/-/react-9.0.18.tgz",
@@ -45369,11 +45326,12 @@
       }
     },
     "storybook-addon-remix-react-router": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/storybook-addon-remix-react-router/-/storybook-addon-remix-react-router-3.1.0.tgz",
-      "integrity": "sha512-h6cOD+afyAddNrDz5ezoJGV6GBSeH7uh92VAPDz+HLuay74Cr9Ozz+aFmlzMEyVJ1hhNIMOIWDsmK56CueZjsw==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/storybook-addon-remix-react-router/-/storybook-addon-remix-react-router-5.0.0.tgz",
+      "integrity": "sha512-XjNGLD8vhI7DhjPgkjkU9rjqjF6YSRvRjBignwo2kCGiz5HIR4TZTDRRABuwYo35/GoC2aMtxFs7zybJ4pVlsg==",
       "dev": true,
       "requires": {
+        "@mjackson/form-data-parser": "^0.4.0",
         "compare-versions": "^6.0.0",
         "react-inspector": "6.0.2"
       }
diff --git a/package.json b/package.json
index 5d5c9181c8..592624aacd 100644
--- a/package.json
+++ b/package.json
@@ -179,7 +179,7 @@
     "sass-loader": "^10.5.2",
     "speed-measure-webpack-plugin": "^1.5.0",
     "storybook": "^9.0.0-beta.11",
-    "storybook-addon-remix-react-router": "^3.1",
+    "storybook-addon-remix-react-router": "^5.0",
     "storybook-dark-mode": "^4.0.2",
     "style-loader": "^3.3.4",
     "stylelint": "^15.11.0",