diff --git a/.gitmodules b/.gitmodules
index 55b4be56..bb803d98 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -76,7 +76,7 @@
 	url = https://github.com/ucb-bar/dsptools.git
 [submodule "tools/chisel-testers"]
 	path = tools/chisel-testers
-	url = https://github.com/abejgonzalez/chisel-testers.git
+	url = https://github.com/ucb-bar/chisel-testers.git
 [submodule "tools/treadle"]
 	path = tools/treadle
 	url = https://github.com/freechipsproject/treadle.git
diff --git a/generators/boom b/generators/boom
index a53372fc..eab35947 160000
--- a/generators/boom
+++ b/generators/boom
@@ -1 +1 @@
-Subproject commit a53372fcff4c1095a513eb8bb6e8a2b9cdb971a0
+Subproject commit eab359478622cb089ac3164e8efc158a9b0b5028
diff --git a/tools/chisel-testers b/tools/chisel-testers
index 5b9cc56d..461e8d3a 160000
--- a/tools/chisel-testers
+++ b/tools/chisel-testers
@@ -1 +1 @@
-Subproject commit 5b9cc56dd80c8d3bce67d54385d769037e2481d8
+Subproject commit 461e8d3a3e2f2e4c78d60c239428214cf8c7d773