diff --git a/.storybook/main.ts b/.storybook/main.ts
index 8e14495eb..e7f727018 100644
--- a/.storybook/main.ts
+++ b/.storybook/main.ts
@@ -5,8 +5,7 @@ import { resolve } from 'node:path'
 const config = {
   stories: [
     // List welcome first in sidebar
-    '../.storybook/docs/welcome.mdx',
-    '../.storybook/docs/*.mdx',
+    '../app/storybook/welcome.mdx',
     '../app/**/*.@(mdx|stories.@(js|ts))',
   ],
   addons: [
diff --git a/app/pages/about.stories.ts b/app/pages/about.stories.ts
index aac259742..adc719dbb 100644
--- a/app/pages/about.stories.ts
+++ b/app/pages/about.stories.ts
@@ -1,7 +1,7 @@
 import About from './about.vue'
 import type { Meta, StoryObj } from '@storybook-vue/nuxt'
 import { pageDecorator } from '../../.storybook/decorators'
-import { contributorsHandler } from '../../.storybook/handlers'
+import { contributorsHandler } from '../storybook/mocks/handlers'
 
 const meta = {
   component: About,
diff --git a/app/pages/pds.stories.ts b/app/pages/pds.stories.ts
index 5bdd02a83..421802ad5 100644
--- a/app/pages/pds.stories.ts
+++ b/app/pages/pds.stories.ts
@@ -1,7 +1,7 @@
 import Pds from './pds.vue'
 import type { Meta, StoryObj } from '@storybook-vue/nuxt'
 import { pageDecorator } from '../../.storybook/decorators'
-import { pdsUsersHandler } from '../../.storybook/handlers'
+import { pdsUsersHandler } from '../storybook/mocks/handlers'
 
 const meta = {
   component: Pds,
diff --git a/app/pages/recharging.stories.ts b/app/pages/recharging.stories.ts
index 163e055b7..912cd99a0 100644
--- a/app/pages/recharging.stories.ts
+++ b/app/pages/recharging.stories.ts
@@ -1,7 +1,7 @@
 import Recharging from './recharging.vue'
 import type { Meta, StoryObj } from '@storybook-vue/nuxt'
 import { pageDecorator } from '../../.storybook/decorators'
-import { repoStatsHandler } from '../../.storybook/handlers'
+import { repoStatsHandler } from '../storybook/mocks/handlers'
 
 const meta = {
   component: Recharging,
diff --git a/app/pages/settings.stories.ts b/app/pages/settings.stories.ts
index 1deaecbc1..0e0f50af3 100644
--- a/app/pages/settings.stories.ts
+++ b/app/pages/settings.stories.ts
@@ -2,7 +2,7 @@ import Settings from './settings.vue'
 import type { Meta, StoryObj } from '@storybook-vue/nuxt'
 import { userEvent, expect } from 'storybook/test'
 import { pageDecorator } from '../../.storybook/decorators'
-import { i18nStatusHandler } from '../../.storybook/handlers'
+import { i18nStatusHandler } from '../storybook/mocks/handlers'
 
 const meta = {
   component: Settings,
diff --git a/.storybook/docs/colors.mdx b/app/storybook/colors.mdx
similarity index 100%
rename from .storybook/docs/colors.mdx
rename to app/storybook/colors.mdx
diff --git a/.storybook/docs/guidelines.mdx b/app/storybook/guidelines.mdx
similarity index 100%
rename from .storybook/docs/guidelines.mdx
rename to app/storybook/guidelines.mdx
diff --git a/.storybook/handlers.ts b/app/storybook/mocks/handlers.ts
similarity index 100%
rename from .storybook/handlers.ts
rename to app/storybook/mocks/handlers.ts
diff --git a/.storybook/docs/typography.mdx b/app/storybook/typography.mdx
similarity index 100%
rename from .storybook/docs/typography.mdx
rename to app/storybook/typography.mdx
diff --git a/.storybook/docs/welcome.mdx b/app/storybook/welcome.mdx
similarity index 100%
rename from .storybook/docs/welcome.mdx
rename to app/storybook/welcome.mdx