diff --git a/scripts/repo-clean.sh b/scripts/repo-clean.sh
index 35a11deb..9c6d0389 100755
--- a/scripts/repo-clean.sh
+++ b/scripts/repo-clean.sh
@@ -16,7 +16,7 @@ rm -rf $RDIR/toolchains/esp-tools/riscv-tests/build.log
     pushd $RDIR/generators/constellation
     if [ -d espresso ]
     then
-	git submodule deinit espresso    
+	git submodule deinit -f espresso
     fi
     popd
 )
@@ -25,3 +25,11 @@ rm -rf $RDIR/toolchains/esp-tools/riscv-tests/build.log
     git config --local status.showUntrackedFiles no
     popd
 )
+(
+    pushd $RDIR/generators/cva6/src/main/resources/vsrc
+    if [ -d cva6 ]
+    then
+	git submodule deinit -f cva6
+    fi
+    popd
+)
diff --git a/sims/firesim b/sims/firesim
index b1abd4b2..5991ada5 160000
--- a/sims/firesim
+++ b/sims/firesim
@@ -1 +1 @@
-Subproject commit b1abd4b296c84b52eab4270bbe8b7bd835d68cd0
+Subproject commit 5991ada598704988552e7e2f06e1c978c3508ef7