diff --git a/.gitmodules b/.gitmodules
index cae791dd..aab9a8f7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -127,4 +127,4 @@
 	url = https://github.com/ucb-bar/nvdla-workload.git
 [submodule "tools/dromajo/dromajo-src"]
 	path = tools/dromajo/dromajo-src
-	url = https://github.com/abejgonzalez/dromajo.git
+	url = https://github.com/riscv-boom/dromajo.git
diff --git a/generators/testchipip b/generators/testchipip
index 8ce64295..342d1d70 160000
--- a/generators/testchipip
+++ b/generators/testchipip
@@ -1 +1 @@
-Subproject commit 8ce64295f2c1f6b927145527538988809a03a057
+Subproject commit 342d1d70985797381985ea0a47e668961ceb0c3d