diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml
index 949d11c135..0b829bdec6 100644
--- a/.github/workflows/build-artifacts.yml
+++ b/.github/workflows/build-artifacts.yml
@@ -1,7 +1,7 @@
 name: Build Library Artifacts
 
 concurrency:
-  group: "${{github.workflow}}-${{github.ref}}"
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 on:
diff --git a/.github/workflows/cruby-bindings.yml b/.github/workflows/cruby-bindings.yml
index 97093304d7..5458d80694 100644
--- a/.github/workflows/cruby-bindings.yml
+++ b/.github/workflows/cruby-bindings.yml
@@ -1,7 +1,7 @@
 name: CRuby bindings
 
 concurrency:
-  group: "${{github.workflow}}-${{github.ref}}"
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 on:
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index d5774705fa..43300482c1 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -1,7 +1,7 @@
 name: Documentation
 
 concurrency:
-  group: "${{github.workflow}}-${{github.ref}}"
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 on:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b39744ccee..735f5e7e3b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,7 +1,7 @@
 name: Main
 
 concurrency:
-  group: "${{github.workflow}}-${{github.ref}}"
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 on: