diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
deleted file mode 100644
index d24f7434279..00000000000
--- a/.github/workflows/build-test.yml
+++ /dev/null
@@ -1,66 +0,0 @@
-name: Build and Test
-
-on: [push, pull_request]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-20.04
-    timeout-minutes: 90
-
-    steps:
-    - uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-    - uses: dorny/paths-filter@v2
-      id: filter
-      with:
-        filters: |
-          dsf:
-            - 'dsf-gdb/**'
-            - 'dsf/**'
-            - 'debug/**'
-            - 'jtag/**'
-    - name: Set up JDK 21
-      uses: actions/setup-java@v3
-      with:
-        java-version: '21'
-        distribution: 'temurin'
-        cache: maven
-    - name: Set up Maven
-      uses: stCarolas/setup-maven@07fbbe97d97ef44336b7382563d66743297e442f # v4.5
-      with:
-        maven-version: 3.9.2
-    - name: Install GCC & GDB & other build essentials
-      run: |
-        sudo apt-get update
-        sudo apt-get -y install build-essential gcc g++ gdb gdbserver
-        gdb --version
-        gcc --version
-        gdbserver --version
-    - name: Build and Test
-      run: |
-        export DISPLAY=:99
-        sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
-        echo 0| sudo tee /proc/sys/kernel/yama/ptrace_scope
-        mvn \
-          clean verify -B -V \
-          -Dmaven.test.failure.ignore=true \
-          -DexcludedGroups=flakyTest,slowTest \
-          -Ddsf.gdb.tests.timeout.multiplier=50 \
-          -Ddsf-gdb.skip.tests=$(test ${{ steps.filter.outputs.dsf }} == 'false' && echo 'true' || echo 'false') \
-          -Dindexer.timeout=300
-    - name: Upload Logs
-      uses: actions/upload-artifact@v3
-      if: success() || failure()
-      with:
-        name: Code Cleanliness Detailed Logs
-        path: '*.log'
-    - name: Upload Test Results
-      uses: actions/upload-artifact@v3
-      if: success() || failure()
-      with:
-        name: test-results
-        path: |
-          */*/target/surefire-reports/*.xml
-          terminal/plugins/org.eclipse.tm.terminal.test/target/surefire-reports/*.xml
diff --git a/.github/workflows/code-cleanliness.yml b/.github/workflows/code-cleanliness.yml
index 65ce28e47fa..8749b64022a 100644
--- a/.github/workflows/code-cleanliness.yml
+++ b/.github/workflows/code-cleanliness.yml
@@ -4,39 +4,25 @@ on: [push, pull_request]
 
 jobs:
   build:
-
     runs-on: ubuntu-20.04
 
     steps:
-    - uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-    - name: Set up JDK 21
-      uses: actions/setup-java@v3
-      with:
-        java-version: '21'
-        distribution: 'temurin'
-        cache: maven
-    - name: Set up Maven
-      uses: stCarolas/setup-maven@07fbbe97d97ef44336b7382563d66743297e442f # v4.5
-      with:
-        maven-version: 3.9.2
-    - name: Install dependencies
-      run: |
-        sudo apt-get update && sudo apt-get install -y --no-install-recommends \
-          libxml2-utils
-    - name: Install Eclipse SDK
-      run: |
-        curl -sL https://download.eclipse.org/eclipse/downloads/drops4/R-4.23-202203080310/eclipse-SDK-4.23-linux-gtk-x86_64.tar.gz | tar xz
-    - name: Run Check Code Cleanliness
-      run: ECLIPSE=$PWD/eclipse/eclipse ./releng/scripts/check_code_cleanliness_only.sh
-    - name: Run Bundle Versions Bumped
-      run: ./releng/scripts/check_bundle_versions.sh
-    - name: Report on Bundle Versions Bumped
-      run: ./releng/scripts/check_bundle_versions_report.sh
-    - name: Upload Logs
-      uses: actions/upload-artifact@v3
-      if: success() || failure()
-      with:
-        name: Code Cleanliness Detailed Logs
-        path: '*.log'
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Run Check Code Cleanliness with Docker
+        uses: addnab/docker-run-action@v3
+        with:
+          image: quay.io/eclipse-cdt/cdt-infra-plus-eclipse-install@sha256:7146f40a39f75e364c473aa26044803582428f41f1f911e4b44a8ee8e72f89d1
+          options: -v ${{ github.workspace }}:/work
+          run: |
+            cd /work
+            ./releng/scripts/check_code_cleanliness_only.sh
+            ./releng/scripts/check_bundle_versions.sh
+            ./releng/scripts/check_bundle_versions_report.sh
+      - name: Upload Logs
+        uses: actions/upload-artifact@v3
+        if: success() || failure()
+        with:
+          name: Code Cleanliness Detailed Logs
+          path: "*.log"
diff --git a/.github/workflows/licensecheck.yml b/.github/workflows/licensecheck.yml
deleted file mode 100644
index 0177ef02735..00000000000
--- a/.github/workflows/licensecheck.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-# This workflow will check for Maven projects if the licenses of all (transitive) dependencies are vetted.
-
-name: License vetting status check
-
-on:
-  push:
-    branches: 
-      - 'main'
-  pull_request:
-    branches: 
-     - 'main'
-  issue_comment:
-    types: [created]
-
-jobs:
-  call-license-check:
-    uses: eclipse/dash-licenses/.github/workflows/mavenLicenseCheck.yml@master
-    with:
-      projectId: tools.cdt
-    secrets:
-      gitlabAPIToken: ${{ secrets.GITLAB_API_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/report.yml b/.github/workflows/report.yml
deleted file mode 100644
index 307b2f16847..00000000000
--- a/.github/workflows/report.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Unit Test Results
-
-on:
-  workflow_run:
-    workflows: ["Build and Test"]
-    types:
-      - completed
-
-jobs:
-  unit-test-results:
-    name: Unit Test Results
-    runs-on: ubuntu-20.04
-    if: github.event.workflow_run.conclusion != 'skipped'
-
-    steps:
-      - name: Download Test Report
-        uses: dawidd6/action-download-artifact@v2
-        with:
-          name: test-results
-          path: test-results
-          workflow: ${{ github.event.workflow.id }}
-          run_id: ${{ github.event.workflow_run.id }}
-      - name: Publish Test Report as GitHub PR Comment
-        uses: EnricoMi/publish-unit-test-result-action@v2
-        if: always()
-        with:
-          commit: ${{ github.event.workflow_run.head_sha }}
-          junit_files: "test-results/**/*.xml"