diff --git a/setup/so-functions b/setup/so-functions
index 314d5f77d..466365b42 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1946,6 +1946,24 @@ reinstall_init() {
 	} >> "$setup_log" 2>&1
 }
 
+reset_proxy() {
+	[[ -f /etc/profile.d/so-proxy.sh ]] && rm -f /etc/profile.d/so-proxy.sh
+	
+	[[ -f /etc/systemd/system/docker.service.d/http-proxy.conf ]] && rm -f /etc/systemd/system/docker.service.d/http-proxy.conf
+	systemctl daemon-reload
+	command -v docker &> /dev/null && systemctl restart docker
+	
+	[[ -f /root/.docker/config.json ]] && rm -f /root/.docker/config.json
+
+	[[ -f /etc/gitconfig ]] && rm -f /etc/gitconfig
+	
+	if [[ $OS == 'centos' ]]; then
+		sed -i "/proxy=/d" /etc/yum.conf
+	else
+		[[ -f /etc/apt/apt.conf.d/00-proxy.conf ]] && rm -f /etc/apt/apt.conf.d/00-proxy.conf
+	fi
+}
+
 backup_dir() {
 	dir=$1
 	backup_suffix=$2
diff --git a/setup/so-setup b/setup/so-setup
index 8eb267379..3f39eaaf6 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -205,14 +205,15 @@ if ! [[ -f $install_opt_file ]]; then
 		whiptail_first_menu_iso
 		if [[ $option == "CONFIGURENETWORK" ]]; then
 			collect_hostname
+			reset_prpxy >> $setup_log 2>&1
+			collect_proxy
+			[[ -n "$so_proxy" ]] && set_proxy >> $setup_log 2>&1
 			network_init_whiptail
 			whiptail_management_interface_setup
 			network_init
 			printf '%s\n' \
 				"MNIC=$MNIC" \
 				"HOSTNAME=$HOSTNAME" > "$net_init_file"
-			collect_proxy
-			[[ -n "$so_proxy" ]] && set_proxy >> $setup_log 2>&1
 			whiptail_net_setup_complete
 		else
 			true
@@ -276,9 +277,13 @@ if [[ $is_minion ]]; then
 	collect_mngr_hostname
 fi
 
-if ! [[ -f $install_opt_file ]] && [[ -z $is_airgap ]]; then
-	collect_proxy_details
-	[[ -n "$so_proxy" ]] && set_proxy >> $setup_log 2>&1
+
+if ! [[ -f $install_opt_file ]]; then
+	reset_prpxy >> $setup_log 2>&1 # Always reset proxy when answer file doesn't exist
+	if [[ -z $is_airgap ]]; then
+		collect_proxy_details
+		[[ -n "$so_proxy" ]] && set_proxy >> $setup_log 2>&1
+	fi
 fi
 
 percentage=0