diff --git a/.github/actions/prepare-rtl/action.yml b/.github/actions/prepare-rtl/action.yml
index bbd8d56f..478f0241 100644
--- a/.github/actions/prepare-rtl/action.yml
+++ b/.github/actions/prepare-rtl/action.yml
@@ -21,11 +21,6 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - name: cd into remote
-      run: |
-        cd "${{ env.REMOTE_WORK_DIR }}"
-      shell: bash -leo pipefail {0}
-
     - uses: actions/cache@v3
       id: rtl-build-id
       with:
diff --git a/.github/scripts/defaults.sh b/.github/scripts/defaults.sh
index abdcdef5..a5f7f62e 100755
--- a/.github/scripts/defaults.sh
+++ b/.github/scripts/defaults.sh
@@ -9,9 +9,8 @@ REMOTE_MAKE_NPROC=4
 # CI_DIR is defined externally based on the GH repository secret BUILDDIR
 
 REMOTE_PREFIX=$CI_DIR/${GITHUB_REPOSITORY#*/}-${GITHUB_REF_NAME//\//-}
-# Use env.REMOTE_WORK_DIR set in workflow file
-# REMOTE_WORK_DIR=$REMOTE_PREFIX/$GITHUB_WORKSPACE
-REMOTE_CHIPYARD_DIR=$REMOTE_WORK_DIR
+REMOTE_WORK_DIR=$GITHUB_WORKSPACE
+REMOTE_CHIPYARD_DIR=$GITHUB_WORKSPACE
 REMOTE_SIM_DIR=$REMOTE_CHIPYARD_DIR/sims/verilator
 REMOTE_FIRESIM_DIR=$REMOTE_CHIPYARD_DIR/sims/firesim/sim
 REMOTE_FPGA_DIR=$REMOTE_CHIPYARD_DIR/fpga
diff --git a/.github/workflows/chipyard-gpu-flow.yml b/.github/workflows/chipyard-gpu-flow.yml
index 210ef42a..58cbd866 100644
--- a/.github/workflows/chipyard-gpu-flow.yml
+++ b/.github/workflows/chipyard-gpu-flow.yml
@@ -1,9 +1,9 @@
-name: chipyard-ci-full-flow
+name: chipyard-ci-full-flow-gpu
 
 on:
   push:
     branches:
-      - graphics
+      # - graphics
 
 defaults:
   run: