diff --git a/scripts/build-toolchains.sh b/scripts/build-toolchains.sh
index e2f741b5..7bdeb5b6 100755
--- a/scripts/build-toolchains.sh
+++ b/scripts/build-toolchains.sh
@@ -124,7 +124,7 @@ else
 
     # build static libfesvr library for linking into firesim driver (or others)
     cd riscv-fesvr/build
-    $CHIPYARD_DIR/sims/firesim/scripts/build-static-libfesvr.sh
+    $CHIPYARD_DIR/scripts/build-static-libfesvr.sh
     cd $RDIR
     # build linux toolchain
     cd "$CHIPYARD_DIR/toolchains/$TOOLCHAIN/riscv-gnu-toolchain/build"
diff --git a/sims/firesim b/sims/firesim
index bb6c51a7..c2e1ad83 160000
--- a/sims/firesim
+++ b/sims/firesim
@@ -1 +1 @@
-Subproject commit bb6c51a788ba1b947afc159a0f032bfcf8cb7fa5
+Subproject commit c2e1ad830a3cce9e6dc97adf041e6b566330d7c9