diff --git a/.github/workflows/build-on-windows.yml b/.github/workflows/build-on-windows.yml
index 5fae6dd9..ccbc259a 100644
--- a/.github/workflows/build-on-windows.yml
+++ b/.github/workflows/build-on-windows.yml
@@ -15,6 +15,11 @@ on:
         type: string
         required: false
         default: build-artifacts
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.number }}-build
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: windows-latest
diff --git a/.github/workflows/export-xml.yml b/.github/workflows/export-xml.yml
index 7b59112e..1f118ae5 100644
--- a/.github/workflows/export-xml.yml
+++ b/.github/workflows/export-xml.yml
@@ -9,6 +9,11 @@ on:
       artifact_name:
         type: string
         required: true
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.number }}-export
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/main-build.yml b/.github/workflows/main-build.yml
index 34dcdd96..e854bac1 100644
--- a/.github/workflows/main-build.yml
+++ b/.github/workflows/main-build.yml
@@ -6,7 +6,7 @@ on:
     branches: [ develop ]
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.number }}
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/run-tests-linux.yml b/.github/workflows/run-tests-linux.yml
index 533989d4..1822c104 100644
--- a/.github/workflows/run-tests-linux.yml
+++ b/.github/workflows/run-tests-linux.yml
@@ -29,7 +29,7 @@ permissions:
     id-token: write
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}-${{ inputs.v8_version }}-${{ inputs.locale }}-Linux
+  group: ${{ github.workflow }}-${{ github.ref }}-${{ inputs.v8_version }}-${{ inputs.locale }}-${{ github.event.number }}-Linux
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/run-tests-windows.yml b/.github/workflows/run-tests-windows.yml
index 9a382c0a..20f57dfe 100644
--- a/.github/workflows/run-tests-windows.yml
+++ b/.github/workflows/run-tests-windows.yml
@@ -24,7 +24,7 @@ on:
         default: true
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}-${{ inputs.v8_version }}-${{ inputs.locale }}-Windows
+  group: ${{ github.workflow }}-${{ github.ref }}-${{ inputs.v8_version }}-${{ inputs.locale }}-${{ github.event.number }}-Windows
   cancel-in-progress: true
 
 jobs: