diff --git a/.github/workflows/start-cli.yaml b/.github/workflows/start-cli.yaml
index 61b50389c..941614b11 100644
--- a/.github/workflows/start-cli.yaml
+++ b/.github/workflows/start-cli.yaml
@@ -38,7 +38,7 @@ on:
       - next/*
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.head.sha || github.sha }}
   cancel-in-progress: true
 
 env:
diff --git a/.github/workflows/start-registry.yaml b/.github/workflows/start-registry.yaml
index ea276277e..3e042c16d 100644
--- a/.github/workflows/start-registry.yaml
+++ b/.github/workflows/start-registry.yaml
@@ -36,7 +36,7 @@ on:
       - next/*
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.head.sha || github.sha }}
   cancel-in-progress: true
 
 env:
diff --git a/.github/workflows/start-tunnel.yaml b/.github/workflows/start-tunnel.yaml
index 93ca2d396..5bdc71411 100644
--- a/.github/workflows/start-tunnel.yaml
+++ b/.github/workflows/start-tunnel.yaml
@@ -1,4 +1,4 @@
-name: Sstart-tunnel
+name: start-tunnel
 
 on:
   workflow_call:
@@ -36,7 +36,7 @@ on:
       - next/*
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.head.sha || github.sha }}
   cancel-in-progress: true
 
 env:
diff --git a/.github/workflows/startos-iso.yaml b/.github/workflows/startos-iso.yaml
index 8702c641f..d2843344e 100644
--- a/.github/workflows/startos-iso.yaml
+++ b/.github/workflows/startos-iso.yaml
@@ -46,7 +46,7 @@ on:
       - next/*
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.head.sha || github.sha }}
   cancel-in-progress: true
 
 env:
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index be71cd949..f1c793127 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -11,7 +11,7 @@ on:
       - next/*
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.head.sha || github.sha }}
   cancel-in-progress: true
 
 env: