diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml
index 5d59315ce24fd2592186fd1dcdd61c51669500ba..955b1a17c7cb8dcfc4757758fd68e5373155eceb 100644
--- a/.gitlab/ci/frontend.gitlab-ci.yml
+++ b/.gitlab/ci/frontend.gitlab-ci.yml
@@ -360,4 +360,4 @@ compile-storybook:
     expire_in: 31d
     when: always
     paths:
-      - public
+      - storybook/public
diff --git a/.gitlab/ci/pages.gitlab-ci.yml b/.gitlab/ci/pages.gitlab-ci.yml
index 4dcca9d1638bc2bd9b2a5b0dc25d08b3c673c963..0633ca5f6f2b4fff9a53bf20b0ef02e9b058e932 100644
--- a/.gitlab/ci/pages.gitlab-ci.yml
+++ b/.gitlab/ci/pages.gitlab-ci.yml
@@ -14,9 +14,9 @@ pages:
     - mv coverage/ public/coverage-ruby/ || true
     - mv coverage-frontend/ public/coverage-frontend/ || true
     - mv coverage-javascript/ public/coverage-javascript/ || true
+    - mv storybook/public public/storybook || true
     - cp .public/assets/application-*.css public/application.css || true
     - cp .public/assets/application-*.css.gz public/application.css.gz || true
-    - cp .public/storybook public/storybook || true
   artifacts:
     paths:
       - public
diff --git a/storybook/config/preview.js b/storybook/config/preview.js
index 24d97bc8e6bed79c5f85dad1d2adb2af105fc682..eee30aa48c37adea58f20dbf8830b3476a3a4112 100644
--- a/storybook/config/preview.js
+++ b/storybook/config/preview.js
@@ -1,4 +1,3 @@
-/* eslint-disable import/no-unresolved, import/no-commonjs */
 const stylesheetsRequireCtx = require.context(
   '../../app/assets/stylesheets',
   true,
diff --git a/storybook/config/webpack.config.js b/storybook/config/webpack.config.js
index db892c60abf7d5357c275dd30d8724ab1f4777fb..b9415a5103957790cce893d5dccdc7ad5699277b 100644
--- a/storybook/config/webpack.config.js
+++ b/storybook/config/webpack.config.js
@@ -1,9 +1,9 @@
 /* eslint-disable no-param-reassign */
 
 const { statSync } = require('fs');
+const path = require('path');
 const sass = require('node-sass');
 const { buildIncludePaths, resolveGlobUrl } = require('node-sass-magic-importer/dist/toolbox');
-const path = require('path');
 const webpack = require('webpack');
 const gitlabWebpackConfig = require('../../config/webpack.config.js');