diff --git a/.github/workflows/main_debug.yml b/.github/workflows/main_debug.yml
index c6126d93dc..e6ad43b7ee 100644
--- a/.github/workflows/main_debug.yml
+++ b/.github/workflows/main_debug.yml
@@ -16,13 +16,14 @@ concurrency:
 
 
 env:
-  COMPILE_JOBS: 2
-  MULTI_CORE_TESTS_REGEX: "mpirun=2"
+  COMPILE_JOBS: 8
+  TEST_JOBS: 5
+
 
 jobs:
   build:
     name: Build (deal.ii:${{ matrix.dealii_version }})
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
 
     strategy:
       fail-fast: false
@@ -67,19 +68,7 @@ jobs:
           export OMPI_ALLOW_RUN_AS_ROOT=1
           export OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
           cd build-debug
-          # Print the tests to be executed
-          ctest -N --exclude-regex ${{ env.MULTI_CORE_TESTS_REGEX }}
-          # Run in parallel
-          ctest --output-on-failure -j${{ env.COMPILE_JOBS }} --exclude-regex ${{ env.MULTI_CORE_TESTS_REGEX }}
+          ctest -N
 
-      # These tests require two cores each so we will run them sequencially
-      - name: Run multi-core Lethe tests (Debug-deal.ii:${{ matrix.dealii_version }})
-        run: |
-          #Allow OMPI to run as root
-          export OMPI_ALLOW_RUN_AS_ROOT=1
-          export OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
-          cd build-debug
-          # Print the tests to be executed
-          ctest -N --tests-regex ${{ env.MULTI_CORE_TESTS_REGEX }}
-          # Run sequencially
-          ctest --output-on-failure --tests-regex ${{ env.MULTI_CORE_TESTS_REGEX }}
+          # Run in parallel
+          ctest --output-on-failure -j${{ env.TEST_JOBS }} 
diff --git a/.github/workflows/main_release.yml b/.github/workflows/main_release.yml
index c6ef35b409..9545059728 100644
--- a/.github/workflows/main_release.yml
+++ b/.github/workflows/main_release.yml
@@ -15,7 +15,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  COMPILE_JOBS: 2
+  COMPILE_JOBS: 8
   MULTI_CORE_TESTS_REGEX: "mpirun=2"
 
 jobs: