diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 24954826..04e29528 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -20,6 +20,10 @@ on:
   schedule:
     - cron: '45 20 * * 5'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   analyze:
     name: Analyze
diff --git a/.github/workflows/extension.yml b/.github/workflows/extension.yml
index 26a1c4a4..e352ea05 100644
--- a/.github/workflows/extension.yml
+++ b/.github/workflows/extension.yml
@@ -25,6 +25,10 @@ jobs:
   Build:
     runs-on: ubuntu-latest
 
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}
+      cancel-in-progress: true
+
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -109,7 +113,8 @@ jobs:
     needs: [ Build ]
 
     concurrency:
-      group: ${{ github.workflow }}
+      group: ${{ github.workflow }}-${{ github.ref }}
+      cancel-in-progress: false # wait for previous runs to complete
 
     steps:
     - name: Download Artifact
diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml
index 7219c40e..82062d65 100644
--- a/.github/workflows/server.yml
+++ b/.github/workflows/server.yml
@@ -29,6 +29,10 @@ jobs:
       IMAGE_NAME: 'dependabot-server'
       DOCKER_BUILDKIT: 1 # Enable Docker BuildKit
 
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}
+      cancel-in-progress: true
+
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -161,7 +165,8 @@ jobs:
   #   if: ${{ github.actor != 'dependabot[bot]' && ((github.ref == 'refs/heads/main') || startsWith(github.ref, 'refs/tags')) }}
 
   #   concurrency:
-  #     group: ${{ github.workflow }}
+  #     group: ${{ github.workflow }}-${{ github.ref }}
+  #     cancel-in-progress: false # wait for previous runs to complete
 
   #   steps:
   #   - name: Download Artifact
diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml
index b84a6e3f..86f08419 100644
--- a/.github/workflows/updater.yml
+++ b/.github/workflows/updater.yml
@@ -17,6 +17,10 @@ on:
     - ".github/workflows/updater.yml"
     - "!docs/**"
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   Build:
     runs-on: ubuntu-latest