diff --git a/.github/workflows/checkMergeCommits.yml b/.github/workflows/checkMergeCommits.yml
deleted file mode 100644
index 371c075d8de..00000000000
--- a/.github/workflows/checkMergeCommits.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-on: pull_request
-
-name: Check for merge commits
-
-permissions:
-  pull-requests: read
-
-jobs:
-  message-check:
-    name: Block Merge Commits
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Block Merge Commits
-        uses: Morishiri/block-merge-commits-action@a4554c78def8d874966a8d1e20e2971121443755
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml
index 83c07a9da0e..bff7573f5a7 100644
--- a/.github/workflows/pr-checks.yml
+++ b/.github/workflows/pr-checks.yml
@@ -6,11 +6,16 @@ concurrency:
     cancel-in-progress: true
 
 on:
-  pull_request:
-    branches: [ master ]
+  pull_request
 
 jobs:
+  check-freeze-period:
+    if: github.base_ref == 'master'
+    uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/workflows/verifyFreezePeriod.yml@master
+  check-merge-commits:
+    uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/workflows/checkMergeCommits.yml@master
   check-versions:
+    if: github.base_ref == 'master'
     uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/workflows/checkVersions.yml@master
     with:
       botName: Eclipse JDT Bot
diff --git a/.github/workflows/verifyFreezePeriod.yml b/.github/workflows/verifyFreezePeriod.yml
deleted file mode 100644
index fed6cc53c54..00000000000
--- a/.github/workflows/verifyFreezePeriod.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# This workflow calls the Code-Freeze-Period check
-
-name: Check Code Freeze Period
-
-on:
-  pull_request:
-    branches: 
-     - 'master'
-
-jobs:
-  check-freeze-period:
-    uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/workflows/verifyFreezePeriod.yml@master