diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 8def75a65..eef87950f 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -12,7 +12,7 @@ name: CI
 # with the same event (push/pull_request) even they are in progress.
 # This setting will help reduce the number of duplicated workflows.
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
+  group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number || github.sha }}
   cancel-in-progress: true
 
 env:
diff --git a/.github/workflows/lib-deps-check.yaml b/.github/workflows/lib-deps-check.yaml
index ee675beaf..1b0caea67 100644
--- a/.github/workflows/lib-deps-check.yaml
+++ b/.github/workflows/lib-deps-check.yaml
@@ -7,7 +7,7 @@ on:
       - "Lib/**"
 
 concurrency:
-  group: lib-deps-${{ github.event.pull_request.number }}
+  group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number }}
   cancel-in-progress: true
 
 env:
diff --git a/.github/workflows/pr-format.yaml b/.github/workflows/pr-format.yaml
index 48e19f5dd..446b8a785 100644
--- a/.github/workflows/pr-format.yaml
+++ b/.github/workflows/pr-format.yaml
@@ -10,7 +10,7 @@ on:
       - release
 
 concurrency:
-  group: format-check-${{ github.event.pull_request.number }}
+  group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number }}
   cancel-in-progress: true
 
 env: