diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1a236c42b66..d15216bb2af 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,10 +14,8 @@ on:
 name: CI
 
 concurrency:
-  # When a PR number isn't available, the event won't be a `pull_request` event so it won't matter.
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
-  # Only cancel when the event is a pull_request
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.event.inputs.pr_number || format('sha-%s', github.sha) }}
+  cancel-in-progress: true
 
 jobs:
   docker_smoketests:
diff --git a/.github/workflows/csharp-test.yml b/.github/workflows/csharp-test.yml
index 4809c82137a..d1e5db0cbce 100644
--- a/.github/workflows/csharp-test.yml
+++ b/.github/workflows/csharp-test.yml
@@ -7,10 +7,8 @@ on:
   pull_request:
 
 concurrency:
-  # When a PR number isn't available, the event won't be a `pull_request` event so it won't matter.
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
-  # Only cancel when the event is a pull_request
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || format('sha-%s', github.sha) }}
+  cancel-in-progress: true
 
 jobs:
   unity-testsuite:
diff --git a/.github/workflows/internal-tests.yml b/.github/workflows/internal-tests.yml
index f9865175c0d..22451f93eab 100644
--- a/.github/workflows/internal-tests.yml
+++ b/.github/workflows/internal-tests.yml
@@ -10,10 +10,8 @@ permissions:
   contents: read
 
 concurrency:
-  # When a PR number isn't available, the event won't be a `pull_request` event so it won't matter.
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
-  # Only cancel when the event is a pull_request
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || format('sha-%s', github.sha) }}
+  cancel-in-progress: true
 
 jobs:
   run-tests:
diff --git a/.github/workflows/typescript-test.yml b/.github/workflows/typescript-test.yml
index 572f3e8f7a5..006c098ebe1 100644
--- a/.github/workflows/typescript-test.yml
+++ b/.github/workflows/typescript-test.yml
@@ -8,10 +8,8 @@ on:
   merge_group:
 
 concurrency:
-  # When a PR number isn't available, the event won't be a `pull_request` event so it won't matter.
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
-  # Only cancel when the event is a pull_request
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || format('sha-%s', github.sha) }}
+  cancel-in-progress: true
 
 jobs:
   build-and-test: