diff --git a/setup/so-setup b/setup/so-setup
index 68800c85b..30896729f 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -104,6 +104,8 @@ function progress() {
 	fi		
 }
 
+detect_os && detect_cloud
+
 if [[ -f automation/$automation && $(basename $automation) == $automation ]]; then
 	echo "Preselecting variable values based on automated setup: $automation" >> $setup_log 2>&1
 	source automation/$automation
@@ -152,7 +154,6 @@ set_ssh_cmds $automated
 local_sbin="$(pwd)/../salt/common/tools/sbin"
 export PATH=$PATH:$local_sbin
 
-detect_os && detect_cloud
 set_network_dev_status_list
 
 if [ "$OS" == ubuntu ]; then