diff --git a/.github/workflows/test-espressif.yml b/.github/workflows/test-espressif.yml
index a36d1573ebc..b6ef9dcf1db 100644
--- a/.github/workflows/test-espressif.yml
+++ b/.github/workflows/test-espressif.yml
@@ -18,7 +18,7 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref_name }}-${{ github.ref_type == 'branch' && github.sha }}-${{ github.event_name == 'workflow_dispatch' }}-${{ github.event_name == 'schedule' }}
   cancel-in-progress: true
 
 jobs: