diff --git a/.github/workflows/docker-Espressif.yml b/.github/workflows/docker-Espressif.yml
index 98d0e0ffd..be2c2755a 100644
--- a/.github/workflows/docker-Espressif.yml
+++ b/.github/workflows/docker-Espressif.yml
@@ -1,6 +1,7 @@
 name: Test Espressif examples on various official Docker containers
 concurrency:
-  group: ${{ github.ref }}
+  group: ${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
 
 on:
   push:
diff --git a/.github/workflows/os-check.yml b/.github/workflows/os-check.yml
index ae3375908..23a7fb038 100644
--- a/.github/workflows/os-check.yml
+++ b/.github/workflows/os-check.yml
@@ -1,6 +1,6 @@
 name: Ubuntu-Macos-Windows Tests
 concurrency:
-  group: ${{ github.ref }}
+  group: ${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 on: