diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index fe4e757ef4..d095d6d29d 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -4,7 +4,7 @@ name: "Android"
 on: [push, pull_request]
 
 concurrency:
-  group: "${{ github.workflow }}-${{ github.ref }}"
+  group: "${{ github.workflow }}-${{ github.event.number || github.ref }}"
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml
index a75c678e28..966d92a0fc 100644
--- a/.github/workflows/cifuzz.yml
+++ b/.github/workflows/cifuzz.yml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: "${{ github.workflow }}-${{ github.ref }}"
+  group: "${{ github.workflow }}-${{ github.event.number || github.ref }}"
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/cmake_config.yml b/.github/workflows/cmake_config.yml
index 3222e087bf..be9f114f51 100644
--- a/.github/workflows/cmake_config.yml
+++ b/.github/workflows/cmake_config.yml
@@ -3,7 +3,7 @@ name: cmake_config
 on: [push, pull_request]
 
 concurrency:
-  group: "${{ github.workflow }}-${{ github.ref }}"
+  group: "${{ github.workflow }}-${{ github.event.number || github.ref }}"
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
index bb6a805be6..112678fd0d 100644
--- a/.github/workflows/coverity.yml
+++ b/.github/workflows/coverity.yml
@@ -7,7 +7,7 @@ on:
     - cron: "0 0 * * *" # At 00:00 daily.
 
 concurrency:
-  group: "${{ github.workflow }}-${{ github.ref }}"
+  group: "${{ github.workflow }}-${{ github.event.number || github.ref }}"
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/fedora-rawhide.yml b/.github/workflows/fedora-rawhide.yml
index 1303af295f..ec3c63d66b 100644
--- a/.github/workflows/fedora-rawhide.yml
+++ b/.github/workflows/fedora-rawhide.yml
@@ -6,7 +6,7 @@ on:
   - cron: "0 0 * * *"
 
 concurrency:
-  group: "${{ github.workflow }}-${{ github.ref }}"
+  group: "${{ github.workflow }}-${{ github.event.number || github.ref }}"
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 57222df1ef..5c85d4b025 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -8,7 +8,7 @@ on:
     - cron: "0 0 * * *" # At 00:00 daily.
 
 concurrency:
-  group: "${{ github.workflow }}-${{ github.ref }}"
+  group: "${{ github.workflow }}-${{ github.event.number || github.ref }}"
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index cd52d2c20b..d5dd3eb365 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -8,7 +8,7 @@ on:
     - cron: "0 0 * * 0" # At 00:00 weekly on Sunday.
 
 concurrency:
-  group: "${{ github.workflow }}-${{ github.ref }}"
+  group: "${{ github.workflow }}-${{ github.event.number || github.ref }}"
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a146f5c202..c2e94b8af1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -6,7 +6,7 @@ on:
     tags: [ "v*" ]
 
 concurrency:
-  group: "${{ github.workflow }}-${{ github.ref }}"
+  group: "${{ github.workflow }}-${{ github.event.number || github.ref }}"
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/rust-openssl.yml b/.github/workflows/rust-openssl.yml
index 6487b47aa3..b707c4beb6 100644
--- a/.github/workflows/rust-openssl.yml
+++ b/.github/workflows/rust-openssl.yml
@@ -7,7 +7,7 @@ on:
     - cron: "0 0 * * *" # At 00:00 daily.
 
 concurrency:
-  group: "${{ github.workflow }}-${{ github.ref }}"
+  group: "${{ github.workflow }}-${{ github.event.number || github.ref }}"
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/solaris.yml b/.github/workflows/solaris.yml
index e331e00baa..f68a2aaf10 100644
--- a/.github/workflows/solaris.yml
+++ b/.github/workflows/solaris.yml
@@ -7,7 +7,7 @@ on:
     - cron: "0 0 * * *" # At 00:00 daily.
 
 concurrency:
-  group: "${{ github.workflow }}-${{ github.ref }}"
+  group: "${{ github.workflow }}-${{ github.event.number || github.ref }}"
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index fe14501915..6aca153976 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -8,7 +8,7 @@ on:
     - cron: "0 0 * * 0" # At 00:00 weekly on Sunday.
 
 concurrency:
-  group: "${{ github.workflow }}-${{ github.ref }}"
+  group: "${{ github.workflow }}-${{ github.event.number || github.ref }}"
   cancel-in-progress: true
 
 jobs: