diff --git a/.github/workflows/chipyard-run-tests-gpu.yml b/.github/workflows/chipyard-run-tests-gpu.yml
index 4a5516ca..0d217716 100644
--- a/.github/workflows/chipyard-run-tests-gpu.yml
+++ b/.github/workflows/chipyard-run-tests-gpu.yml
@@ -94,27 +94,27 @@ jobs:
 
   ##########################################################################
 
-  prepare-chipyard-cores:
-    name: prepare-chipyard-cores
-    needs: setup-complete
-    runs-on: self-hosted
-    steps:
-      - name: Delete old checkout
-        run: |
-            ls -alh .
-            rm -rf ${{ github.workspace }}/* || true
-            rm -rf ${{ github.workspace }}/.* || true
-            ls -alh .
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Git workaround
-        uses: ./.github/actions/git-workaround
-      - name: Create conda env
-        uses: ./.github/actions/create-conda-env
-      - name: Build RTL on self-hosted
-        uses: ./.github/actions/prepare-rtl
-        with:
-          group-key: "group-cores"
+  # prepare-chipyard-cores:
+  #   name: prepare-chipyard-cores
+  #   needs: setup-complete
+  #   runs-on: self-hosted
+  #   steps:
+  #     - name: Delete old checkout
+  #       run: |
+  #           ls -alh .
+  #           rm -rf ${{ github.workspace }}/* || true
+  #           rm -rf ${{ github.workspace }}/.* || true
+  #           ls -alh .
+  #     - name: Checkout
+  #       uses: actions/checkout@v3
+  #     - name: Git workaround
+  #       uses: ./.github/actions/git-workaround
+  #     - name: Create conda env
+  #       uses: ./.github/actions/create-conda-env
+  #     - name: Build RTL on self-hosted
+  #       uses: ./.github/actions/prepare-rtl
+  #       with:
+  #         group-key: "group-cores"
 
   prepare-chipyard-gpu:
     name: prepare-chipyard-gpu
@@ -162,27 +162,27 @@ jobs:
   #       with:
   #         group-key: "group-accels"
 
-  prepare-chipyard-other:
-    name: prepare-chipyard-other
-    needs: setup-complete
-    runs-on: self-hosted
-    steps:
-      - name: Delete old checkout
-        run: |
-            ls -alh .
-            rm -rf ${{ github.workspace }}/* || true
-            rm -rf ${{ github.workspace }}/.* || true
-            ls -alh .
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Git workaround
-        uses: ./.github/actions/git-workaround
-      - name: Create conda env
-        uses: ./.github/actions/create-conda-env
-      - name: Build RTL on self-hosted
-        uses: ./.github/actions/prepare-rtl
-        with:
-          group-key: "group-other"
+  # prepare-chipyard-other:
+  #   name: prepare-chipyard-other
+  #   needs: setup-complete
+  #   runs-on: self-hosted
+  #   steps:
+  #     - name: Delete old checkout
+  #       run: |
+  #           ls -alh .
+  #           rm -rf ${{ github.workspace }}/* || true
+  #           rm -rf ${{ github.workspace }}/.* || true
+  #           ls -alh .
+  #     - name: Checkout
+  #       uses: actions/checkout@v3
+  #     - name: Git workaround
+  #       uses: ./.github/actions/git-workaround
+  #     - name: Create conda env
+  #       uses: ./.github/actions/create-conda-env
+  #     - name: Build RTL on self-hosted
+  #       uses: ./.github/actions/prepare-rtl
+  #       with:
+  #         group-key: "group-other"
 
   ##########################################################################
 
@@ -215,51 +215,51 @@ jobs:
   #         conda activate ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-riscv-tools
   #         cd ${{ github.workspace }}/generators/gemmini/software && ${{ github.workspace }}/software/firemarshal/marshal -v -d launch -s gemmini-smoke.json
 
-  chipyard-rocket-run-tests:
-    name: chipyard-rocket-run-tests
-    needs: prepare-chipyard-cores
-    runs-on: self-hosted
-    steps:
-      - name: Delete old checkout
-        run: |
-            ls -alh .
-            rm -rf ${{ github.workspace }}/* || true
-            rm -rf ${{ github.workspace }}/.* || true
-            ls -alh .
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Git workaround
-        uses: ./.github/actions/git-workaround
-      - name: Create conda env
-        uses: ./.github/actions/create-conda-env
-      - name: Run tests
-        uses: ./.github/actions/run-tests
-        with:
-          group-key: "group-cores"
-          project-key: "chipyard-rocket"
+  # chipyard-rocket-run-tests:
+  #   name: chipyard-rocket-run-tests
+  #   needs: prepare-chipyard-cores
+  #   runs-on: self-hosted
+  #   steps:
+  #     - name: Delete old checkout
+  #       run: |
+  #           ls -alh .
+  #           rm -rf ${{ github.workspace }}/* || true
+  #           rm -rf ${{ github.workspace }}/.* || true
+  #           ls -alh .
+  #     - name: Checkout
+  #       uses: actions/checkout@v3
+  #     - name: Git workaround
+  #       uses: ./.github/actions/git-workaround
+  #     - name: Create conda env
+  #       uses: ./.github/actions/create-conda-env
+  #     - name: Run tests
+  #       uses: ./.github/actions/run-tests
+  #       with:
+  #         group-key: "group-cores"
+  #         project-key: "chipyard-rocket"
 
-  chipyard-boom-run-tests:
-    name: chipyard-boom-run-tests
-    needs: prepare-chipyard-cores
-    runs-on: self-hosted
-    steps:
-      - name: Delete old checkout
-        run: |
-            ls -alh .
-            rm -rf ${{ github.workspace }}/* || true
-            rm -rf ${{ github.workspace }}/.* || true
-            ls -alh .
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Git workaround
-        uses: ./.github/actions/git-workaround
-      - name: Create conda env
-        uses: ./.github/actions/create-conda-env
-      - name: Run tests
-        uses: ./.github/actions/run-tests
-        with:
-          group-key: "group-cores"
-          project-key: "chipyard-boom"
+  # chipyard-boom-run-tests:
+  #   name: chipyard-boom-run-tests
+  #   needs: prepare-chipyard-cores
+  #   runs-on: self-hosted
+  #   steps:
+  #     - name: Delete old checkout
+  #       run: |
+  #           ls -alh .
+  #           rm -rf ${{ github.workspace }}/* || true
+  #           rm -rf ${{ github.workspace }}/.* || true
+  #           ls -alh .
+  #     - name: Checkout
+  #       uses: actions/checkout@v3
+  #     - name: Git workaround
+  #       uses: ./.github/actions/git-workaround
+  #     - name: Create conda env
+  #       uses: ./.github/actions/create-conda-env
+  #     - name: Run tests
+  #       uses: ./.github/actions/run-tests
+  #       with:
+  #         group-key: "group-cores"
+  #         project-key: "chipyard-boom"
 
   chipyard-vortex-run-tests:
     name: chipyard-vortex-run-tests
@@ -330,28 +330,28 @@ jobs:
           group-key: "group-gpu"
           project-key: "coalescer"
 
-  chipyard-spike-run-tests:
-    name: chipyard-spike-run-tests
-    needs: prepare-chipyard-cores
-    runs-on: self-hosted
-    steps:
-      - name: Delete old checkout
-        run: |
-            ls -alh .
-            rm -rf ${{ github.workspace }}/* || true
-            rm -rf ${{ github.workspace }}/.* || true
-            ls -alh .
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Git workaround
-        uses: ./.github/actions/git-workaround
-      - name: Create conda env
-        uses: ./.github/actions/create-conda-env
-      - name: Run tests
-        uses: ./.github/actions/run-tests
-        with:
-          group-key: "group-cores"
-          project-key: "chipyard-spike"
+  # chipyard-spike-run-tests:
+  #   name: chipyard-spike-run-tests
+  #   needs: prepare-chipyard-cores
+  #   runs-on: self-hosted
+  #   steps:
+  #     - name: Delete old checkout
+  #       run: |
+  #           ls -alh .
+  #           rm -rf ${{ github.workspace }}/* || true
+  #           rm -rf ${{ github.workspace }}/.* || true
+  #           ls -alh .
+  #     - name: Checkout
+  #       uses: actions/checkout@v3
+  #     - name: Git workaround
+  #       uses: ./.github/actions/git-workaround
+  #     - name: Create conda env
+  #       uses: ./.github/actions/create-conda-env
+  #     - name: Run tests
+  #       uses: ./.github/actions/run-tests
+  #       with:
+  #         group-key: "group-cores"
+  #         project-key: "chipyard-spike"
 
   # chipyard-gemmini-run-tests:
   #   name: chipyard-gemmini-run-tests
@@ -399,67 +399,67 @@ jobs:
   #         group-key: "group-accels"
   #         project-key: "chipyard-nvdla"
 
-  testchipip-run-tests:
-    name: testchipip-run-tests
-    needs: prepare-chipyard-other
-    runs-on: self-hosted
-    steps:
-      - name: Delete old checkout
-        run: |
-            ls -alh .
-            rm -rf ${{ github.workspace }}/* || true
-            rm -rf ${{ github.workspace }}/.* || true
-            ls -alh .
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Git workaround
-        uses: ./.github/actions/git-workaround
-      - name: Create conda env
-        uses: ./.github/actions/create-conda-env
-      - name: Run tests
-        uses: ./.github/actions/run-tests
-        with:
-          group-key: "group-other"
-          project-key: "testchipip"
+  # testchipip-run-tests:
+  #   name: testchipip-run-tests
+  #   needs: prepare-chipyard-other
+  #   runs-on: self-hosted
+  #   steps:
+  #     - name: Delete old checkout
+  #       run: |
+  #           ls -alh .
+  #           rm -rf ${{ github.workspace }}/* || true
+  #           rm -rf ${{ github.workspace }}/.* || true
+  #           ls -alh .
+  #     - name: Checkout
+  #       uses: actions/checkout@v3
+  #     - name: Git workaround
+  #       uses: ./.github/actions/git-workaround
+  #     - name: Create conda env
+  #       uses: ./.github/actions/create-conda-env
+  #     - name: Run tests
+  #       uses: ./.github/actions/run-tests
+  #       with:
+  #         group-key: "group-other"
+  #         project-key: "testchipip"
 
-  rocketchip-run-tests:
-    name: rocketchip-run-tests
-    needs: prepare-chipyard-other
-    runs-on: self-hosted
-    steps:
-      - name: Delete old checkout
-        run: |
-            ls -alh .
-            rm -rf ${{ github.workspace }}/* || true
-            rm -rf ${{ github.workspace }}/.* || true
-            ls -alh .
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Git workaround
-        uses: ./.github/actions/git-workaround
-      - name: Create conda env
-        uses: ./.github/actions/create-conda-env
-      - name: Run amba tests
-        uses: ./.github/actions/run-tests
-        with:
-          group-key: "group-other"
-          project-key: "rocketchip-amba"
-      # Below tests segfault with verilator, work fine in VCS
-      # - name: Run tlsimple tests
-      #   uses: ./.github/actions/run-tests
-      #   with:
-      #     group-key: "group-other"
-      #     project-key: "rocketchip-tlsimple"
-      # - name: Run tlwidth tests
-      #   uses: ./.github/actions/run-tests
-      #   with:
-      #     group-key: "group-other"
-      #     project-key: "rocketchip-tlwidth"
-      # - name: Run tlxbar tests
-      #   uses: ./.github/actions/run-tests
-      #   with:
-      #     group-key: "group-other"
-      #     project-key: "rocketchip-tlxbar"
+  # rocketchip-run-tests:
+  #   name: rocketchip-run-tests
+  #   needs: prepare-chipyard-other
+  #   runs-on: self-hosted
+  #   steps:
+  #     - name: Delete old checkout
+  #       run: |
+  #           ls -alh .
+  #           rm -rf ${{ github.workspace }}/* || true
+  #           rm -rf ${{ github.workspace }}/.* || true
+  #           ls -alh .
+  #     - name: Checkout
+  #       uses: actions/checkout@v3
+  #     - name: Git workaround
+  #       uses: ./.github/actions/git-workaround
+  #     - name: Create conda env
+  #       uses: ./.github/actions/create-conda-env
+  #     - name: Run amba tests
+  #       uses: ./.github/actions/run-tests
+  #       with:
+  #         group-key: "group-other"
+  #         project-key: "rocketchip-amba"
+  #     # Below tests segfault with verilator, work fine in VCS
+  #     # - name: Run tlsimple tests
+  #     #   uses: ./.github/actions/run-tests
+  #     #   with:
+  #     #     group-key: "group-other"
+  #     #     project-key: "rocketchip-tlsimple"
+  #     # - name: Run tlwidth tests
+  #     #   uses: ./.github/actions/run-tests
+  #     #   with:
+  #     #     group-key: "group-other"
+  #     #     project-key: "rocketchip-tlwidth"
+  #     # - name: Run tlxbar tests
+  #     #   uses: ./.github/actions/run-tests
+  #     #   with:
+  #     #     group-key: "group-other"
+  #     #     project-key: "rocketchip-tlxbar"
 
   # Sentinel job to simplify how we specify which checks need to pass in branch
   # protection and in Mergify
@@ -467,13 +467,15 @@ jobs:
   # When adding new top level jobs, please add them to `needs` below
   all_tests_passed:
     name: "all tests passed"
-    needs: [chipyard-rocket-run-tests,
-            chipyard-boom-run-tests,
+    needs: [
+            # chipyard-rocket-run-tests,
+            # chipyard-boom-run-tests,
             chipyard-vortex-run-tests,
+            chipyard-coalescer-run-tests,
             coalescer-run-tests,
             # chipyard-gemmini-run-tests,
-            testchipip-run-tests,
-            rocketchip-run-tests,
+            # testchipip-run-tests,
+            # rocketchip-run-tests,
             ]
     runs-on: self-hosted
     steps: