diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index f4dc9ad6f1..3b92d62961 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -24,8 +24,8 @@ on:
       - dependabot/**
 
 concurrency:
-  group: ${{ github.repository }}-${{ github.ref }}-${{ github.workflow }}
-  cancel-in-progress: true
+  group: ${{ github.repository }}-${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 permissions:
   contents: read
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 4120e5321c..639d79e46b 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -47,8 +47,8 @@ on:
       - 'vector/**'
 
 concurrency:
-  group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
-  cancel-in-progress: true
+  group: ${{ github.repository }}-${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 permissions:
   contents: read
diff --git a/.github/workflows/rc.yml b/.github/workflows/rc.yml
index 2af245805d..31bace232f 100644
--- a/.github/workflows/rc.yml
+++ b/.github/workflows/rc.yml
@@ -27,8 +27,8 @@ on:
   schedule:
     - cron: "0 0 * * *"
 concurrency:
-  group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
-  cancel-in-progress: true
+  group: ${{ github.repository }}-${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 permissions:
   contents: read
 jobs:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b9cd01a770..f2945d4b9a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -27,8 +27,8 @@ on:
   pull_request:
 
 concurrency:
-  group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
-  cancel-in-progress: true
+  group: ${{ github.repository }}-${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 permissions:
   contents: read