diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index d8545097d0..df44b5ba63 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -9,7 +9,7 @@ on:
       - '.github/workflows/codeql.yml'
 
 concurrency:
-  group: ${{ github.head_ref }}/codeql
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml
index fcdf3a0445..b7f7a06c96 100644
--- a/.github/workflows/codespell.yml
+++ b/.github/workflows/codespell.yml
@@ -9,7 +9,7 @@ on:
     branches: [master]
 
 concurrency:
-  group: ${{ github.head_ref }}/codespell
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/container_dev.yml b/.github/workflows/container_dev.yml
index 87064c839a..965a3e07eb 100644
--- a/.github/workflows/container_dev.yml
+++ b/.github/workflows/container_dev.yml
@@ -14,7 +14,7 @@ on:
       - '.github/workflows/container_dev.yml'
 
 concurrency:
-  group: ${{ github.head_ref }}/container_dev
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/container_foundationdb_version.yml b/.github/workflows/container_foundationdb_version.yml
index c8e98d2e9f..3e0bd39d00 100644
--- a/.github/workflows/container_foundationdb_version.yml
+++ b/.github/workflows/container_foundationdb_version.yml
@@ -25,7 +25,7 @@ on:
         default: ''
 
 concurrency:
-  group: ${{ github.head_ref }}/container_foundationdb_version
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/container_latest.yml b/.github/workflows/container_latest.yml
index 3c8da29da5..48e4d851b4 100644
--- a/.github/workflows/container_latest.yml
+++ b/.github/workflows/container_latest.yml
@@ -31,7 +31,7 @@ on:
         default: false
 
 concurrency:
-  group: ${{ github.head_ref }}/container_latest
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/container_release_foundationdb.yml b/.github/workflows/container_release_foundationdb.yml
index 9567aa0e63..17c7ec814d 100644
--- a/.github/workflows/container_release_foundationdb.yml
+++ b/.github/workflows/container_release_foundationdb.yml
@@ -12,7 +12,7 @@ on:
         default: ''
 
 concurrency:
-  group: ${{ github.head_ref }}/container_release_foundationdb
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/depsreview.yml b/.github/workflows/depsreview.yml
index c9ef4dab7a..cacaf76a54 100644
--- a/.github/workflows/depsreview.yml
+++ b/.github/workflows/depsreview.yml
@@ -2,7 +2,7 @@ name: 'Dependency Review'
 on: [pull_request]
 
 concurrency:
-  group: ${{ github.head_ref }}/depsreview
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 0e58880119..c838568a62 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -19,7 +19,7 @@ on:
       - '.github/workflows/e2e.yml'
 
 concurrency:
-  group: ${{ github.head_ref }}/e2e
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/ec-integration-tests.yml b/.github/workflows/ec-integration-tests.yml
index 212656b53b..8771f3b1b6 100644
--- a/.github/workflows/ec-integration-tests.yml
+++ b/.github/workflows/ec-integration-tests.yml
@@ -19,7 +19,7 @@ on:
       - '.github/workflows/ec-integration-tests.yml'
 
 concurrency:
-  group: ${{ github.head_ref }}/ec-integration-tests
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/fuse-integration.yml b/.github/workflows/fuse-integration.yml
index 3b23cb2228..0c1ae7989f 100644
--- a/.github/workflows/fuse-integration.yml
+++ b/.github/workflows/fuse-integration.yml
@@ -17,7 +17,7 @@ on:
       - '.github/actions/fix-fusermount-setuid/**'
 
 concurrency:
-  group: ${{ github.head_ref }}/fuse-integration
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index b2e5b52979..73218e5235 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -17,7 +17,7 @@ on:
       - '.github/workflows/go.yml'
 
 concurrency:
-  group: ${{ github.head_ref }}/go
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/helm_ci.yml b/.github/workflows/helm_ci.yml
index 9a6543104c..7422a21f27 100644
--- a/.github/workflows/helm_ci.yml
+++ b/.github/workflows/helm_ci.yml
@@ -9,7 +9,7 @@ on:
     paths: ['k8s/**', '.github/workflows/helm_ci.yml', '.github/scripts/helm_jwt_keys.py']
 
 concurrency:
-  group: ${{ github.head_ref }}/helm_ci
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/java_integration_tests.yml b/.github/workflows/java_integration_tests.yml
index 8bae15f539..ec2d7283aa 100644
--- a/.github/workflows/java_integration_tests.yml
+++ b/.github/workflows/java_integration_tests.yml
@@ -15,7 +15,7 @@ on:
       - '.github/workflows/java_integration_tests.yml'
 
 concurrency:
-  group: ${{ github.head_ref }}/java_integration_tests
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/java_unit_tests.yml b/.github/workflows/java_unit_tests.yml
index 5575ba2ae6..7c5a39e9c8 100644
--- a/.github/workflows/java_unit_tests.yml
+++ b/.github/workflows/java_unit_tests.yml
@@ -13,7 +13,7 @@ on:
       - '.github/workflows/java_unit_tests.yml'
 
 concurrency:
-  group: ${{ github.head_ref }}/java_unit_tests
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/kafka-quicktest.yml b/.github/workflows/kafka-quicktest.yml
index c18a87048b..a377432805 100644
--- a/.github/workflows/kafka-quicktest.yml
+++ b/.github/workflows/kafka-quicktest.yml
@@ -24,7 +24,7 @@ on:
   workflow_dispatch:  # Allow manual trigger
 
 concurrency:
-  group: ${{ github.head_ref }}/kafka-quicktest
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/kafka-tests.yml b/.github/workflows/kafka-tests.yml
index 7a40ee3583..ecbee7ce87 100644
--- a/.github/workflows/kafka-tests.yml
+++ b/.github/workflows/kafka-tests.yml
@@ -23,7 +23,7 @@ on:
       - '.github/workflows/kafka-tests.yml'
 
 concurrency:
-  group: ${{ github.head_ref }}/kafka-tests
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 # Force different runners for better isolation
diff --git a/.github/workflows/metadata-subscribe-tests.yml b/.github/workflows/metadata-subscribe-tests.yml
index b47c16b9cd..fea8d29f56 100644
--- a/.github/workflows/metadata-subscribe-tests.yml
+++ b/.github/workflows/metadata-subscribe-tests.yml
@@ -25,7 +25,7 @@ on:
       - '.github/workflows/metadata-subscribe-tests.yml'
 
 concurrency:
-  group: ${{ github.head_ref }}/metadata-subscribe-tests
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/plugin-workers.yml b/.github/workflows/plugin-workers.yml
index 058596a24c..abbf932b58 100644
--- a/.github/workflows/plugin-workers.yml
+++ b/.github/workflows/plugin-workers.yml
@@ -19,7 +19,7 @@ on:
       - '.github/workflows/plugin-workers.yml'
 
 concurrency:
-  group: ${{ github.head_ref }}/plugin-workers
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/postgres-tests.yml b/.github/workflows/postgres-tests.yml
index a0369b134e..0829a471d5 100644
--- a/.github/workflows/postgres-tests.yml
+++ b/.github/workflows/postgres-tests.yml
@@ -23,7 +23,7 @@ on:
       - '.github/workflows/postgres-tests.yml'
 
 concurrency:
-  group: ${{ github.head_ref }}/postgres-tests
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/s3-example-integration-tests.yml b/.github/workflows/s3-example-integration-tests.yml
index 4e39c3bc07..6ddc56a9ac 100644
--- a/.github/workflows/s3-example-integration-tests.yml
+++ b/.github/workflows/s3-example-integration-tests.yml
@@ -13,7 +13,7 @@ on:
       - '.github/workflows/s3-example-integration-tests.yml'
 
 concurrency:
-  group: ${{ github.head_ref }}/s3-integration-tests
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/s3-filer-group-tests.yml b/.github/workflows/s3-filer-group-tests.yml
index bda1ac2bca..41b5b99113 100644
--- a/.github/workflows/s3-filer-group-tests.yml
+++ b/.github/workflows/s3-filer-group-tests.yml
@@ -12,7 +12,7 @@ on:
       - '.github/workflows/s3-filer-group-tests.yml'
 
 concurrency:
-  group: ${{ github.head_ref }}/s3-filer-group-tests
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/s3-go-tests.yml b/.github/workflows/s3-go-tests.yml
index 19944e9eb1..749096fd2d 100644
--- a/.github/workflows/s3-go-tests.yml
+++ b/.github/workflows/s3-go-tests.yml
@@ -12,7 +12,7 @@ on:
       - '.github/workflows/s3-go-tests.yml'
 
 concurrency:
-  group: ${{ github.head_ref }}/s3-go-tests
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/s3-iam-tests.yml b/.github/workflows/s3-iam-tests.yml
index 121f835083..fb83fe990a 100644
--- a/.github/workflows/s3-iam-tests.yml
+++ b/.github/workflows/s3-iam-tests.yml
@@ -20,7 +20,7 @@ on:
       - '.github/workflows/s3-iam-tests.yml'
   
 concurrency:
-  group: ${{ github.head_ref }}/s3-iam-tests
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/s3-keycloak-tests.yml b/.github/workflows/s3-keycloak-tests.yml
index d2677431c1..2b760d53f0 100644
--- a/.github/workflows/s3-keycloak-tests.yml
+++ b/.github/workflows/s3-keycloak-tests.yml
@@ -16,7 +16,7 @@ on:
       - '.github/workflows/s3-keycloak-tests.yml'
   
 concurrency:
-  group: ${{ github.head_ref }}/s3-keycloak-tests
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/s3-mutation-regression-tests.yml b/.github/workflows/s3-mutation-regression-tests.yml
index acf09a8f27..ff5a4fa155 100644
--- a/.github/workflows/s3-mutation-regression-tests.yml
+++ b/.github/workflows/s3-mutation-regression-tests.yml
@@ -12,7 +12,7 @@ on:
       - '.github/workflows/s3-mutation-regression-tests.yml'
 
 concurrency:
-  group: ${{ github.head_ref }}/s3-mutation-regression-tests
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/s3-parquet-tests.yml b/.github/workflows/s3-parquet-tests.yml
index 576fed5fbc..c6a8c287bb 100644
--- a/.github/workflows/s3-parquet-tests.yml
+++ b/.github/workflows/s3-parquet-tests.yml
@@ -24,7 +24,7 @@ env:
   BUCKET_NAME: test-parquet-bucket
 
 concurrency:
-  group: ${{ github.head_ref }}/s3-parquet-tests
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/s3-policy-tests.yml b/.github/workflows/s3-policy-tests.yml
index 7bb900c150..8f4efc81fc 100644
--- a/.github/workflows/s3-policy-tests.yml
+++ b/.github/workflows/s3-policy-tests.yml
@@ -24,7 +24,7 @@ on:
       - '.github/workflows/s3-policy-tests.yml'
 
 concurrency:
-  group: ${{ github.head_ref }}/s3-policy-tests
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/s3-spark-tests.yml b/.github/workflows/s3-spark-tests.yml
index c8682992de..7972f8bc96 100644
--- a/.github/workflows/s3-spark-tests.yml
+++ b/.github/workflows/s3-spark-tests.yml
@@ -11,7 +11,7 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: ${{ github.head_ref }}/s3-spark-tests
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/s3-sse-tests.yml b/.github/workflows/s3-sse-tests.yml
index d1e2102203..323dbef744 100644
--- a/.github/workflows/s3-sse-tests.yml
+++ b/.github/workflows/s3-sse-tests.yml
@@ -23,7 +23,7 @@ on:
       - 'test/s3/sse/**'
   
 concurrency:
-  group: ${{ github.head_ref }}/s3-sse-tests
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/s3-tables-tests.yml b/.github/workflows/s3-tables-tests.yml
index 7a288342d1..e017335a32 100644
--- a/.github/workflows/s3-tables-tests.yml
+++ b/.github/workflows/s3-tables-tests.yml
@@ -13,7 +13,7 @@ on:
       - '.github/workflows/s3-tables-tests.yml'
 
 concurrency:
-  group: ${{ github.head_ref }}/s3-tables-tests
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/s3tests.yml b/.github/workflows/s3tests.yml
index 7d481a3f63..10da48a882 100644
--- a/.github/workflows/s3tests.yml
+++ b/.github/workflows/s3tests.yml
@@ -25,7 +25,7 @@ on:
       - '.github/workflows/s3tests.yml'
 
 concurrency:
-  group: ${{ github.head_ref }}/s3tests
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/sftp-tests.yml b/.github/workflows/sftp-tests.yml
index 377608dcf3..de439fc6fa 100644
--- a/.github/workflows/sftp-tests.yml
+++ b/.github/workflows/sftp-tests.yml
@@ -17,7 +17,7 @@ on:
       - '.github/workflows/sftp-tests.yml'
 
 concurrency:
-  group: ${{ github.head_ref }}/sftp-tests
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/spark-integration-tests.yml b/.github/workflows/spark-integration-tests.yml
index 4541c44db1..c3bc7ce234 100644
--- a/.github/workflows/spark-integration-tests.yml
+++ b/.github/workflows/spark-integration-tests.yml
@@ -16,7 +16,7 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: ${{ github.head_ref }}/spark-integration-tests
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/telemetry-integration.yml b/.github/workflows/telemetry-integration.yml
index 0ce4de722c..1d9624c68e 100644
--- a/.github/workflows/telemetry-integration.yml
+++ b/.github/workflows/telemetry-integration.yml
@@ -15,7 +15,7 @@ on:
       - '.github/workflows/telemetry-integration.yml'
 
 concurrency:
-  group: ${{ github.head_ref }}/telemetry-integration
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/terraform_ci.yml b/.github/workflows/terraform_ci.yml
index 5ed59291f7..b0b754dc21 100644
--- a/.github/workflows/terraform_ci.yml
+++ b/.github/workflows/terraform_ci.yml
@@ -9,7 +9,7 @@ on:
     paths: ['terraform/**', '.github/workflows/terraform_ci.yml']
 
 concurrency:
-  group: ${{ github.head_ref }}/terraform_ci
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/test-s3-over-https-using-awscli.yml b/.github/workflows/test-s3-over-https-using-awscli.yml
index f85aed1ec6..cab8f5d263 100644
--- a/.github/workflows/test-s3-over-https-using-awscli.yml
+++ b/.github/workflows/test-s3-over-https-using-awscli.yml
@@ -28,7 +28,7 @@ defaults:
     working-directory: weed
 
 concurrency:
-  group: ${{ github.head_ref }}/test-s3-over-https-using-awscli
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/tls-rotation-tests.yml b/.github/workflows/tls-rotation-tests.yml
index 244fc2f689..2ba04b7703 100644
--- a/.github/workflows/tls-rotation-tests.yml
+++ b/.github/workflows/tls-rotation-tests.yml
@@ -19,7 +19,7 @@ on:
       - '.github/workflows/tls-rotation-tests.yml'
 
 concurrency:
-  group: ${{ github.head_ref }}/tls-rotation-tests
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/vacuum-integration-tests.yml b/.github/workflows/vacuum-integration-tests.yml
index 2c2f3bfd16..1d45fcfda5 100644
--- a/.github/workflows/vacuum-integration-tests.yml
+++ b/.github/workflows/vacuum-integration-tests.yml
@@ -19,7 +19,7 @@ on:
       - '.github/workflows/vacuum-integration-tests.yml'
 
 concurrency:
-  group: ${{ github.head_ref }}/vacuum-integration-tests
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 permissions: