diff --git a/.github/workflows/cbmc.yml b/.github/workflows/cbmc.yml
index 4d48e84439..aaab2c38f9 100644
--- a/.github/workflows/cbmc.yml
+++ b/.github/workflows/cbmc.yml
@@ -4,13 +4,16 @@ name: CBMC
 permissions:
   contents: read
 on:
+  workflow_call:
   workflow_dispatch:
-  workflow_run:
-    workflows: [ "Base tests" ]
-    types: [ completed ]
+  push:
+    branches: ["main"]
+  pull_request:
+    branches: ["main"]
+    types: [ "opened", "synchronize" ]
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch }}
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6a324383f7..653b1b3261 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,13 +4,16 @@ name: Extended tests
 permissions:
   contents: read
 on:
+  workflow_call:
   workflow_dispatch:
-  workflow_run:
-    workflows: [ "Base tests" ]
-    types: [ completed ]
+  push:
+    branches: ["main"]
+  pull_request:
+    branches: ["main"]
+    types: [ "opened", "synchronize" ]
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch }}
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs: