diff --git a/.github/actions/setup-frontend/action.yml b/.github/actions/setup-frontend/action.yml
index 0ebc00ce3..86482b3a3 100644
--- a/.github/actions/setup-frontend/action.yml
+++ b/.github/actions/setup-frontend/action.yml
@@ -1,8 +1,20 @@
 name: Setup Frontend
-description: Common setup for frontend jobs using pnpm
+description: |
+  Common setup for frontend jobs using pnpm
+  Skips heavy binary installs that are needed for e2e by default
+inputs:
+  install-e2e-binaries:
+    description: 'Install heavy e2e binary downloads'
+    required: false
+    default: 'false'
 runs:
   using: "composite"
   steps:
+    - if: inputs.install-e2e-binaries == 'false'
+      shell: bash
+      run: |
+        echo "CYPRESS_INSTALL_BINARY=0"       >> $GITHUB_ENV
+        echo "PUPPETEER_SKIP_DOWNLOAD=true"   >> $GITHUB_ENV
     - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4
       with:
         run_install: false
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 83fc0e6f1..51c3f01c4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -300,6 +300,8 @@ jobs:
         with:
           name: vikunja_bin
       - uses: ./.github/actions/setup-frontend
+        with:
+          install-e2e-binaries: true
       - name: Download Frontend
         uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
         with:
@@ -307,6 +309,7 @@ jobs:
           path: ./frontend/dist
       - run: chmod +x ./vikunja
       - uses: cypress-io/github-action@v6
+        timeout-minutes: 20
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
@@ -321,6 +324,7 @@ jobs:
           VIKUNJA_DATABASE_TYPE: sqlite
           VIKUNJA_RATELIMIT_NOAUTHLIMIT: 1000
         with:
+          install: false
           working-directory: frontend
           browser: chrome
           record: true