diff --git a/.github/scripts/check-commit.sh b/.github/scripts/check-commit.sh
index b15c571d..fa71f201 100755
--- a/.github/scripts/check-commit.sh
+++ b/.github/scripts/check-commit.sh
@@ -45,11 +45,17 @@ search () {
     done
 }
 
-submodules=("cva6" "boom" "ibex" "gemmini" "hwacha" "icenet" "nvdla" "rocket-chip" "sha3" "sifive-blocks" "sifive-cache" "testchipip" "riscv-sodor" "mempress" "bar-fetchers" "shuttle")
+submodules=("cva6" "boom" "ibex" "gemmini" "hwacha" "icenet" "nvdla" "sha3" "sifive-blocks" "sifive-cache" "testchipip" "riscv-sodor" "mempress" "bar-fetchers" "shuttle")
 dir="generators"
 branches=("master" "main" "dev")
 search
 
+# rocket-chip is forked to graphics branch
+submodules=("rocket-chip")
+dir="generators"
+branches=("graphics")
+search
+
 submodules=("esp-tools-feedstock")
 dir="toolchains/esp-tools"
 branches=("main")
diff --git a/.github/workflows/chipyard-run-tests-gpu.yml b/.github/workflows/chipyard-run-tests-gpu.yml
index 011e2ce9..750c6697 100644
--- a/.github/workflows/chipyard-run-tests-gpu.yml
+++ b/.github/workflows/chipyard-run-tests-gpu.yml
@@ -330,29 +330,6 @@ jobs:
         with:
           group-key: "group-other"
 
-  prepare-chipyard-fpga:
-    name: prepare-chipyard-fpga
-    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-fpga"
-          build-type: "fpga"
-
   ##########################################################################
 
   chipyard-spike-gemmini-run-tests: