diff --git a/setup/so-setup b/setup/so-setup
index 2ca24cf1f..bfc98e62a 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -429,7 +429,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
@@ -443,6 +442,7 @@ if (whiptail_you_sure) ; then
 			whiptail_basic_suri
 		fi
 		whiptail_make_changes
+		set_updates
 		set_hostname
 		clear_master
 		if [ $install_type == iso ]; then
@@ -703,7 +703,6 @@ if (whiptail_you_sure) ; then
 	if [ $install_type == 'SEARCHNODE' ] || [ $install_type == 'PARSINGNODE' ] || [ $install_type == 'HOTNODE' ] || [ $install_type == 'WARMNODE' ]; then
 		whiptail_management_server
 		whiptail_master_updates
-		set_updates
 		set_defaul_log_size
 		CURCLOSEDAYS=30
 		es_heapsize
@@ -727,6 +726,7 @@ if (whiptail_you_sure) ; then
 			LSINPUTBATCHCOUNT=125
 		fi
 		whiptail_make_changes
+		set_updates
 		set_hostname
 		clear_master
 		if [ $install_type == iso ]; then
@@ -792,7 +792,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
@@ -829,6 +828,7 @@ if (whiptail_you_sure) ; then
 			LSINPUTBATCHCOUNT=125
 		fi
 		whiptail_make_changes
+		set_updates
 		set_hostname
 		clear_master
 		if [ $install_type == iso ]; then