diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 484f4d75..c7f79746 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ env:
   DOCKER_HUB: seerr/seerr
 
 concurrency:
-  group: ci-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 4669f624..60793a88 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -20,7 +20,7 @@ permissions:
   contents: read
 
 concurrency:
-  group: codeql-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/conflict_labeler.yml b/.github/workflows/conflict_labeler.yml
index 4709c67e..35acf52d 100644
--- a/.github/workflows/conflict_labeler.yml
+++ b/.github/workflows/conflict_labeler.yml
@@ -14,7 +14,7 @@ permissions:
   contents: read
 
 concurrency:
-  group: merge-conflict-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
index d23ffe00..f117b9a9 100644
--- a/.github/workflows/cypress.yml
+++ b/.github/workflows/cypress.yml
@@ -28,7 +28,7 @@ permissions:
   contents: read
 
 concurrency:
-  group: cypress-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/docs-deploy.yml b/.github/workflows/docs-deploy.yml
index 2817270b..6b937963 100644
--- a/.github/workflows/docs-deploy.yml
+++ b/.github/workflows/docs-deploy.yml
@@ -15,7 +15,7 @@ permissions:
   contents: read
 
 concurrency:
-  group: pages
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/docs-link-check.yml b/.github/workflows/docs-link-check.yml
index 8bbc0eda..19ea46ba 100644
--- a/.github/workflows/docs-link-check.yml
+++ b/.github/workflows/docs-link-check.yml
@@ -25,7 +25,7 @@ permissions:
   contents: read
 
 concurrency:
-  group: docs-link-check-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/helm.yml b/.github/workflows/helm.yml
index cd2a6020..21beb98e 100644
--- a/.github/workflows/helm.yml
+++ b/.github/workflows/helm.yml
@@ -14,7 +14,7 @@ permissions:
   contents: read
 
 concurrency:
-  group: helm-charts
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/lint-helm-charts.yml b/.github/workflows/lint-helm-charts.yml
index f6982dc4..3bf3024b 100644
--- a/.github/workflows/lint-helm-charts.yml
+++ b/.github/workflows/lint-helm-charts.yml
@@ -18,7 +18,7 @@ permissions:
   contents: read
 
 concurrency:
-  group: charts-lint-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index 32a23d9a..c8939f9f 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -15,7 +15,7 @@ env:
   DOCKER_HUB: seerr/seerr
 
 concurrency:
-  group: preview-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c666f875..b79496b7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,7 +11,7 @@ permissions:
   contents: read
 
 concurrency:
-  group: release-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 env:
diff --git a/.github/workflows/renovate-helm-custom-hooks.yml b/.github/workflows/renovate-helm-custom-hooks.yml
index 55173e9a..ae0bd53b 100644
--- a/.github/workflows/renovate-helm-custom-hooks.yml
+++ b/.github/workflows/renovate-helm-custom-hooks.yml
@@ -12,7 +12,7 @@ on:
 permissions: {}
 
 concurrency:
-  group: renovate-helm-hooks-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 28bd7551..8e105733 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -9,7 +9,7 @@ on:
 permissions: {}
 
 concurrency:
-  group: close-stale-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/test-docs-deploy.yml b/.github/workflows/test-docs-deploy.yml
index 96361ca4..6fd87d6f 100644
--- a/.github/workflows/test-docs-deploy.yml
+++ b/.github/workflows/test-docs-deploy.yml
@@ -14,7 +14,7 @@ permissions:
   contents: read
 
 concurrency:
-  group: docs-pr-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/trivy-scan.yml b/.github/workflows/trivy-scan.yml
index 898117aa..e65840d2 100644
--- a/.github/workflows/trivy-scan.yml
+++ b/.github/workflows/trivy-scan.yml
@@ -16,7 +16,7 @@ permissions:
   contents: read
 
 concurrency:
-  group: trivy-scan-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs: