diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index ca062dd47b..0b1ade5a2f 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -3,6 +3,7 @@ name: CI
 on:
   workflow_call:
   workflow_dispatch:
+  merge_group:
   pull_request:
     branches: [main, dev, 'release/**']
   push:
@@ -26,7 +27,12 @@ jobs:
   ci:
     runs-on: ubuntu-latest
     name: Run CI
+    if: always()  # This ensures the job always runs
     needs: [lint-backend, pytest, lint-ui, e2e-tests]
     steps:
-      - name: Done
-        run: echo "Done"
+      # Propagate failure
+      - name: Check dependent jobs
+        if: contains(needs.*.result, 'success') != true || contains(needs.*.result, 'skipped')
+        run: |
+          echo "Not all required jobs succeeded"
+          exit 1
diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml
index 81b701b962..49708e46a9 100644
--- a/.github/workflows/e2e-tests.yaml
+++ b/.github/workflows/e2e-tests.yaml
@@ -30,4 +30,8 @@ jobs:
       - name: Run tests
         env:
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
-        run: pnpm test
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 20
+          max_attempts: 3
+          command: pnpm test