diff --git a/setup.env b/setup.env
index eea3c058..6eddb4a8 100755
--- a/setup.env
+++ b/setup.env
@@ -22,10 +22,6 @@ export PATH="$ONL/tools/scripts:$ONL/tools:$PATH"
 # Default parallel build settings
 export MAKEFLAGS="-j64"
 
-# These submodules are required for almost everything.
-$ONL/tools/submodules.py $ONL sm/infra
-$ONL/tools/submodules.py $ONL sm/bigcode
-
 # Version files
 $ONL/tools/make-versions.py --import-file=$ONL/tools/onlvi --class-name=OnlVersionImplementation --output-dir $ONL/make
 
@@ -37,4 +33,9 @@ export ONLPM_OPTION_INCLUDE_ENV_JSON="$ONL/make/version-onl.json"
 #
 export BUILDROOTMIRROR=${BUILDROOTMIRROR:-"http://buildroot.hw.bigswitch.com/dl"}
 
+# These submodules are required for almost everything.
+$ONL/tools/submodules.py $ONL sm/infra
+$ONL/tools/submodules.py $ONL sm/bigcode
+
+