diff --git a/scripts/build-toolchains.sh b/scripts/build-toolchains.sh
index 69923c00..ec2e31b9 100755
--- a/scripts/build-toolchains.sh
+++ b/scripts/build-toolchains.sh
@@ -62,12 +62,12 @@ do
     shift
 done
 
-if [ "TOOLCHAINS" = "riscv-tools" ]; then
+if [ "$TOOLCHAINS" = "riscv-tools" ]; then
     if [ "$FIRESIMINSTALL" = "true" ]; then
       cd sims/firesim/
       git clone https://github.com/firesim/firesim-riscv-tools-prebuilt.git
       cd firesim-riscv-tools-prebuilt
-      git checkout 5fee18421a32058ab339572128201f4904354aaa
+      git checkout 56a40961c98db5e8f904f15dc6efd0870bfefd9e
       PREBUILTHASH="$(cat HASH)"
       cd $RDIR/toolchain/riscv-tools/
       GITHASH="git rev-parse HEAD"
diff --git a/sims/firesim b/sims/firesim
index 21c8a5e5..fe20b389 160000
--- a/sims/firesim
+++ b/sims/firesim
@@ -1 +1 @@
-Subproject commit 21c8a5e5f1e5f329232473380b067d9d5a8e0f8c
+Subproject commit fe20b389a9c19ae672500868e850e84fd8671fca