diff --git a/.github/workflows/ci-backend.yml b/.github/workflows/ci-backend.yml
index 6bac2c24f5..0c30f2b1c7 100644
--- a/.github/workflows/ci-backend.yml
+++ b/.github/workflows/ci-backend.yml
@@ -8,7 +8,8 @@ on:
       - 'translations**'
   workflow_dispatch:
 concurrency:
-  group: backend-${{ github.event.pull_request.number || github.ref }}
+  # Let dev/main commits finish, PR and feature-branch runs supersede older ones
+  group: backend-${{ github.event.pull_request.number || ((github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/main') && github.run_id) || github.ref }}
   cancel-in-progress: true
 env:
   DEFAULT_UV_VERSION: "0.13.x"
diff --git a/.github/workflows/ci-docker.yml b/.github/workflows/ci-docker.yml
index 7b1c7f0ff5..2a6c5a7612 100644
--- a/.github/workflows/ci-docker.yml
+++ b/.github/workflows/ci-docker.yml
@@ -13,7 +13,8 @@ on:
       - main
   workflow_dispatch:
 concurrency:
-  group: docker-${{ github.event.pull_request.number || github.ref }}
+  # Let dev/main commits finish, PR and feature-branch runs supersede older ones
+  group: docker-${{ github.event.pull_request.number || ((github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/main') && github.run_id) || github.ref }}
   cancel-in-progress: true
 env:
   REGISTRY: ghcr.io
diff --git a/.github/workflows/ci-docs.yml b/.github/workflows/ci-docs.yml
index 61c54b77fb..b471dd6d53 100644
--- a/.github/workflows/ci-docs.yml
+++ b/.github/workflows/ci-docs.yml
@@ -6,7 +6,8 @@ on:
   pull_request:
   workflow_dispatch:
 concurrency:
-  group: docs-${{ github.event.pull_request.number || github.ref }}
+  # Let dev/main commits finish, PR and feature-branch runs supersede older ones
+  group: docs-${{ github.event.pull_request.number || ((github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/main') && github.run_id) || github.ref }}
   cancel-in-progress: true
 permissions:
   contents: read
diff --git a/.github/workflows/ci-frontend.yml b/.github/workflows/ci-frontend.yml
index 2cead59c59..bcf40223ab 100644
--- a/.github/workflows/ci-frontend.yml
+++ b/.github/workflows/ci-frontend.yml
@@ -8,7 +8,8 @@ on:
       - 'translations**'
   workflow_dispatch:
 concurrency:
-  group: frontend-${{ github.event.pull_request.number || github.ref }}
+  # Let dev/main commits finish, PR and feature-branch runs supersede older ones
+  group: frontend-${{ github.event.pull_request.number || ((github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/main') && github.run_id) || github.ref }}
   cancel-in-progress: true
 permissions: {}
 jobs:
diff --git a/.github/workflows/ci-lint.yml b/.github/workflows/ci-lint.yml
index 0bef634370..5abeab41a0 100644
--- a/.github/workflows/ci-lint.yml
+++ b/.github/workflows/ci-lint.yml
@@ -7,7 +7,8 @@ on:
     branches-ignore:
       - 'translations**'
 concurrency:
-  group: lint-${{ github.event.pull_request.number || github.ref }}
+  # Let dev/main commits finish, PR and feature-branch runs supersede older ones
+  group: lint-${{ github.event.pull_request.number || ((github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/main') && github.run_id) || github.ref }}
   cancel-in-progress: true
 permissions:
   contents: read
diff --git a/.github/workflows/ci-static-analysis.yml b/.github/workflows/ci-static-analysis.yml
index d774194e07..c534e75c05 100644
--- a/.github/workflows/ci-static-analysis.yml
+++ b/.github/workflows/ci-static-analysis.yml
@@ -8,7 +8,8 @@ on:
       - 'translations**'
   workflow_dispatch:
 concurrency:
-  group: static-analysis-${{ github.event.pull_request.number || github.ref }}
+  # Let dev/main commits finish, PR and feature-branch runs supersede older ones
+  group: static-analysis-${{ github.event.pull_request.number || ((github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/main') && github.run_id) || github.ref }}
   cancel-in-progress: true
 permissions:
   contents: read