diff --git a/.gitmodules b/.gitmodules
index 86f29d8a..4f21369e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,10 +1,10 @@
-[submodule "rocket-chip"]
+[submodule "generators/rocket-chip"]
 	path = generators/rocket-chip
 	url = https://github.com/chipsalliance/rocket-chip.git
-[submodule "testchipip"]
+[submodule "generators/testchipip"]
 	path = generators/testchipip
 	url = https://github.com/ucb-bar/testchipip.git
-[submodule "barstools"]
+[submodule "tools/barstools"]
 	path = tools/barstools
 	url = https://github.com/ucb-bar/barstools.git
 [submodule "tools/torture"]
diff --git a/scripts/init-submodules-no-riscv-tools-nolog.sh b/scripts/init-submodules-no-riscv-tools-nolog.sh
index 4283e892..1779b8d8 100755
--- a/scripts/init-submodules-no-riscv-tools-nolog.sh
+++ b/scripts/init-submodules-no-riscv-tools-nolog.sh
@@ -69,6 +69,8 @@ cd "$RDIR"
         # path to temporarily exclude during the recursive update
         for name in \
             toolchains/*-tools/* \
+            generators/cva6 \
+            generators/nvdla \
             toolchains/libgloss \
             generators/sha3 \
             generators/gemmini \
@@ -101,6 +103,20 @@ cd "$RDIR"
     # Non-recursive clone to exclude riscv-linux
     git submodule update --init generators/sha3
 
+    # Non-recursive clone to exclude cva6 submods
+    git submodule update --init generators/cva6
+    git -C generators/cva6 submodule update --init src/main/resources/cva6/vsrc/cva6
+    git -C generators/cva6/src/main/resources/cva6/vsrc/cva6 submodule update --init src/axi
+    git -C generators/cva6/src/main/resources/cva6/vsrc/cva6 submodule update --init src/axi_riscv_atomics
+    git -C generators/cva6/src/main/resources/cva6/vsrc/cva6 submodule update --init src/common_cells
+    git -C generators/cva6/src/main/resources/cva6/vsrc/cva6 submodule update --init src/fpga-support
+    git -C generators/cva6/src/main/resources/cva6/vsrc/cva6 submodule update --init src/riscv-dbg
+    git -C generators/cva6/src/main/resources/cva6/vsrc/cva6 submodule update --init src/register_interface
+    git -C generators/cva6/src/main/resources/cva6/vsrc/cva6 submodule update --init --recursive src/fpu
+    # Non-recursive clone to exclude nvdla submods
+    git submodule update --init generators/nvdla
+    git -C generators/nvdla submodule update --init src/main/resources/hw
+
     # Non-recursive clone to exclude gemmini-software
     git submodule update --init generators/gemmini
     git -C generators/gemmini/ submodule update --init --recursive software/gemmini-rocc-tests