diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 8e6824f..dbc9edb 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -14,12 +14,13 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event.number || github.ref }}
   cancel-in-progress: true
 
+env:
+  NEXT_PUBLIC_TURNSTILE_SITEKEY: 'e2e-sitekey'
+  GIT_COMMIT_SHA: ${{ github.sha }}
+
 jobs:
   main:
     runs-on: ubuntu-latest
-    env:
-      NEXT_PUBLIC_TURNSTILE_SITEKEY: 'e2e-sitekey'
-      GIT_COMMIT_SHA: ${{ github.sha }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -34,8 +35,26 @@ jobs:
           cache: 'pnpm'
       - name: Setup dependencies
         run: pnpm install --frozen-lockfile
-      # Install Cypress dependencies
-      - run: pnpm cypress install --force
       - uses: nrwl/nx-set-shas@v4
       - run: pnpm exec nx affected --parallel 3 --target lint test build
+  e2e:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: .nvmrc
+          cache: 'pnpm'
+      - name: Setup dependencies
+        run: |
+          pnpm install --frozen-lockfile
+          pnpm cypress install --force
+      - uses: nrwl/nx-set-shas@v4
+      - run: pnpm exec nx build haqq-website
       - run: pnpm exec nx affected --parallel 1 --target e2e-ci