diff --git a/.circleci/config.yml b/.circleci/config.yml
index 73fe147d..de58be12 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -250,7 +250,7 @@ jobs:
                     .circleci/create-hash.sh
             - restore_cache:
                 keys:
-                    - riscv-tools-installed-v1-{{ checksum "../riscv-tools.hash" }}
+                    - esp-tools-installed-v1-{{ checksum "../riscv-tools.hash" }}
             - restore_cache:
                 keys:
                     - verilator-installed-v3-{{ checksum "sims/verisim/verilator.mk" }}
@@ -405,7 +405,7 @@ jobs:
                     - verilator-installed-v3-{{ checksum "sims/verisim/verilator.mk" }}
             - run:
                 name: Run hwacha tests
-                command: export RISCV=/home/riscvuser/esp-tools-install; export LD_LIBRARY_PATH=$RISCV/lib; .circleci/run-tests.sh hwacha
+                command: .circleci/run-tests.sh hwacha
 
 # Order and dependencies of jobs to run
 workflows:
diff --git a/.circleci/do-rtl-build.sh b/.circleci/do-rtl-build.sh
index 40975108..2c7242cc 100755
--- a/.circleci/do-rtl-build.sh
+++ b/.circleci/do-rtl-build.sh
@@ -21,17 +21,27 @@ run "echo \"Ping $SERVER\""
 
 clean
 
-# copy over riscv-tools, verilator, and chipyard to remote
-run "mkdir -p $REMOTE_RISCV_DIR"
+# copy over riscv/esp-tools, verilator, and chipyard to remote
 run "mkdir -p $REMOTE_CHIPYARD_DIR"
 run "mkdir -p $REMOTE_VERILATOR_DIR"
-copy $LOCAL_RISCV_DIR/ $SERVER:$REMOTE_RISCV_DIR
 copy $LOCAL_CHIPYARD_DIR/ $SERVER:$REMOTE_CHIPYARD_DIR
 copy $LOCAL_VERILATOR_DIR/ $SERVER:$REMOTE_VERILATOR_DIR
 
+TOOLS_DIR=$REMOTE_RISCV_DIR
+LD_LIB_DIR=$REMOTE_RISCV_DIR/lib
+if [ $1 = "hwacha" ]; then
+    TOOLS_DIR=$REMOTE_ESP_DIR
+    LD_LIB_DIR=$REMOTE_ESP_DIR/lib
+    run "mkdir -p $REMOTE_ESP_DIR"
+    copy $LOCAL_ESP_DIR/ $SERVER:$REMOTE_ESP_DIR
+else
+    run "mkdir -p $REMOTE_RISCV_DIR"
+    copy $LOCAL_RISCV_DIR/ $SERVER:$REMOTE_RISCV_DIR
+fi
+
 # enter the verisim directory and build the specific config on remote server
 run "make -C $REMOTE_SIM_DIR clean"
-run "export RISCV=\"$REMOTE_RISCV_DIR\"; export VERILATOR_ROOT=$REMOTE_VERILATOR_DIR/install/share/verilator; make -C $REMOTE_SIM_DIR VERILATOR_INSTALL_DIR=$REMOTE_VERILATOR_DIR JAVA_ARGS=\"-Xmx8G -Xss8M\" ${mapping[$1]}"
+run "export RISCV=\"$TOOLS_DIR\"; export LD_LIBRARY_PATH=\"$LD_LIB_DIR\"; export VERILATOR_ROOT=$REMOTE_VERILATOR_DIR/install/share/verilator; make -C $REMOTE_SIM_DIR VERILATOR_INSTALL_DIR=$REMOTE_VERILATOR_DIR JAVA_ARGS=\"-Xmx8G -Xss8M\" ${mapping[$1]}"
 run "rm -rf $REMOTE_CHIPYARD_DIR/project"
 
 # copy back the final build
diff --git a/.circleci/run-tests.sh b/.circleci/run-tests.sh
index e0587e03..445278ee 100755
--- a/.circleci/run-tests.sh
+++ b/.circleci/run-tests.sh
@@ -41,6 +41,8 @@ case $1 in
         run_bmark ${mapping[$1]}
         ;;
     hwacha)
+        export RISCV=$REMOTE_ESP_DIR
+        export LD_LIBRARY_PATH=$REMOTE_ESP_DIR/lib
         make run-rv64uv-p-asm-tests-fst -C $LOCAL_SIM_DIR VERILATOR_INSTALL_DIR=$LOCAL_VERILATOR_DIR ${mapping[$1]}
         ;;
     *)