diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml
index d742b0ce4..37eeda1ae 100644
--- a/.github/workflows/install.yml
+++ b/.github/workflows/install.yml
@@ -24,7 +24,7 @@ jobs:
               ./.github/cli-space-cleanup.sh
               df -h
       - name: install
-        run: sudo ./bin/wally-tool-chain-install.sh --clean
+        run: sudo ./bin/wally-tool-chain-install.sh --clean --no-buildroot
       - name: Upload installation logs
         uses: actions/upload-artifact@v4
         if: always()
@@ -85,7 +85,7 @@ jobs:
               nsenter -t 1 -m -u -n -i bash -c "$(cat .github/cli-space-cleanup.sh)"
               df -h
       - name: install
-        run: sudo ./bin/wally-tool-chain-install.sh --clean
+        run: sudo ./bin/wally-tool-chain-install.sh --clean --no-buildroot
       - name: Upload installation logs
         uses: actions/upload-artifact@v4
         if: always()
@@ -133,7 +133,7 @@ jobs:
       - name: install packages with sudo
         run: sudo ./bin/wally-package-install.sh
       - name: install
-        run: ./bin/wally-tool-chain-install.sh --clean
+        run: ./bin/wally-tool-chain-install.sh --clean --no-buildroot
       - name: Upload installation logs
         uses: actions/upload-artifact@v4
         if: always()
@@ -180,7 +180,7 @@ jobs:
               ./.github/cli-space-cleanup.sh
               df -h
       - name: install
-        run: sudo ./bin/wally-tool-chain-install.sh --clean ${{ matrix.path }}
+        run: sudo ./bin/wally-tool-chain-install.sh --clean --no-buildroot ${{ matrix.path }}
       - name: Upload instalation logs
         uses: actions/upload-artifact@v4
         if: always()
diff --git a/bin/wally-tool-chain-install.sh b/bin/wally-tool-chain-install.sh
index fdb9d6e4f..59e26eb66 100755
--- a/bin/wally-tool-chain-install.sh
+++ b/bin/wally-tool-chain-install.sh
@@ -228,21 +228,22 @@ fi
 # This book is tested with GCC 13.2.0
 section_header "Installing/Updating RISC-V GNU Toolchain"
 STATUS="riscv-gnu-toolchain"
-cd "$RISCV"
-# Temporarily pin riscv-gnu-toolchain to use GCC 13.2.0. GCC 14 does not work with the Q extension.
-if git_check "riscv-gnu-toolchain" "https://github.com/riscv/riscv-gnu-toolchain" "$RISCV/riscv-gnu-toolchain/stamps/build-gcc-newlib-stage2" "b488ddb"; then
-    cd riscv-gnu-toolchain
-    git reset --hard && git clean -f && git checkout b488ddb #&& git pull
-    ./configure --prefix="${RISCV}" --with-multilib-generator="rv32e-ilp32e--;rv32i-ilp32--;rv32im-ilp32--;rv32iac-ilp32--;rv32imac-ilp32--;rv32imafc-ilp32f--;rv32imafdc-ilp32d--;rv64i-lp64--;rv64ic-lp64--;rv64iac-lp64--;rv64imac-lp64--;rv64imafdc-lp64d--;rv64im-lp64--;"
-    make -j "${NUM_THREADS}" 2>&1 | logger $STATUS; [ "${PIPESTATUS[0]}" == 0 ]
-    if [ "$clean" ]; then
-        cd "$RISCV"
-        rm -rf riscv-gnu-toolchain
-    fi
-    echo -e "${SUCCESS_COLOR}RISC-V GNU Toolchain successfully installed/updated!${ENDC}"
-else
-    echo -e "${SUCCESS_COLOR}RISC-V GNU Toolchain already up to date.${ENDC}"
-fi
+curl --location https://github.com/riscv-collab/riscv-gnu-toolchain/releases/download/2024.09.03/riscv64-elf-ubuntu-22.04-gcc-nightly-2024.09.03-nightly.tar.gz | tar xvz --directory="$RISCV" --strip-components=1
+# cd "$RISCV"
+# # Temporarily pin riscv-gnu-toolchain to use GCC 13.2.0. GCC 14 does not work with the Q extension.
+# if git_check "riscv-gnu-toolchain" "https://github.com/riscv/riscv-gnu-toolchain" "$RISCV/riscv-gnu-toolchain/stamps/build-gcc-newlib-stage2" "b488ddb"; then
+#     cd riscv-gnu-toolchain
+#     git reset --hard && git clean -f && git checkout b488ddb #&& git pull
+#     ./configure --prefix="${RISCV}" --with-multilib-generator="rv32e-ilp32e--;rv32i-ilp32--;rv32im-ilp32--;rv32iac-ilp32--;rv32imac-ilp32--;rv32imafc-ilp32f--;rv32imafdc-ilp32d--;rv64i-lp64--;rv64ic-lp64--;rv64iac-lp64--;rv64imac-lp64--;rv64imafdc-lp64d--;rv64im-lp64--;"
+#     make -j "${NUM_THREADS}" 2>&1 | logger $STATUS; [ "${PIPESTATUS[0]}" == 0 ]
+#     if [ "$clean" ]; then
+#         cd "$RISCV"
+#         rm -rf riscv-gnu-toolchain
+#     fi
+#     echo -e "${SUCCESS_COLOR}RISC-V GNU Toolchain successfully installed/updated!${ENDC}"
+# else
+#     echo -e "${SUCCESS_COLOR}RISC-V GNU Toolchain already up to date.${ENDC}"
+# fi
 
 
 # elf2hex (https://github.com/sifive/elf2hex)