diff --git a/code/addons/a11y/package.json b/code/addons/a11y/package.json
index 8c6d1d8e168..64232fda8cd 100644
--- a/code/addons/a11y/package.json
+++ b/code/addons/a11y/package.json
@@ -36,7 +36,7 @@
       "import": "./dist/manager.mjs",
       "types": "./dist/manager.d.ts"
     },
-    "./preview": {
+    "./dist/preview": {
       "require": "./dist/preview.js",
       "import": "./dist/preview.mjs",
       "types": "./dist/preview.d.ts"
diff --git a/code/addons/actions/package.json b/code/addons/actions/package.json
index 91b57e0027e..cb72471f012 100644
--- a/code/addons/actions/package.json
+++ b/code/addons/actions/package.json
@@ -37,7 +37,7 @@
       "import": "./dist/manager.mjs",
       "types": "./dist/manager.d.ts"
     },
-    "./preview": {
+    "./dist/preview": {
       "require": "./dist/preview.js",
       "import": "./dist/preview.mjs",
       "types": "./dist/preview.d.ts"
diff --git a/code/addons/backgrounds/package.json b/code/addons/backgrounds/package.json
index 12124cdcd4c..603ba38e0c1 100644
--- a/code/addons/backgrounds/package.json
+++ b/code/addons/backgrounds/package.json
@@ -36,7 +36,7 @@
       "import": "./dist/manager.mjs",
       "types": "./dist/manager.d.ts"
     },
-    "./preview": {
+    "./dist/preview": {
       "require": "./dist/preview.js",
       "import": "./dist/preview.mjs",
       "types": "./dist/preview.d.ts"
diff --git a/code/addons/essentials/package.json b/code/addons/essentials/package.json
index 837f91f0ead..d930e68d212 100644
--- a/code/addons/essentials/package.json
+++ b/code/addons/essentials/package.json
@@ -30,32 +30,32 @@
     "./preview/actions": {
       "require": "./dist/preview/actions.js",
       "import": "./dist/preview/actions.mjs",
-      "types": "./dist/actions.d.ts"
+      "types": "./dist/preview/actions.d.ts"
     },
     "./preview/backgrounds": {
       "require": "./dist/preview/backgrounds.js",
       "import": "./dist/preview/backgrounds.mjs",
-      "types": "./dist/backgrounds.d.ts"
+      "types": "./dist/preview/backgrounds.d.ts"
     },
     "./preview/docs": {
       "require": "./dist/preview/docs.js",
       "import": "./dist/preview/docs.mjs",
-      "types": "./dist/docs.d.ts"
+      "types": "./dist/preview/docs.d.ts"
     },
     "./preview/highlight": {
       "require": "./dist/preview/highlight.js",
       "import": "./dist/preview/highlight.mjs",
-      "types": "./dist/highlight.d.ts"
+      "types": "./dist/preview/highlight.d.ts"
     },
     "./preview/measure": {
       "require": "./dist/preview/measure.js",
       "import": "./dist/preview/measure.mjs",
-      "types": "./dist/measure.d.ts"
+      "types": "./dist/preview/measure.d.ts"
     },
     "./preview/outline": {
       "require": "./dist/preview/outline.js",
       "import": "./dist/preview/outline.mjs",
-      "types": "./dist/outline.d.ts"
+      "types": "./dist/preview/outline.d.ts"
     },
     "./package.json": "./package.json"
   },
diff --git a/code/addons/essentials/src/preview/actions.ts b/code/addons/essentials/src/preview/actions.ts
index 57cae8b9b31..572ae20e01d 100644
--- a/code/addons/essentials/src/preview/actions.ts
+++ b/code/addons/essentials/src/preview/actions.ts
@@ -1,4 +1 @@
-/* eslint-disable import/export */
-// This lint rule fails because it doesn't use export maps correctly
-
-export * from '@storybook/addon-actions/preview';
+export * from '@storybook/addon-actions/dist/preview';
diff --git a/code/addons/essentials/src/preview/backgrounds.ts b/code/addons/essentials/src/preview/backgrounds.ts
index 1295c559225..d5ff97a51ac 100644
--- a/code/addons/essentials/src/preview/backgrounds.ts
+++ b/code/addons/essentials/src/preview/backgrounds.ts
@@ -1,4 +1 @@
-/* eslint-disable import/export */
-// This lint rule fails because it doesn't use export maps correctly
-
-export * from '@storybook/addon-backgrounds/preview';
+export * from '@storybook/addon-backgrounds/dist/preview';
diff --git a/code/addons/essentials/src/preview/docs.ts b/code/addons/essentials/src/preview/docs.ts
index b7ba04e2555..68ad94fc557 100644
--- a/code/addons/essentials/src/preview/docs.ts
+++ b/code/addons/essentials/src/preview/docs.ts
@@ -1,3 +1 @@
-// This lint rule fails because it doesn't use export maps correctly
-
 export * from '@storybook/addon-docs/preview';
diff --git a/code/addons/essentials/src/preview/highlight.ts b/code/addons/essentials/src/preview/highlight.ts
index 30e8c15340d..9d8609a61a0 100644
--- a/code/addons/essentials/src/preview/highlight.ts
+++ b/code/addons/essentials/src/preview/highlight.ts
@@ -1,4 +1 @@
-/* eslint-disable import/export */
-// This lint rule fails because it doesn't use export maps correctly
-
-export * from '@storybook/addon-highlight/preview';
+export * from '@storybook/addon-highlight/dist/preview';
diff --git a/code/addons/essentials/src/preview/measure.ts b/code/addons/essentials/src/preview/measure.ts
index 3f2a4f86a63..6c094594d63 100644
--- a/code/addons/essentials/src/preview/measure.ts
+++ b/code/addons/essentials/src/preview/measure.ts
@@ -1,4 +1 @@
-/* eslint-disable import/export */
-// This lint rule fails because it doesn't use export maps correctly
-
-export * from '@storybook/addon-measure/preview';
+export * from '@storybook/addon-measure/dist/preview';
diff --git a/code/addons/essentials/src/preview/outline.ts b/code/addons/essentials/src/preview/outline.ts
index f811f6155d6..d0c57728755 100644
--- a/code/addons/essentials/src/preview/outline.ts
+++ b/code/addons/essentials/src/preview/outline.ts
@@ -1,4 +1 @@
-/* eslint-disable import/export */
-// This lint rule fails because it doesn't use export maps correctly
-
-export * from '@storybook/addon-outline/preview';
+export * from '@storybook/addon-outline/dist/preview';
diff --git a/code/addons/essentials/src/typings.d.ts b/code/addons/essentials/src/typings.d.ts
index 8cf1e5fe305..419fc10cd26 100644
--- a/code/addons/essentials/src/typings.d.ts
+++ b/code/addons/essentials/src/typings.d.ts
@@ -1 +1,4 @@
 declare module 'fs';
+
+// TODO: Remove this once addon-docs is generated with tsup
+declare module '@storybook/addon-docs/preview';
diff --git a/code/addons/interactions/package.json b/code/addons/interactions/package.json
index 4a3f90f1d69..40c62ba1a1e 100644
--- a/code/addons/interactions/package.json
+++ b/code/addons/interactions/package.json
@@ -27,7 +27,7 @@
       "import": "./dist/index.mjs",
       "types": "./dist/index.d.ts"
     },
-    "./dist/manager": {
+    "./manager": {
       "require": "./dist/manager.js",
       "import": "./dist/manager.mjs",
       "types": "./dist/manager.d.ts"
diff --git a/code/addons/links/package.json b/code/addons/links/package.json
index 45d083b1e68..6e5e1e7cf5c 100644
--- a/code/addons/links/package.json
+++ b/code/addons/links/package.json
@@ -32,7 +32,7 @@
       "import": "./dist/manager.mjs",
       "types": "./dist/manager.d.ts"
     },
-    "./preview": {
+    "./dist/preview": {
       "require": "./dist/preview.js",
       "import": "./dist/preview.mjs",
       "types": "./dist/preview.d.ts"
diff --git a/code/addons/measure/package.json b/code/addons/measure/package.json
index 8b2d88c0bb0..ee1b607efab 100644
--- a/code/addons/measure/package.json
+++ b/code/addons/measure/package.json
@@ -35,7 +35,7 @@
       "import": "./dist/manager.mjs",
       "types": "./dist/manager.d.ts"
     },
-    "./preview": {
+    "./dist/preview": {
       "require": "./dist/preview.js",
       "import": "./dist/preview.mjs",
       "types": "./dist/preview.d.ts"
diff --git a/code/addons/outline/package.json b/code/addons/outline/package.json
index 74ecccd23be..653859135da 100644
--- a/code/addons/outline/package.json
+++ b/code/addons/outline/package.json
@@ -33,7 +33,7 @@
       "import": "./dist/index.mjs",
       "types": "./dist/index.d.ts"
     },
-    "./dist/manager": {
+    "./manager": {
       "require": "./dist/manager.js",
       "import": "./dist/manager.mjs",
       "types": "./dist/manager.d.ts"
@@ -43,7 +43,7 @@
       "import": "./dist/preview.mjs",
       "types": "./dist/preview.d.ts"
     },
-    "./dist/register": {
+    "./register": {
       "require": "./dist/manager.js",
       "import": "./dist/manager.mjs",
       "types": "./dist/manager.d.ts"