diff --git a/nanosoc_tech b/nanosoc_tech
index 83a969ece065c95c2d1040df64a3f1677867e631..7460715838bc5ec7f7c3c38bda18f4bfecd3f5f6 160000
--- a/nanosoc_tech
+++ b/nanosoc_tech
@@ -1 +1 @@
-Subproject commit 83a969ece065c95c2d1040df64a3f1677867e631
+Subproject commit 7460715838bc5ec7f7c3c38bda18f4bfecd3f5f6
diff --git a/set_env.sh b/set_env.sh
index 8304f5c4cd0707b5b64d8035f3736a7f86bcf08a..9bc6d649cf518d7f50d1a357ad4e86a5d540dd5d 100755
--- a/set_env.sh
+++ b/set_env.sh
@@ -64,7 +64,7 @@ if [ ! -f $SOCLABS_PROJECT_DIR/.socinit ]; then
     # Source environment variables for all submodules
     cd $SOCLABS_DESIGN_ROOT
     git submodule update --remote --recursive
-    git submodule foreach --recursive git checkout main
+    git submodule foreach --recursive git checkout main # TODO: Bug on this line - need to checkout to correct branch
     # Read proj-branch file to find out which branch each subrepo needs to be on
     git config --file .gitmodules --get-regexp path | awk '{ print $2 }' | while read line; do cd $SOCLABS_PROJECT_DIR/$line && git checkout `grep $line $SOCLABS_PROJECT_DIR/proj-branch | awk '{ print $2 }'` && git pull; done
     git restore $SOCLABS_DESIGN_ROOT/.gitmodules