diff --git a/.github/scripts/install-gemmini.sh b/.github/scripts/install-gemmini.sh
index ef7a57eb..8a2ef5cd 100755
--- a/.github/scripts/install-gemmini.sh
+++ b/.github/scripts/install-gemmini.sh
@@ -37,6 +37,6 @@ cd $LOCAL_CHECKOUT_DIR
 chown -R $(whoami) .
 git config --global --add safe.directory $LOCAL_CHECKOUT_DIR
 git submodule update --init --recursive software/gemmini-rocc-tests
-rm -rf $LOCAL_CHIPYARD_DIR/generators/gemmini/*
+rm -rf $LOCAL_CHIPYARD_DIR/generators/gemmini/* $LOCAL_CHIPYARD_DIR/generators/gemmini/.git*
 mv -f $LOCAL_CHECKOUT_DIR/* $LOCAL_CHECKOUT_DIR/.git* $LOCAL_CHIPYARD_DIR/generators/gemmini/
 
diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index 4f66a1f7..f4a2dfda 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -25,8 +25,8 @@ jobs:
             ${{ steps.get-paths.outputs.LOCAL_CONDA }}
           key: gemmini-install-${{ github.ref }}-${{ github.sha }}
 
-  prepare-gemmini-config:
-    name: prepare-gemmini-config
+  build-gemmini-config:
+    name: build-gemmini-config
     runs-on: self-hosted
     needs: install-gemmini
     container:
@@ -53,13 +53,13 @@ jobs:
       - name: Building Gemmini Config using Verilator
         run: .github/scripts/do-rtl-build.sh
 
-      - name: cache prepare-gemmini-config install
+      - name: cache build-gemmini-config install
         uses: actions/cache@v2
         with:
           path: |
             ${{ steps.get-paths.outputs.LOCAL_CHIPYARD_DIR }}
             ${{ steps.get-paths.outputs.LOCAL_CONDA }}
-          key: prepare-gemmini-config-${{ github.ref }}-${{ github.sha }}
+          key: build-gemmini-config-${{ github.ref }}-${{ github.sha }}
 
   spike-run-tests:
     name: spike-run-tests
@@ -92,7 +92,7 @@ jobs:
   rtl-run-tests:
     name: rtl-run-tests
     runs-on: ubuntu-latest
-    needs: prepare-gemmini-config
+    needs: build-gemmini-config
     container:
       image: ucbbar/chipyard-ci-image:3f9150
       options: --entrypoint /bin/bash
@@ -106,13 +106,13 @@ jobs:
       - name: remove chipyard
         run: .github/scripts/remove-chipyard.sh
 
-      - name: restore cache prepare-gemmini-config install
+      - name: restore cache build-gemmini-config install
         uses: actions/cache@v2
         with:
           path: |
             ${{ steps.get-paths.outputs.LOCAL_CHIPYARD_DIR }}
             ${{ steps.get-paths.outputs.LOCAL_CONDA }}
-          key: prepare-gemmini-config-${{ github.ref }}-${{ github.sha }}
+          key: build-gemmini-config-${{ github.ref }}-${{ github.sha }}
 
       - name: run-tests
         run: .github/scripts/run-tests-rtl.sh