diff --git a/github_ci_prepare.sh b/github_ci_prepare.sh
index 4a32631..78b9422 100755
--- a/github_ci_prepare.sh
+++ b/github_ci_prepare.sh
@@ -15,15 +15,17 @@ cd qemu
 make -j $(nproc)
 sudo make install
 
+TOOLCHAIN_BASE_DIR=/opt/local
+
 ############################# RV32 #############################
 
-TOOLCHAIN_DIR32=${ROOT_DIR}/toolchain32
-mkdir -p ${TOOLCHAIN_DIR32} && cd ${TOOLCHAIN_DIR32}
+TOOLCHAIN_DIR32=${TOOLCHAIN_BASE_DIR}/cross-tool-riscv32-baremetal/
+mkdir -p ${TOOLCHAIN_BASE_DIR} && cd ${TOOLCHAIN_BASE_DIR}
 wget -q https://nightly.link/franzflasch/gcc-build-tools/workflows/riscv32-baremetal/main/toolchain_built_from_tar.zip
 unzip -q toolchain_built_from_tar.zip && rm toolchain_built_from_tar.zip
 tar xf *.tar.xz && rm -rf *.tar.xz
 
-cd ${TOOLCHAIN_DIR32}/toolchain/bin && export PATH=${PWD}:${PATH}
+cd ${TOOLCHAIN_DIR32}/bin && export PATH=${PWD}:${PATH}
 
 riscv32-none-elf-gcc --version
 
@@ -39,13 +41,13 @@ make
 
 ############################# RV64 #############################
 
-TOOLCHAIN_DIR64=${ROOT_DIR}/toolchain64
-mkdir -p ${TOOLCHAIN_DIR64} && cd ${TOOLCHAIN_DIR64}
+TOOLCHAIN_DIR64=${TOOLCHAIN_BASE_DIR}/cross-tool-riscv64-baremetal/
+mkdir -p ${TOOLCHAIN_BASE_DIR} && cd ${TOOLCHAIN_BASE_DIR}
 wget -q https://nightly.link/franzflasch/gcc-build-tools/workflows/riscv64-baremetal/main/toolchain_built_from_tar.zip
 unzip -q toolchain_built_from_tar.zip && rm toolchain_built_from_tar.zip
 tar xf *.tar.xz && rm -rf *.tar.xz
 
-cd ${TOOLCHAIN_DIR64}/toolchain/bin && export PATH=${PWD}:${PATH}
+cd ${TOOLCHAIN_DIR64}/bin && export PATH=${PWD}:${PATH}
 
 riscv64-none-elf-gcc --version