diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml
index 4ac0e008f..2c44e52e9 100644
--- a/.github/workflows/clippy.yml
+++ b/.github/workflows/clippy.yml
@@ -8,7 +8,7 @@ on:
 # Ensure that only a single job or workflow using the same concurrency group will run at a time.
 # see https://docs.github.com/en/actions/using-jobs/using-concurrency#example-only-cancel-in-progress-jobs-or-runs-for-the-current-workflow
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
   # only needs to check the group's latest commit
   cancel-in-progress: true
 
diff --git a/.github/workflows/e2e_test.yml b/.github/workflows/e2e_test.yml
index 670d4583b..9eb931cac 100644
--- a/.github/workflows/e2e_test.yml
+++ b/.github/workflows/e2e_test.yml
@@ -8,7 +8,7 @@ on:
 # Ensure that only a single job or workflow using the same concurrency group will run at a time.
 # see https://docs.github.com/en/actions/using-jobs/using-concurrency#example-only-cancel-in-progress-jobs-or-runs-for-the-current-workflow
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
   # only needs to test the group's latest commit
   cancel-in-progress: true
 
diff --git a/.github/workflows/fmt.yml b/.github/workflows/fmt.yml
index 0600d6aa2..67c8a7ee9 100644
--- a/.github/workflows/fmt.yml
+++ b/.github/workflows/fmt.yml
@@ -8,7 +8,7 @@ on:
 # Ensure that only a single job or workflow using the same concurrency group will run at a time.
 # see https://docs.github.com/en/actions/using-jobs/using-concurrency#example-only-cancel-in-progress-jobs-or-runs-for-the-current-workflow
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
   # only needs to check the group's latest commit
   cancel-in-progress: true
 
diff --git a/.github/workflows/pr_lint.yml b/.github/workflows/pr_lint.yml
index 7729fe58f..75029a196 100644
--- a/.github/workflows/pr_lint.yml
+++ b/.github/workflows/pr_lint.yml
@@ -1,7 +1,7 @@
 name: PR Lint
 
 concurrency:
-  group: Conventional PR-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
   cancel-in-progress: true
 
 on:
diff --git a/.github/workflows/unit_test.yml b/.github/workflows/unit_test.yml
index 3a73794cd..bee3108b7 100644
--- a/.github/workflows/unit_test.yml
+++ b/.github/workflows/unit_test.yml
@@ -8,7 +8,7 @@ on:
 # Ensure that only a single job or workflow using the same concurrency group will run at a time.
 # see https://docs.github.com/en/actions/using-jobs/using-concurrency#example-only-cancel-in-progress-jobs-or-runs-for-the-current-workflow
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
   # only needs to test the group's latest commit
   cancel-in-progress: true