diff --git a/.gitignore b/.gitignore
index 59a256b5fed7c..2a3b9a5fdb010 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,7 @@ junit.xml
 # Storybook
 storybook-static
 .nyc_output
+build-storybook.log
 
 # Vercel Files
 .vercel
diff --git a/.storybook/main.ts b/.storybook/main.ts
index 7210744039fca..cc132e2468668 100644
--- a/.storybook/main.ts
+++ b/.storybook/main.ts
@@ -11,8 +11,16 @@ const config: StorybookConfig = {
   ],
   logLevel: 'error',
   staticDirs: ['../public'],
-  features: { storyStoreV7: true },
-  core: { disableTelemetry: true },
+  core: {
+    disableTelemetry: true,
+    builder: {
+      name: '@storybook/builder-webpack5',
+      options: {
+        fsCache: true,
+        lazyCompilation: true,
+      },
+    },
+  },
   framework: { name: '@storybook/nextjs', options: {} },
   webpackFinal: async config => {
     // This allows us to resolve node_modules and everything from the Application source
@@ -24,6 +32,13 @@ const config: StorybookConfig = {
       '@': resolve(__dirname, '../'),
     };
 
+    // We want to disable the annoying performance hints
+    // as we know that Storybook has big bundles
+    config.performance = {
+      ...config.performance,
+      hints: false,
+    };
+
     return config;
   },
 };
diff --git a/styles/new/index.css b/styles/new/index.css
index 9bd7e63da7a29..29c80591ce5b2 100644
--- a/styles/new/index.css
+++ b/styles/new/index.css
@@ -1,11 +1,11 @@
+@charset "utf-8";
+
 /* IDE Support
  * We recommend Stylelint and Tailwind Extensions for better IDE support.
  * @see https://marketplace.visualstudio.com/items?itemName=bradlc.vscode-tailwindcss
  * @see https://marketplace.visualstudio.com/items?itemName=stylelint.vscode-stylelint
 */
 
-@charset "utf-8";
-
 @tailwind base;
 @tailwind components;
 @tailwind utilities;