diff --git a/.github/workflows/ci-bun.yml b/.github/workflows/ci-bun.yml
index f261edb32bf..f8eb3b012e9 100644
--- a/.github/workflows/ci-bun.yml
+++ b/.github/workflows/ci-bun.yml
@@ -5,7 +5,7 @@ on:
     branches: [main]
 
 concurrency:
-  group: ci-bun-push-${{ github.ref_name }}
+  group: ci-bun-push-${{ github.run_id }}
   cancel-in-progress: false
 
 env:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2bae4a3b7ae..94a15639074 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ on:
     types: [opened, reopened, synchronize, ready_for_review, converted_to_draft]
 
 concurrency:
-  group: ${{ github.event_name == 'pull_request' && format('ci-pr-{0}', github.event.pull_request.number) || format('ci-push-{0}', github.ref_name) }}
+  group: ${{ github.event_name == 'pull_request' && format('ci-pr-{0}', github.event.pull_request.number) || format('ci-push-{0}', github.run_id) }}
   cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 env:
diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
index 218b1b9eaf1..b8997495500 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -20,7 +20,7 @@ on:
         type: string
 
 concurrency:
-  group: docker-release-${{ github.workflow }}-${{ github.event_name == 'workflow_dispatch' && inputs.tag || github.ref }}
+  group: ${{ github.event_name == 'workflow_dispatch' && format('docker-release-manual-{0}', inputs.tag) || format('docker-release-push-{0}', github.run_id) }}
   cancel-in-progress: false
 
 env: