diff --git a/packages/core-components/package.json b/packages/core-components/package.json
index 40b31f5a8d..90ee920e7d 100644
--- a/packages/core-components/package.json
+++ b/packages/core-components/package.json
@@ -113,6 +113,7 @@
     "@types/react-virtualized-auto-sizer": "^1.0.1",
     "@types/react-window": "^1.8.5",
     "@types/zen-observable": "^0.8.0",
+    "backstage-storybook": "workspace:^",
     "cross-fetch": "^4.0.0",
     "history": "^5.0.0",
     "msw": "^1.0.0",
diff --git a/packages/core-components/src/components/Dialog/Dialog.stories.tsx b/packages/core-components/src/components/Dialog/Dialog.stories.tsx
index 96ba7e7a1e..4f2e7c0858 100644
--- a/packages/core-components/src/components/Dialog/Dialog.stories.tsx
+++ b/packages/core-components/src/components/Dialog/Dialog.stories.tsx
@@ -25,7 +25,7 @@ import Typography from '@material-ui/core/Typography';
 import { makeStyles, createStyles, Theme } from '@material-ui/core/styles';
 import CloseIcon from '@material-ui/icons/Close';
 
-import type { Meta, StoryObj } from '@storybook/react';
+import type { Meta, StoryObj } from 'backstage-storybook';
 
 const meta = {
   title: 'Layout/Dialog',
diff --git a/storybook/package.json b/storybook/package.json
index d412ee2030..6b08915999 100644
--- a/storybook/package.json
+++ b/storybook/package.json
@@ -4,6 +4,7 @@
   "description": "Storybook build for components package",
   "private": true,
   "type": "module",
+  "main": "index.mjs",
   "scripts": {
     "build-storybook": "storybook build --output-dir dist",
     "storybook": "storybook dev -p 6006"
@@ -13,10 +14,6 @@
       "plugin:storybook/recommended"
     ]
   },
-  "dependencies": {
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1"
-  },
   "devDependencies": {
     "@chromatic-com/storybook": "^1.9.0",
     "@storybook/addon-essentials": "^8.3.5",
@@ -27,12 +24,27 @@
     "@storybook/react": "^8.3.5",
     "@storybook/react-vite": "^8.3.5",
     "@storybook/test": "^8.3.5",
+    "@types/react": "^18.0.0",
     "eslint": "^9.11.1",
     "eslint-plugin-storybook": "^0.9.0",
     "globals": "^15.9.0",
+    "react": "^18.0.2",
+    "react-dom": "^18.0.2",
+    "react-router-dom": "^6.3.0",
     "storybook": "^8.3.5",
     "typescript": "^5.5.3",
     "typescript-eslint": "^8.7.0",
     "vite": "^5.4.8"
+  },
+  "peerDependencies": {
+    "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0",
+    "react": "^16.13.1 || ^17.0.0 || ^18.0.0",
+    "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0",
+    "react-router-dom": "6.0.0-beta.0 || ^6.3.0"
+  },
+  "peerDependenciesMeta": {
+    "@types/react": {
+      "optional": true
+    }
   }
 }
diff --git a/storybook/yarn.lock b/storybook/yarn.lock
index edb48e79c6..9c09905e18 100644
--- a/storybook/yarn.lock
+++ b/storybook/yarn.lock
@@ -819,6 +819,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@remix-run/router@npm:1.20.0":
+  version: 1.20.0
+  resolution: "@remix-run/router@npm:1.20.0"
+  checksum: 6bff41117eabb867b17c89baa727580f0a431368b309cd9a1f69767aafa68ea9cac95ff0eeb86d37c2c8655f5cd7c6283d37ae5e6d93e94f648c6112ddb24ede
+  languageName: node
+  linkType: hard
+
 "@rollup/pluginutils@npm:^5.0.2":
   version: 5.1.2
   resolution: "@rollup/pluginutils@npm:5.1.2"
@@ -1654,7 +1661,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react@npm:^16.8.0 || ^17.0.0 || ^18.0.0":
+"@types/react@npm:^16.8.0 || ^17.0.0 || ^18.0.0, @types/react@npm:^18.0.0":
   version: 18.3.11
   resolution: "@types/react@npm:18.3.11"
   dependencies:
@@ -2164,15 +2171,25 @@ __metadata:
     "@storybook/react": ^8.3.5
     "@storybook/react-vite": ^8.3.5
     "@storybook/test": ^8.3.5
+    "@types/react": ^18.0.0
     eslint: ^9.11.1
     eslint-plugin-storybook: ^0.9.0
     globals: ^15.9.0
-    react: ^18.3.1
-    react-dom: ^18.3.1
+    react: ^18.0.2
+    react-dom: ^18.0.2
+    react-router-dom: ^6.3.0
     storybook: ^8.3.5
     typescript: ^5.5.3
     typescript-eslint: ^8.7.0
     vite: ^5.4.8
+  peerDependencies:
+    "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0
+    react: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-router-dom: 6.0.0-beta.0 || ^6.3.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
   languageName: unknown
   linkType: soft
 
@@ -4791,7 +4808,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-dom@npm:^16.8.0 || ^17.0.0 || ^18.0.0, react-dom@npm:^18.3.1":
+"react-dom@npm:^16.8.0 || ^17.0.0 || ^18.0.0, react-dom@npm:^18.0.2":
   version: 18.3.1
   resolution: "react-dom@npm:18.3.1"
   dependencies:
@@ -4838,7 +4855,31 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react@npm:^16.8.0 || ^17.0.0 || ^18.0.0, react@npm:^18.3.1":
+"react-router-dom@npm:^6.3.0":
+  version: 6.27.0
+  resolution: "react-router-dom@npm:6.27.0"
+  dependencies:
+    "@remix-run/router": 1.20.0
+    react-router: 6.27.0
+  peerDependencies:
+    react: ">=16.8"
+    react-dom: ">=16.8"
+  checksum: de3dcc56297a2879a0e3997fa34ba0f3e1b9986a2ad3ef7991f913902ecf38da0282c98f7834f344ce2d881dbab0a382201a57e9f9ef5e9816febdb26dc038b7
+  languageName: node
+  linkType: hard
+
+"react-router@npm:6.27.0":
+  version: 6.27.0
+  resolution: "react-router@npm:6.27.0"
+  dependencies:
+    "@remix-run/router": 1.20.0
+  peerDependencies:
+    react: ">=16.8"
+  checksum: d22eedc33bcb11891b431655f90eed2d52c2fb3165ad11ca625f62970caf59c4859e6b1a3f92e78902b31ff1a8b2482ebf97ddebb82e9687d1f98730c14e04e6
+  languageName: node
+  linkType: hard
+
+"react@npm:^16.8.0 || ^17.0.0 || ^18.0.0, react@npm:^18.0.2":
   version: 18.3.1
   resolution: "react@npm:18.3.1"
   dependencies:
diff --git a/yarn.lock b/yarn.lock
index 3d9918b620..c821676a0b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4240,6 +4240,7 @@ __metadata:
     "@types/react-window": ^1.8.5
     "@types/zen-observable": ^0.8.0
     ansi-regex: ^6.0.1
+    backstage-storybook: "workspace:^"
     classnames: ^2.2.6
     cross-fetch: ^4.0.0
     d3-selection: ^3.0.0
@@ -22792,7 +22793,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"backstage-storybook@workspace:storybook":
+"backstage-storybook@workspace:^, backstage-storybook@workspace:storybook":
   version: 0.0.0-use.local
   resolution: "backstage-storybook@workspace:storybook"
   dependencies:
@@ -22805,15 +22806,25 @@ __metadata:
     "@storybook/react": ^8.3.5
     "@storybook/react-vite": ^8.3.5
     "@storybook/test": ^8.3.5
+    "@types/react": ^18.0.0
     eslint: ^9.11.1
     eslint-plugin-storybook: ^0.9.0
     globals: ^15.9.0
-    react: ^18.3.1
-    react-dom: ^18.3.1
+    react: ^18.0.2
+    react-dom: ^18.0.2
+    react-router-dom: ^6.3.0
     storybook: ^8.3.5
     typescript: ^5.5.3
     typescript-eslint: ^8.7.0
     vite: ^5.4.8
+  peerDependencies:
+    "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0
+    react: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-router-dom: 6.0.0-beta.0 || ^6.3.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
   languageName: unknown
   linkType: soft
 
@@ -40068,7 +40079,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-dom@npm:^16.8.0 || ^17.0.0 || ^18.0.0, react-dom@npm:^18.0.2, react-dom@npm:^18.3.1":
+"react-dom@npm:^16.8.0 || ^17.0.0 || ^18.0.0, react-dom@npm:^18.0.2":
   version: 18.3.1
   resolution: "react-dom@npm:18.3.1"
   dependencies:
@@ -40674,7 +40685,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react@npm:^16.8.0 || ^17.0.0 || ^18.0.0, react@npm:^18.0.2, react@npm:^18.3.1":
+"react@npm:^16.8.0 || ^17.0.0 || ^18.0.0, react@npm:^18.0.2":
   version: 18.3.1
   resolution: "react@npm:18.3.1"
   dependencies: