diff --git a/software/firemarshal b/software/firemarshal
index 87c9fd1d..0c0cdfeb 160000
--- a/software/firemarshal
+++ b/software/firemarshal
@@ -1 +1 @@
-Subproject commit 87c9fd1db339ca3987ebcac5df2f00587bb25dd2
+Subproject commit 0c0cdfeb269b37c3d10e5f21b84cd60c21457487
diff --git a/toolchains/riscv-tools/riscv-pk b/toolchains/riscv-tools/riscv-pk
index e8e6b3aa..4f3debe4 160000
--- a/toolchains/riscv-tools/riscv-pk
+++ b/toolchains/riscv-tools/riscv-pk
@@ -1 +1 @@
-Subproject commit e8e6b3aaee44d43b48164fbd377864c3a682dbd3
+Subproject commit 4f3debe4d04f56d31089c1c716a27e2d5245e9a1