diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 8e6824f..3d3146c 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
@@ -33,9 +34,10 @@ jobs:
           node-version-file: .nvmrc
           cache: 'pnpm'
       - name: Setup dependencies
-        run: pnpm install --frozen-lockfile
-      # Install Cypress dependencies
-      - run: pnpm cypress install --force
+        run: |
+          pnpm install --frozen-lockfile
+          pnpm cypress install --force
       - uses: nrwl/nx-set-shas@v4
       - run: pnpm exec nx affected --parallel 3 --target lint test build
+      - run: pnpm exec nx build haqq-website
       - run: pnpm exec nx affected --parallel 1 --target e2e-ci
diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml
index e5ac676..25d80c1 100644
--- a/.github/workflows/codeql.yaml
+++ b/.github/workflows/codeql.yaml
@@ -3,11 +3,8 @@ name: 'CodeQL'
 on:
   push:
     branches:
-      - dev
-      - prod
+      - main
   pull_request:
-    branches:
-      - dev
   schedule:
     - cron: '0 8 * * 1'
   merge_group: