diff --git a/setup/so-functions b/setup/so-functions
index 9926f63c8..33ac11a7f 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1958,11 +1958,7 @@ saltify() {
 		} >> "$setup_log" 2>&1
 		yum versionlock salt*
 	else
-		if ! (DEBIAN_FRONTEND=noninteractive retry 50 10 "apt-get -y -o Dpkg::Options::=\"--force-confdef\" -o Dpkg::Options::=\"--force-confold\" upgrade" >> "$setup_log" 2>&1); then
-			exit 1
-		fi
-
-		retry 50 10 "apt-get update" >> "$setup_log" 2>&1 || exit 1
+		DEBIAN_FRONTEND=noninteractive retry 50 10 "apt-get -y -o Dpkg::Options::=\"--force-confdef\" -o Dpkg::Options::=\"--force-confold\" upgrade" >> "$setup_log" 2>&1 || exit 1
 
 		if [ $OSVER != "xenial" ]; then
 			# Switch to Python 3 as default if this is not xenial
diff --git a/setup/so-setup b/setup/so-setup
index 691e70709..548d9e7f4 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -130,7 +130,6 @@ if [[ -f automation/$automation && $(basename $automation) == $automation ]]; th
 	if [[ ! $is_iso ]]; then
 		echo "Installing sshpass for automated testing." >> $setup_log 2>&1
 		if [ "$OS" == ubuntu ]; then
-			retry 50 10 "apt-get update" >> "$setup_log" 2>&1 || exit 1
 			retry 50 10 "apt-get -y install sshpass" >> $setup_log 2>&1 || exit 1
 		else
 			yum -y install sshpass >> $setup_log 2>&1
diff --git a/setup/so-whiptail b/setup/so-whiptail
index 160fc3a8b..eef2aba66 100755
--- a/setup/so-whiptail
+++ b/setup/so-whiptail
@@ -31,9 +31,15 @@ whiptail_airgap() {
 whiptail_avoid_default_hostname() {
 	[ -n "$TESTING" ] && return
 
+	read -r -d '' message <<- EOM
+	To prevent hostname conflicts, avoid using the default 'securityonion' hostname in a distributed environment.
+
+	You can choose to use this default hostname anyway, or change it to a new hostname.
+	EOM
+
 	whiptail --title "Security Onion Setup" \
-		--yesno "We suggest avoiding the default hostname of 'securityonion' in a distributed environment." 8 75 \
-		--yes-button "Use" --no-button "Change" --defaultno
+		--yesno "$message" 11 75 \
+		--yes-button "Use Anyway" --no-button "Change" --defaultno
 }
 
 whiptail_basic_suri() {
@@ -952,7 +958,7 @@ whiptail_metadata_tool() {
 		
 		If you choose Zeek for metadata, Suricata will still run to generate NIDS alerts.
 
-		If you choose Suricata for metadata, it will generate NIDS alerts and metadata and Zeek will not run at all.
+		If you choose Suricata for metadata, it will generate NIDS alerts and metadata, and Zeek will not run at all.
 	EOM
 
 	# Legacy variable naming