diff --git a/.gitmodules b/.gitmodules
index e1c54eca5c81989879c56dccf3f3d97bb0d772f5..b4c0397b77e693b733b998a2ad2e81b78a380745 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,28 +1,24 @@
 [submodule "accelerator-wrapper"]
 	path = accelerator-wrapper
 	url = git@git.soton.ac.uk:soclabs/accelerator-wrapper.git
-	branch = main
-[submodule "nanosoc"]
+	[submodule "nanosoc"]
 	path = nanosoc
 	url = git@git.soton.ac.uk:soclabs/nanosoc.git
-	branch = main
-[submodule "socsim"]
+	[submodule "socsim"]
 	path = socsim
 	url = git@git.soton.ac.uk:soclabs/socsim.git
-	branch = main
-[submodule "CHIPKIT"]
+	[submodule "CHIPKIT"]
 	path = CHIPKIT
 	url = git@git.soton.ac.uk:soclabs/CHIPKIT.git
-	branch = main
-[submodule "secworks-sha256"]
+	[submodule "secworks-sha256"]
 	path = secworks-sha256
 	url = git@git.soton.ac.uk:soclabs/secworks-sha256.git
 	branch = main
-[submodule "$DESIGN_ROOT/accelerator-wrapper"]
+[submodule "accelerator-wrapper"]
 	branch = main
-[submodule "$DESIGN_ROOT/CHIPKIT"]
+[submodule "CHIPKIT"]
 	branch = main
-[submodule "$DESIGN_ROOT/nanosoc"]
+[submodule "nanosoc"]
 	branch = main
-[submodule "$DESIGN_ROOT/socsim"]
+[submodule "socsim"]
 	branch = main
diff --git a/flow/socrepo-init b/flow/socrepo-init
index 18fe269b2443442e2142a9059fcd02552cd4522b..a14cde6c2168370d9d372a1ca93bd9aae281a6c7 100755
--- a/flow/socrepo-init
+++ b/flow/socrepo-init
@@ -12,6 +12,7 @@
 #!/usr/bin/env bash
 
 # Source environment variables for all submodules
+cd $DESIGN_ROOT
 for d in $SOC_TOP_DIR/* ; do
     if [ -e "$d/.git" ]; then
         echo $d