diff --git a/.github/actions/prepare-gpu/action.yml b/.github/actions/prepare-gpu/action.yml
index 7abca2ba..40a7e5b8 100644
--- a/.github/actions/prepare-gpu/action.yml
+++ b/.github/actions/prepare-gpu/action.yml
@@ -21,6 +21,7 @@ runs:
       run: |
         conda activate ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-${{ inputs.toolchain }}
         cd $REMOTE_CHIPYARD_DIR
+        echo $PWD
         ./scripts/init-submodules-no-riscv-tools.sh --force
       shell: bash -leo pipefail {0}
 
diff --git a/.github/scripts/defaults.sh b/.github/scripts/defaults.sh
index b723cd13..abdcdef5 100755
--- a/.github/scripts/defaults.sh
+++ b/.github/scripts/defaults.sh
@@ -9,8 +9,9 @@ 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//\//-}
-REMOTE_WORK_DIR=$REMOTE_PREFIX/$GITHUB_WORKSPACE
-REMOTE_CHIPYARD_DIR=$REMOTE_PREFIX/$GITHUB_WORKSPACE
+# Use env.REMOTE_WORK_DIR set in workflow file
+# REMOTE_WORK_DIR=$REMOTE_PREFIX/$GITHUB_WORKSPACE
+REMOTE_CHIPYARD_DIR=$REMOTE_WORK_DIR
 REMOTE_SIM_DIR=$REMOTE_CHIPYARD_DIR/sims/verilator
 REMOTE_FIRESIM_DIR=$REMOTE_CHIPYARD_DIR/sims/firesim/sim
 REMOTE_FPGA_DIR=$REMOTE_CHIPYARD_DIR/fpga