diff --git a/setup/so-setup b/setup/so-setup
index 7d1a03722..4d5f35c3e 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -471,7 +471,6 @@ if (whiptail_you_sure) ; then
     [[ $SKIP_BOND != 'yes' ]] && whiptail_bond_nics
     whiptail_management_server
     whiptail_master_updates
-    set_updates
     whiptail_homenet_sensor
     whiptail_sensor_config
     # Calculate lbprocs so we can call it in the prompts
@@ -485,6 +484,7 @@ if (whiptail_you_sure) ; then
       whiptail_basic_suri
     fi
     whiptail_make_changes
+    set_updates
     set_hostname
     clear_master
     mkdir -p /nsm
@@ -759,7 +759,6 @@ if (whiptail_you_sure) ; then
   if [ $INSTALLTYPE == 'SEARCHNODE' ] || [ $INSTALLTYPE == 'PARSINGNODE' ] || [ $INSTALLTYPE == 'HOTNODE' ] || [ $INSTALLTYPE == 'WARMNODE' ]; then
     whiptail_management_server
     whiptail_master_updates
-    set_updates
     get_log_size_limit
     CURCLOSEDAYS=30
     es_heapsize
@@ -783,6 +782,7 @@ if (whiptail_you_sure) ; then
       LSINPUTBATCHCOUNT=125
     fi
     whiptail_make_changes
+    set_updates
     set_hostname
     clear_master
     mkdir -p /nsm
@@ -852,7 +852,6 @@ if (whiptail_you_sure) ; then
     [[ $SKIP_BOND != 'yes' ]] && whiptail_bond_nics
     whiptail_management_server
     whiptail_master_updates
-    set_updates
     whiptail_homenet_sensor
     whiptail_sensor_config
     # Calculate lbprocs so we can call it in the prompts
@@ -889,6 +888,7 @@ if (whiptail_you_sure) ; then
       LSINPUTBATCHCOUNT=125
     fi
     whiptail_make_changes
+    set_updates
     set_hostname
     clear_master
     mkdir -p /nsm