diff --git a/.github/workflows/hadolint.yml b/.github/workflows/lint-docker.yml
similarity index 90%
rename from .github/workflows/hadolint.yml
rename to .github/workflows/lint-docker.yml
index be31d0cc1a..5d42e36e7c 100644
--- a/.github/workflows/hadolint.yml
+++ b/.github/workflows/lint-docker.yml
@@ -9,11 +9,7 @@
 name: Hadolint
 
 on:
-  push:
-    branches: [ "master" ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ "master" ]
+  workflow_call:
   schedule:
     - cron: '33 10 * * 2'
 
diff --git a/.github/workflows/mark-stable.yml b/.github/workflows/mark-stable.yml
index 75650497e8..32561a3abe 100644
--- a/.github/workflows/mark-stable.yml
+++ b/.github/workflows/mark-stable.yml
@@ -11,10 +11,14 @@ on:
 jobs:
   lint-ansible:
     uses: ./.github/workflows/lint-ansible.yml
+  lint-docker:
+    uses: ./.github/workflows/lint-docker.yml
   lint-python:
     uses: ./.github/workflows/lint-python.yml
   lint-shell:
     uses: ./.github/workflows/lint-shell.yml
+  security-codeql:
+    uses: ./.github/workflows/security-codeql.yml
   test-code-integration:
     uses: ./.github/workflows/test-code-integration.yml
   test-code-lint:
@@ -35,6 +39,8 @@ jobs:
     needs:
       - lint-python
       - lint-shell
+      - lint-docker
+      - security-codeql
       - test-code-integration
       - test-code-lint
       - test-code-unit
diff --git a/.github/workflows/codeql.yml b/.github/workflows/security-codeql.yml
similarity index 98%
rename from .github/workflows/codeql.yml
rename to .github/workflows/security-codeql.yml
index 3be504d624..3c31ca32d2 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/security-codeql.yml
@@ -12,10 +12,7 @@
 name: "CodeQL Advanced"
 
 on:
-  push:
-    branches: [ "master" ]
-  pull_request:
-    branches: [ "master" ]
+  workflow_call:
   schedule:
     - cron: '36 9 * * 6'