diff --git a/.github/workflows/e2e-storybook-workflow.yml b/.github/workflows/e2e-storybook-workflow.yml
index 5ff9335b989c..1551bc6f5a49 100644
--- a/.github/workflows/e2e-storybook-workflow.yml
+++ b/.github/workflows/e2e-storybook-workflow.yml
@@ -32,7 +32,17 @@ jobs:
       run: |
         source scripts/e2e-setup-ci.sh
         yarn dlx create-react-app my-cra && cd my-cra
-        yarn add -D eslint-config-react-app
+
+        # TODO: Remove when fixed upstream
+        yarn add -D eslint-config-react-app babel-eslint eslint
+
         yarn dlx -p @storybook/cli@next sb init --yes
+
+        # TODO: Remove when fixed upstream
+        yarn config set "packageExtensions['@storybook/preset-create-react-app@*'].peerDependencies.webpack" "*"
+        yarn config set "packageExtensions['@storybook/preset-create-react-app@*'].dependencies['react-refresh']" "*"
+        yarn config set "packageExtensions['@storybook/preset-create-react-app@*'].dependencies['webpack-hot-middleware']" "*"
+        yarn add webpack@^4 @babel/core prop-types
+
         yarn build-storybook