diff --git a/.github/actions/run-tests/action.yml b/.github/actions/run-tests/action.yml
index 892ea699..28064e31 100644
--- a/.github/actions/run-tests/action.yml
+++ b/.github/actions/run-tests/action.yml
@@ -24,14 +24,9 @@ runs:
       run: ./scripts/init-submodules-no-riscv-tools.sh
       shell: bash
 
-    - name: Build toolchain
-      uses: ./.github/actions/toolchain-build
-      with:
-        tools-version: ${{ inputs.tools-version }}
-
     # Note: You shouldn't need the other inputs since it shouldn't build RTL from scratch
     - name: Build RTL
-      uses: ./.github/actions/toolchain-build
+      uses: ./.github/actions/prepare-rtl
       with:
         tools-version: ${{ inputs.tools-version }}
         group-key: ${{ inputs.group-key }}
diff --git a/.github/actions/toolchain-build/action.yml b/.github/actions/toolchain-build/action.yml
index 6e5329a7..f84a0fd9 100644
--- a/.github/actions/toolchain-build/action.yml
+++ b/.github/actions/toolchain-build/action.yml
@@ -1,5 +1,5 @@
 name: toolchain-build
-description: 'Builds or retrieves cache of the selected toolchain'
+description: 'Builds or retrieves cache of the all toolchains'
 
 inputs:
   tools-version:
diff --git a/.github/scripts/remote-do-rtl-build.sh b/.github/scripts/remote-do-rtl-build.sh
index bda81ead..e5c4e101 100755
--- a/.github/scripts/remote-do-rtl-build.sh
+++ b/.github/scripts/remote-do-rtl-build.sh
@@ -25,11 +25,12 @@ if [ $1 = "group-accels" ]; then
     export RISCV=$REMOTE_ESP_DIR
     export LD_LIBRARY_PATH=$REMOTE_ESP_DIR/lib
     export PATH=$RISCV/bin:$PATH
-    GEMMINI_SOFTWARE_DIR=$REMOTE_CHIPYARD_DIR/generators/gemmini/software/gemmini-rocc-tests
-    cd $GEMMINI_SOFTWARE_DIR
+    pushd $REMOTE_CHIPYARD_DIR/generators/gemmini/software
     git submodule update --init --recursive gemmini-rocc-tests
-    cd gemmini-rocc-tests
+    pushd gemmini-rocc-tests
     ./build.sh
+    popd
+    popd
 fi
 
 # choose what make dir to use