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/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 00000000000..64a04aec52f
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,21 @@
+name: Continuous Integration
+concurrency: 
+    group: ${{ github.workflow }}-${{ github.ref }}
+    cancel-in-progress: true
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  check-freeze-period:
+    if: github.event_name == 'pull_request'
+    uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/workflows/verifyFreezePeriod.yml@master
+  check-merge-commits:
+    if: github.event_name == 'pull_request'
+    uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/workflows/checkMergeCommits.yml@master
+  build:
+    uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/workflows/mavenBuild.yml@master
+
diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml
deleted file mode 100644
index f817d6f6009..00000000000
--- a/.github/workflows/rebase.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: Automatic Rebase
-on:
-  issue_comment:
-    types: [created]
-jobs:
-  rebase:
-    name: Rebase
-    if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase') 
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout the latest code
-        uses: actions/checkout@v3
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          fetch-depth: 0 # otherwise, you will fail to push refs to dest repo
-      - name: Automatic Rebase
-        uses: cirrus-actions/rebase@1.7
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
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
diff --git a/.m2/maven.config b/.m2/maven.config
new file mode 100644
index 00000000000..5d4970cc061
--- /dev/null
+++ b/.m2/maven.config
@@ -0,0 +1,2 @@
+-Dmaven.compiler.failOnWarning=true
+-Pbuild-individual-bundles
diff --git a/Jenkinsfile b/Jenkinsfile
index fe21065a5f7..c2dd176c867 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,8 +17,8 @@ pipeline {
 			steps {
 				wrap([$class: 'Xvnc', useXauthority: true]) {
 					sh """
-					mvn -U -e -Dmaven.compiler.failOnWarning=true -DskipTests=false -Dmaven.repo.local=$WORKSPACE/.m2/repository \
-						clean verify --batch-mode -Pbuild-individual-bundles -Pbree-libs -Papi-check -Dcompare-version-with-baselines.skip=false
+					mvn -U -e -DskipTests=false -Dmaven.repo.local=$WORKSPACE/.m2/repository \
+						clean verify --batch-mode -Pbree-libs -Papi-check -Dcompare-version-with-baselines.skip=false
 					"""
 				}
 			}