diff --git a/.circleci/config.yml b/.circleci/config.yml
index fe932ecc..1b9c6d86 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,7 +6,7 @@ version: 2.1
 parameters:
     tools-cache-version:
         type: string
-        default: "v9"
+        default: "v10"
 
 # default execution env.s
 executors:
@@ -287,6 +287,7 @@ jobs:
         executor: main-env
         steps:
             - run-tests:
+                tools-version: "esp-tools"
                 group-key: "group-accels"
                 project-key: "chipyard-sha3"
     chipyard-streaming-fir-run-tests:
diff --git a/.circleci/run-tests.sh b/.circleci/run-tests.sh
index 5ea53c78..10fd58fb 100755
--- a/.circleci/run-tests.sh
+++ b/.circleci/run-tests.sh
@@ -65,6 +65,9 @@ case $1 in
         $LOCAL_SIM_DIR/simulator-chipyard-GemminiRocketConfig $GEMMINI_SOFTWARE_DIR/build/bareMetalC/mvin_mvout-baremetal
         ;;
     chipyard-sha3)
+        export RISCV=$LOCAL_ESP_DIR
+        export LD_LIBRARY_PATH=$LOCAL_ESP_DIR/lib
+        export PATH=$RISCV/bin:$PATH
         (cd $LOCAL_CHIPYARD_DIR/generators/sha3/software && ./build.sh)
         $LOCAL_SIM_DIR/simulator-chipyard-Sha3RocketConfig $LOCAL_CHIPYARD_DIR/generators/sha3/software/benchmarks/bare/sha3-rocc.riscv
         ;;
diff --git a/generators/sha3 b/generators/sha3
index 74e41f57..21035e49 160000
--- a/generators/sha3
+++ b/generators/sha3
@@ -1 +1 @@
-Subproject commit 74e41f579213549501ccf292d101f9db73ee2347
+Subproject commit 21035e498573b0e541cb87fe330e9d8dcfc88238
diff --git a/toolchains/esp-tools/riscv-gnu-toolchain b/toolchains/esp-tools/riscv-gnu-toolchain
index 9f532293..e0ffff1b 160000
--- a/toolchains/esp-tools/riscv-gnu-toolchain
+++ b/toolchains/esp-tools/riscv-gnu-toolchain
@@ -1 +1 @@
-Subproject commit 9f532293985d08b0c176d96c7b650e5f433780e1
+Subproject commit e0ffff1b48859eeddfb44c5739e03075186ca723
diff --git a/toolchains/esp-tools/riscv-isa-sim b/toolchains/esp-tools/riscv-isa-sim
index 86265d02..6c758c85 160000
--- a/toolchains/esp-tools/riscv-isa-sim
+++ b/toolchains/esp-tools/riscv-isa-sim
@@ -1 +1 @@
-Subproject commit 86265d02e8abea3b367114393d6b0661fd35b156
+Subproject commit 6c758c8510183b4ea6c2927ad8e19aa86f228adf
diff --git a/toolchains/esp-tools/riscv-pk b/toolchains/esp-tools/riscv-pk
index a3e4ac61..e8e6b3aa 160000
--- a/toolchains/esp-tools/riscv-pk
+++ b/toolchains/esp-tools/riscv-pk
@@ -1 +1 @@
-Subproject commit a3e4ac61d2b1ff37a22b9193b85d3b94273e80cb
+Subproject commit e8e6b3aaee44d43b48164fbd377864c3a682dbd3
diff --git a/toolchains/esp-tools/riscv-tests b/toolchains/esp-tools/riscv-tests
index e116930c..7c3dfd32 160000
--- a/toolchains/esp-tools/riscv-tests
+++ b/toolchains/esp-tools/riscv-tests
@@ -1 +1 @@
-Subproject commit e116930c7d4a30fc2a1378417089a089e9e4cad0
+Subproject commit 7c3dfd3205fa90104db06346e797a8eeea149207
diff --git a/toolchains/riscv-tools/riscv-gnu-toolchain b/toolchains/riscv-tools/riscv-gnu-toolchain
index 2855d823..88b004d4 160000
--- a/toolchains/riscv-tools/riscv-gnu-toolchain
+++ b/toolchains/riscv-tools/riscv-gnu-toolchain
@@ -1 +1 @@
-Subproject commit 2855d823a6e93d50af604264b02ced951e80de67
+Subproject commit 88b004d4c2a7d4e4f08b17ee32d2d4b9c194114e
diff --git a/toolchains/riscv-tools/riscv-isa-sim b/toolchains/riscv-tools/riscv-isa-sim
index acd953af..bf4b1e09 160000
--- a/toolchains/riscv-tools/riscv-isa-sim
+++ b/toolchains/riscv-tools/riscv-isa-sim
@@ -1 +1 @@
-Subproject commit acd953afd2f52d64e2264c2c7c713dc0ad614406
+Subproject commit bf4b1e09ed8e7a11ecff9891b12ce5d7f3375722
diff --git a/toolchains/riscv-tools/riscv-pk b/toolchains/riscv-tools/riscv-pk
index a3e4ac61..e8e6b3aa 160000
--- a/toolchains/riscv-tools/riscv-pk
+++ b/toolchains/riscv-tools/riscv-pk
@@ -1 +1 @@
-Subproject commit a3e4ac61d2b1ff37a22b9193b85d3b94273e80cb
+Subproject commit e8e6b3aaee44d43b48164fbd377864c3a682dbd3
diff --git a/toolchains/riscv-tools/riscv-tests b/toolchains/riscv-tools/riscv-tests
index 19bfdab4..1ce128fa 160000
--- a/toolchains/riscv-tools/riscv-tests
+++ b/toolchains/riscv-tools/riscv-tests
@@ -1 +1 @@
-Subproject commit 19bfdab48c2a6da4a2c67d5779757da7b073811d
+Subproject commit 1ce128fa78c24bb0ed399c647e7139322b5353a7