diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 12c4ea64cc..007498aa9a 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -2,18 +2,19 @@ name: Build and Test
 
 on:
   push:
-    branches: [main]
+    branches: [ main ]
   pull_request:
-    branches: [main]
+    branches: [ main ]
   workflow_dispatch:
 
+
 jobs:
   build-and-test:
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        node: ['16', '18']
+        node: [ '16', '18' ]
 
     name: Node ${{ matrix.node }} tests
 
@@ -59,6 +60,9 @@ jobs:
       - name: Check format
         run: yarn format:check
 
+      - name: Build Storybook
+        run: yarn build-storybook
+
       - name: Happo
         run: yarn happo-ci
         env:
diff --git a/.github/workflows/deploy-storybook.yml b/.github/workflows/deploy-storybook.yml
index bc289406b2..9dc3547ee2 100644
--- a/.github/workflows/deploy-storybook.yml
+++ b/.github/workflows/deploy-storybook.yml
@@ -39,7 +39,7 @@ jobs:
         run: yarn install
 
       - name: Build Storybook
-        run: yarn build-storybook --modern
+        run: yarn build-storybook
 
       - name: Deploy 🚀
         uses: JamesIves/github-pages-deploy-action@v4
diff --git a/.happo.js b/.happo.js
index 7206e2c2e8..823dca3700 100644
--- a/.happo.js
+++ b/.happo.js
@@ -25,6 +25,9 @@ module.exports = {
   },
   plugins: [
     // see https://github.com/happo/happo-plugin-storybook for a list of options you can pass to the plugin
-    happoPluginStorybook(),
+    happoPluginStorybook({
+      outputDir: 'storybook-static',
+      usePrebuiltPackage: true,
+    }),
   ],
 }