diff --git a/setup/so-functions b/setup/so-functions
index 73eef96c2..198178d03 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -483,8 +483,6 @@ collect_mtu() {
 collect_net_method() {
 	whiptail_net_method
 
-	[[ -z $network_traffic ]] && collect_proxy
-
 	if [[ "$network_traffic" == *"_MANAGER" ]]; then
 		whiptail_manager_updates_warning
 		MANAGERUPDATES=1
diff --git a/setup/so-setup b/setup/so-setup
index 4cb9c98a2..aa6ce489e 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -210,9 +210,6 @@ if ! [[ -f $install_opt_file ]]; then
 				"HOSTNAME=$HOSTNAME" > "$net_init_file"
 			set_main_ip >> $setup_log 2>&1
 			compare_main_nic_ip
-			reset_proxy
-			collect_net_method
-			[[ -n "$so_proxy" ]] && set_proxy >> $setup_log 2>&1
 			whiptail_net_setup_complete
 		else
 			true
@@ -428,7 +425,7 @@ fi
 
 if [[ $is_airgap ]]; then
 	PATCHSCHEDULENAME=${PATCHSCHEDULENAME:-manual}
-	MANAGERUPDATES=${MANAGERUPDATES:-0} 
+	[[ ! $is_minion ]] && MANAGERUPDATES=${MANAGERUPDATES:-0} || MANAGERUPDATES=${MANAGERUPDATES:-1}
 fi
 
 # Start user prompts
diff --git a/setup/so-whiptail b/setup/so-whiptail
index a04636f6a..03011e7c6 100755
--- a/setup/so-whiptail
+++ b/setup/so-whiptail
@@ -990,8 +990,6 @@ whiptail_management_nic() {
 whiptail_net_method() {
 	[ -n "$TESTING" ] && return
 
-	[[ $is_airgap && ! $is_minion ]] && return
-
 	local pkg_mngr
 	if [[ $OS = 'centos' ]]; then pkg_mngr="yum"; else pkg_mngr='apt'; fi