diff --git a/.github/scripts/defaults.sh b/.github/scripts/defaults.sh
index 22307531..04ccd331 100755
--- a/.github/scripts/defaults.sh
+++ b/.github/scripts/defaults.sh
@@ -8,13 +8,12 @@ REMOTE_MAKE_NPROC=4
 # verilator version
 VERILATOR_VERSION=v4.034
 
-# remote variables
-
+HOME=$GITHUB_WORKSPACE
 CURRENT_BRANCH=$(git branch --show-current)
 
+# remote variables
 # CI_DIR is defined externally based on the GH repository secret BUILDDIR
 
-HOME=`pwd`
 REMOTE_PREFIX=$CI_DIR/${GITHUB_REPOSITORY#*/}-$CURRENT_BRANCH
 REMOTE_WORK_DIR=$GITHUB_WORKSPACE
 REMOTE_RISCV_DIR=$GITHUB_WORKSPACE/riscv-tools-install
diff --git a/.github/workflows/chipyard-run-tests.yml b/.github/workflows/chipyard-run-tests.yml
index 753bd66c..61b3bfc4 100644
--- a/.github/workflows/chipyard-run-tests.yml
+++ b/.github/workflows/chipyard-run-tests.yml
@@ -78,23 +78,23 @@ jobs:
           #        run: cat /tmp/sphinx-err*.log
           #      - uses: ./.github/actions/job-end
           #
-          #  install-riscv-toolchain:
-          #    name: install-riscv-toolchain
-          #    runs-on: ubuntu-latest
-          #    container:
-          #      image: ucbbar/chipyard-ci-image:554b436
-          #      options: --entrypoint /bin/bash
-          #    steps:
-          #      - name: Checkout
-          #        uses: actions/checkout@v2
-          #      - uses: ./.github/actions/job-start
-          #        id: job-start
-          #      - name: Build default RISC-V toolchain
-          #        if: steps.job-start.outputs.run_result != 'success'
-          #        uses: ./.github/actions/toolchain-build
-          #        with:
-          #          tools-version: 'riscv-tools'
-          #      - uses: ./.github/actions/job-end
+  install-riscv-toolchain:
+    name: install-riscv-toolchain
+    runs-on: ubuntu-latest
+    container:
+      image: ucbbar/chipyard-ci-image:554b436
+      options: --entrypoint /bin/bash
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - uses: ./.github/actions/job-start
+        id: job-start
+      - name: Build default RISC-V toolchain
+        if: steps.job-start.outputs.run_result != 'success'
+        uses: ./.github/actions/toolchain-build
+        with:
+          tools-version: 'riscv-tools'
+      - uses: ./.github/actions/job-end
           #
           #  install-esp-toolchain:
           #    name: install-esp-toolchain