diff --git a/.github/workflows/_push-entrypoint.yaml b/.github/workflows/_push-entrypoint.yaml
index af014e74d..32232988b 100644
--- a/.github/workflows/_push-entrypoint.yaml
+++ b/.github/workflows/_push-entrypoint.yaml
@@ -1,7 +1,7 @@
 name: Push Entrypoint
 
 concurrency:
-  group: push-entrypoint-${{ github.event_name }}-${{ github.sha }}
+  group: push-entrypoint-${{ github.event_name }}-${{ github.ref }}
   cancel-in-progress: true
 
 on:
diff --git a/.github/workflows/build_and_push_docker_images.yaml b/.github/workflows/build_and_push_docker_images.yaml
index 63225eec3..33128e40d 100644
--- a/.github/workflows/build_and_push_docker_images.yaml
+++ b/.github/workflows/build_and_push_docker_images.yaml
@@ -1,7 +1,7 @@
 name: Build and push docker images
 
 concurrency:
-  group: docker-build-${{ github.event_name }}-${{ github.sha }}
+  group: docker-build-${{ github.event_name }}-${{ github.ref }}
   cancel-in-progress: true
 
 on:
diff --git a/.github/workflows/build_docker_for_test.yaml b/.github/workflows/build_docker_for_test.yaml
index e43a651f7..548d5e2cd 100644
--- a/.github/workflows/build_docker_for_test.yaml
+++ b/.github/workflows/build_docker_for_test.yaml
@@ -1,7 +1,7 @@
 name: Build docker image for test
 
 concurrency:
-  group: docker-test-build-${{ github.event_name }}-${{ github.sha }}
+  group: docker-test-build-${{ github.event_name }}-${{ github.ref }}
   cancel-in-progress: true
 
 on:
diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml
index 20b64038d..94841edc8 100644
--- a/.github/workflows/build_packages.yaml
+++ b/.github/workflows/build_packages.yaml
@@ -1,7 +1,7 @@
 name: Cross build packages
 
 concurrency:
-  group: build-packages-${{ github.event_name }}-${{ github.sha }}
+  group: build-packages-${{ github.event_name }}-${{ github.ref }}
   cancel-in-progress: true
 
 on:
diff --git a/.github/workflows/build_slim_packages.yaml b/.github/workflows/build_slim_packages.yaml
index 483ab88ec..b7ba78ef4 100644
--- a/.github/workflows/build_slim_packages.yaml
+++ b/.github/workflows/build_slim_packages.yaml
@@ -1,7 +1,7 @@
 name: Build slim packages
 
 concurrency:
-  group: slim-${{ github.event_name }}-${{ github.sha }}
+  group: slim-${{ github.event_name }}-${{ github.ref }}
   cancel-in-progress: true
 
 on:
diff --git a/.github/workflows/run_conf_tests.yaml b/.github/workflows/run_conf_tests.yaml
index 5ffa24946..cf696e0c6 100644
--- a/.github/workflows/run_conf_tests.yaml
+++ b/.github/workflows/run_conf_tests.yaml
@@ -1,7 +1,7 @@
 name: Run Configuration tests
 
 concurrency:
-  group: conftest-${{ github.event_name }}-${{ github.sha }}
+  group: conftest-${{ github.event_name }}-${{ github.ref }}
   cancel-in-progress: true
 
 on:
diff --git a/.github/workflows/run_test_cases.yaml b/.github/workflows/run_test_cases.yaml
index 325a9ec9c..48e551612 100644
--- a/.github/workflows/run_test_cases.yaml
+++ b/.github/workflows/run_test_cases.yaml
@@ -1,7 +1,7 @@
 name: Run test case
 
 concurrency:
-  group: test-${{ github.event_name }}-${{ github.sha }}
+  group: test-${{ github.event_name }}-${{ github.ref }}
   cancel-in-progress: true
 
 on:
diff --git a/.github/workflows/spellcheck.yaml b/.github/workflows/spellcheck.yaml
index 440233705..42a464ee8 100644
--- a/.github/workflows/spellcheck.yaml
+++ b/.github/workflows/spellcheck.yaml
@@ -1,7 +1,7 @@
-name: Build slim packages
+name: Spellcheck
 
 concurrency:
-  group: spellcheck-${{ github.event_name }}-${{ github.sha }}
+  group: spellcheck-${{ github.event_name }}-${{ github.ref }}
   cancel-in-progress: true
 
 on:
diff --git a/.github/workflows/static_checks.yaml b/.github/workflows/static_checks.yaml
index 2c36fc5fd..3b32a36b4 100644
--- a/.github/workflows/static_checks.yaml
+++ b/.github/workflows/static_checks.yaml
@@ -1,7 +1,7 @@
 name: Static checks
 
 concurrency:
-  group: static-checks-${{ github.event_name }}-${{ github.sha }}
+  group: static-checks-${{ github.event_name }}-${{ github.ref }}
   cancel-in-progress: true
 
 on: