diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 8528d5429..e3b1a9e7f 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -1,7 +1,7 @@
 name: Cloud Hypervisor Build
 on: [pull_request, merge_group]
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ github.event_name }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/docker-image.yaml b/.github/workflows/docker-image.yaml
index da2bbf5d3..6a52f1edf 100644
--- a/.github/workflows/docker-image.yaml
+++ b/.github/workflows/docker-image.yaml
@@ -6,7 +6,7 @@ on:
   pull_request:
     paths: resources/Dockerfile
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ github.event_name }}
   cancel-in-progress: true
 
 env:
diff --git a/.github/workflows/formatting.yaml b/.github/workflows/formatting.yaml
index 00cd32279..8dee21e6b 100644
--- a/.github/workflows/formatting.yaml
+++ b/.github/workflows/formatting.yaml
@@ -1,7 +1,7 @@
 name: Cloud Hypervisor Code Formatting
 on: [pull_request, merge_group]
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ github.event_name }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/fuzz-build.yaml b/.github/workflows/fuzz-build.yaml
index b97796893..d5f0332a9 100644
--- a/.github/workflows/fuzz-build.yaml
+++ b/.github/workflows/fuzz-build.yaml
@@ -1,7 +1,7 @@
 name: Cloud Hypervisor Cargo Fuzz Build
 on: [pull_request, merge_group]
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ github.event_name }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/integration-arm64.yaml b/.github/workflows/integration-arm64.yaml
index f48c0ec12..0678dbc83 100644
--- a/.github/workflows/integration-arm64.yaml
+++ b/.github/workflows/integration-arm64.yaml
@@ -1,7 +1,7 @@
 name: Cloud Hypervisor Tests (ARM64)
 on: [pull_request, merge_group]
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ github.event_name }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/integration-rate-limiter.yaml b/.github/workflows/integration-rate-limiter.yaml
index 94497f47b..b76c35c73 100644
--- a/.github/workflows/integration-rate-limiter.yaml
+++ b/.github/workflows/integration-rate-limiter.yaml
@@ -1,7 +1,7 @@
 name: Cloud Hypervisor Tests (Rate-Limiter)
 on: [merge_group, pull_request]
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ github.event_name }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/integration-vfio.yaml b/.github/workflows/integration-vfio.yaml
index 416e99ee9..218e89727 100644
--- a/.github/workflows/integration-vfio.yaml
+++ b/.github/workflows/integration-vfio.yaml
@@ -1,7 +1,7 @@
 name: Cloud Hypervisor Tests (VFIO)
 on: [merge_group, pull_request]
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ github.event_name }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/integration-windows.yaml b/.github/workflows/integration-windows.yaml
index 81ed01755..51877aa47 100644
--- a/.github/workflows/integration-windows.yaml
+++ b/.github/workflows/integration-windows.yaml
@@ -1,7 +1,7 @@
 name: Cloud Hypervisor Tests (Windows Guest)
 on: [merge_group, pull_request]
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ github.event_name }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/integration-x86-64.yaml b/.github/workflows/integration-x86-64.yaml
index 453d7c2d3..9334b242e 100644
--- a/.github/workflows/integration-x86-64.yaml
+++ b/.github/workflows/integration-x86-64.yaml
@@ -1,7 +1,7 @@
 name: Cloud Hypervisor Tests (x86-64)
 on: [pull_request, merge_group]
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ github.event_name }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/mshv-infra.yaml b/.github/workflows/mshv-infra.yaml
index e8d25fc12..ad71f6904 100644
--- a/.github/workflows/mshv-infra.yaml
+++ b/.github/workflows/mshv-infra.yaml
@@ -1,5 +1,5 @@
 name: MSHV Infra Setup
-on: 
+on:
   workflow_call:
     inputs:
       ARCH:
@@ -44,7 +44,7 @@ on:
         description: 'Private IP of the VM'
         value: ${{ jobs.infra-setup.outputs.PRIVATE_IP }}
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ github.event_name }}
   cancel-in-progress: true
 jobs:
   infra-setup:
diff --git a/.github/workflows/package-consistency.yaml b/.github/workflows/package-consistency.yaml
index 9c5eb5c0e..df7f01b8a 100644
--- a/.github/workflows/package-consistency.yaml
+++ b/.github/workflows/package-consistency.yaml
@@ -1,7 +1,7 @@
 name: Cloud Hypervisor Consistency
 on: [pull_request, merge_group]
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ github.event_name }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/preview-riscv64-build.yaml b/.github/workflows/preview-riscv64-build.yaml
index e5fbf5ee2..ad87232d3 100644
--- a/.github/workflows/preview-riscv64-build.yaml
+++ b/.github/workflows/preview-riscv64-build.yaml
@@ -1,7 +1,7 @@
 name: Cloud Hypervisor RISC-V 64-bit kvm build Preview
 on: [pull_request, merge_group]
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ github.event_name }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/preview-riscv64-modules.yaml b/.github/workflows/preview-riscv64-modules.yaml
index 1ae1c6375..1b7ac6ed1 100644
--- a/.github/workflows/preview-riscv64-modules.yaml
+++ b/.github/workflows/preview-riscv64-modules.yaml
@@ -1,7 +1,7 @@
 name: Cloud Hypervisor RISC-V 64-bit Preview
 on: [pull_request, merge_group]
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ github.event_name }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/quality.yaml b/.github/workflows/quality.yaml
index bb5fc10bf..7a7e8bed0 100644
--- a/.github/workflows/quality.yaml
+++ b/.github/workflows/quality.yaml
@@ -1,7 +1,7 @@
 name: Cloud Hypervisor Quality Checks
 on: [pull_request, merge_group]
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ github.event_name }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 18317aeae..6a96de491 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -1,7 +1,7 @@
 name: Cloud Hypervisor Release
 on: [create, merge_group]
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ github.event_name }}
   cancel-in-progress: true
 env:
   GITHUB_TOKEN: ${{ github.token }}