diff --git a/.github/workflows/code-pull-request.yml b/.github/workflows/code-pull-request.yml
index 17741578..211d47b0 100644
--- a/.github/workflows/code-pull-request.yml
+++ b/.github/workflows/code-pull-request.yml
@@ -7,7 +7,7 @@ on:
       - main
 
 concurrency:
-  group: code-pr-${{ github.event.pull_request.number }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/update-lock.yaml b/.github/workflows/update-lock.yaml
index cac96ce6..2592dce5 100644
--- a/.github/workflows/update-lock.yaml
+++ b/.github/workflows/update-lock.yaml
@@ -7,7 +7,7 @@ on:
       - "package.json"
       - ".github/workflows/update-lock.yaml"
 concurrency:
-  group: pr-lock-${{ github.event.pull_request.number }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 jobs:
   update-lock:
diff --git a/.github/workflows/windows-smoke-test.yml b/.github/workflows/windows-smoke-test.yml
index ea9cecc7..8bd6a943 100644
--- a/.github/workflows/windows-smoke-test.yml
+++ b/.github/workflows/windows-smoke-test.yml
@@ -2,12 +2,12 @@ name: Windows Smoke Test
 
 on:
   pull_request:
-    types: [opened, edited, synchronize, reopened]
+    types: [opened, synchronize, reopened]
     branches:
       - main
 
 concurrency:
-  group: windows-smoke-${{ github.event.pull_request.number }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs: