diff --git a/proj-branch b/proj-branch
index 45bae4d5384d09ef7edf02589b6e2a78b050e885..eb990ffa60822bb1cb66584686b1babed1642861 100644
--- a/proj-branch
+++ b/proj-branch
@@ -17,7 +17,7 @@ nanosoc_tech: feat_nanosoc_regions
 nanosoc_tech/nanosoc/slcorem0_tech: main
 nanosoc_tech/nanosoc/sldma230_tech: main
 nanosoc_tech/nanosoc/socdebug_tech: main
-nanosoc_tech/nanosoc/socdebug_tech/socket/uart_axi_master/core_dbg_bridge: main
+nanosoc_tech/nanosoc/socdebug_tech/socket/uart_axi_master/core_dbg_bridge: master
 accelerator_wrapper_tech: main
 fpga_lib_tech: main
 generic_lib_tech: main
diff --git a/set_env.sh b/set_env.sh
index f43974b406cdf3c1b27a96d4101cbd819d1be685..55e9765bb3e19b73604032a9eedb59a2947d8796 100755
--- a/set_env.sh
+++ b/set_env.sh
@@ -65,15 +65,7 @@ if [ ! -f $SOCLABS_PROJECT_DIR/.socinit ]; then
     cd $SOCLABS_DESIGN_ROOT
     echo $SOCLABS_DESIGN_ROOT
     git submodule update --recursive
-    echo "2"
     python3 $SOCLABS_SOCTOOLS_FLOW_DIR/bin/subrepo_checkout.py -b proj-branch -t $SOCLABS_DESIGN_ROOT
-    echo "3"
-    #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
-    echo "4"
     git restore $SOCLABS_DESIGN_ROOT/.gitmodules
-    echo "5"
     touch $SOCLABS_PROJECT_DIR/.socinit
-    echo "6"
 fi