diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f374d23379..0b8353dcf3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,7 +1,8 @@
 #Build the application
 name: Build without E2E tests
 on:
-    pull_request: {} # only on draft PRs, see "if:" below
+    pull_request:
+        types: [converted_to_draft]
     push:
         branches: [master]
     workflow_dispatch: # for running action manually
diff --git a/.github/workflows/cypress.yaml b/.github/workflows/cypress.yaml
index b720cf2fb5..9f6dac9c94 100644
--- a/.github/workflows/cypress.yaml
+++ b/.github/workflows/cypress.yaml
@@ -10,6 +10,10 @@ jobs:
     cypress:
         name: Cypress
         runs-on: macos-latest
+
+        # Only run on non-draft PRs. On draft PRs, we already have the Build job
+        if: github.event.pull_request.draft == false
+
         steps:
             - name: Checkout code
               uses: actions/checkout@v4