diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index eb307d8d..747fc01a 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -5,6 +5,7 @@ on:
     branches: [ master ]
   pull_request:
     branches: [ master ]
+  workflow_call:
   schedule:
     - cron: '30 06 * * 6'
 
diff --git a/.github/workflows/docker-tests-8.0.yml b/.github/workflows/docker-tests-8.0.yml
index 7fc5470b..2939e154 100644
--- a/.github/workflows/docker-tests-8.0.yml
+++ b/.github/workflows/docker-tests-8.0.yml
@@ -6,6 +6,10 @@ on:
   pull_request:
     branches: [ master ]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref }}
+  cancel-in-progress: true
+
 env:
   GO_VERSION: 1.25.0
   DOCKER_API_VERSION: 1.43
@@ -17,10 +21,13 @@ jobs:
   all_unittests:
     uses: ./.github/workflows/unit-tests.yml
 
+  codeql:
+    uses: ./.github/workflows/codeql.yml
+
   buildimages:
     name: Build images
     runs-on: ubuntu-22.04
-    needs: [ lint, all_unittests ]
+    needs: [ lint, all_unittests, codeql ]
     steps:
       - name: Check out code into the Go module directory
         uses: actions/checkout@v5
diff --git a/.github/workflows/docker-tests-8.4.yml b/.github/workflows/docker-tests-8.4.yml
index c129b4eb..a37e599c 100644
--- a/.github/workflows/docker-tests-8.4.yml
+++ b/.github/workflows/docker-tests-8.4.yml
@@ -6,6 +6,10 @@ on:
   pull_request:
     branches: [ master ]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref }}
+  cancel-in-progress: true
+
 env:
   GO_VERSION: 1.25.0
   DOCKER_API_VERSION: 1.43
@@ -17,10 +21,13 @@ jobs:
   all_unittests:
     uses: ./.github/workflows/unit-tests.yml
 
+  codeql:
+    uses: ./.github/workflows/codeql.yml
+
   buildimages:
     name: Build images
     runs-on: ubuntu-22.04
-    needs: [ lint, all_unittests ]
+    needs: [ lint, all_unittests, codeql ]
     steps:
       - name: Check out code into the Go module directory
         uses: actions/checkout@v5
diff --git a/.github/workflows/docker-tests.yml b/.github/workflows/docker-tests.yml
index b733d91f..457f5623 100644
--- a/.github/workflows/docker-tests.yml
+++ b/.github/workflows/docker-tests.yml
@@ -6,6 +6,10 @@ on:
   pull_request:
     branches: [ master ]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref }}
+  cancel-in-progress: true
+
 env:
   GO_VERSION: 1.25.0
   DOCKER_API_VERSION: 1.43
@@ -17,10 +21,13 @@ jobs:
   all_unittests:
     uses: ./.github/workflows/unit-tests.yml
 
+  codeql:
+    uses: ./.github/workflows/codeql.yml
+
   buildimages:
     name: Build images
     runs-on: ubuntu-22.04
-    needs: [ lint, all_unittests ]
+    needs: [ lint, all_unittests, codeql ]
     steps:
       - name: Check out code into the Go module directory
         uses: actions/checkout@v5