diff --git a/.github/workflows/chroot-checks.yml b/.github/workflows/chroot-checks.yml
index f3ebd6609c..3198fcf708 100644
--- a/.github/workflows/chroot-checks.yml
+++ b/.github/workflows/chroot-checks.yml
@@ -1,6 +1,6 @@
 name: Chroot checks
 on:
-  push:
+  merge_group:
   pull_request:
     branches:
       - main
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 60d5fba2a1..3a596f9c5d 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -1,5 +1,4 @@
 name: "CodeQL"
-
 on:
   merge_group:
   pull_request:
diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml
index 4e88d00c28..bce8c31e1a 100644
--- a/.github/workflows/codespell.yml
+++ b/.github/workflows/codespell.yml
@@ -1,11 +1,10 @@
+name: Spell Check
 on:
   merge_group:
   pull_request:
     branches:
       - main
       - '[0-9]+.[0-9]+'
-
-name: Spell Check
  
 jobs:
   codespell:
diff --git a/.github/workflows/database-upgrade.yml b/.github/workflows/database-upgrade.yml
index 42a979720d..251844a882 100644
--- a/.github/workflows/database-upgrade.yml
+++ b/.github/workflows/database-upgrade.yml
@@ -1,5 +1,4 @@
 name: Database Upgrade Test
-
 on:
   merge_group:
   pull_request:
diff --git a/.github/workflows/phpcodesniffer.yml b/.github/workflows/phpcodesniffer.yml
index 249b86ce63..1b8878dc48 100644
--- a/.github/workflows/phpcodesniffer.yml
+++ b/.github/workflows/phpcodesniffer.yml
@@ -1,6 +1,4 @@
 name: PHP CodeSniffer
-
-# Controls when the action will run. 
 on: 
   merge_group:
   pull_request:
diff --git a/.github/workflows/shiftleft.yml b/.github/workflows/shiftleft.yml
index 3f89782341..2498591a8a 100644
--- a/.github/workflows/shiftleft.yml
+++ b/.github/workflows/shiftleft.yml
@@ -1,7 +1,10 @@
 name: SL Scan
-
 on:
   merge_group:
+  pull_request:
+    branches:
+      - main
+      - '[0-9]+.[0-9]+'
 
 jobs:
   Scan-Build:
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 3421044a54..d6d53f8712 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -1,5 +1,4 @@
 name: Unit tests
-# We can speedup with: https://github.com/actions/cache
 on:
   merge_group:
   pull_request:
diff --git a/.github/workflows/upload-unit-tests.yml b/.github/workflows/upload-unit-tests.yml
index 7e21b4942a..5a3a0345f0 100644
--- a/.github/workflows/upload-unit-tests.yml
+++ b/.github/workflows/upload-unit-tests.yml
@@ -1,5 +1,4 @@
 name: Publish unit test results
-
 on:
   workflow_run:
     workflows: ["Unit tests"]