diff --git a/salt/common/tools/sbin/so-common b/salt/common/tools/sbin/so-common
index c98f3e1fc..f5283c356 100755
--- a/salt/common/tools/sbin/so-common
+++ b/salt/common/tools/sbin/so-common
@@ -417,7 +417,7 @@ set_minionid() {
 }
 
 set_palette() {
-	if [[ $is_ubuntu ]]; then
+	if [[ $is_deb ]]; then
 	    update-alternatives --set newt-palette /etc/newt/palette.original
     fi
 }
diff --git a/setup/so-setup b/setup/so-setup
index 60d9505df..b696b6f7b 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -69,11 +69,20 @@ detect_os
 set_palette >> $setup_log 2>&1
 
 if [[ $not_supported ]]; then
-	if (whiptail_unsupported_os_warning); then
-		true
+	if [[ "$OSVER" == "focal" ]]; then
+		if (whiptail_focal_warning); then
+			true
+		else
+			info "User cancelled setup."
+			whiptail_cancel
+		fi
 	else
-		info "User cancelled setup."
-		whiptail_cancel
+		if (whiptail_unsupported_os_warning); then
+			true
+		else
+			info "User cancelled setup."
+			whiptail_cancel
+		fi
 	fi
 fi
 
diff --git a/setup/so-whiptail b/setup/so-whiptail
index 56414f43d..6e35b6c90 100755
--- a/setup/so-whiptail
+++ b/setup/so-whiptail
@@ -455,6 +455,28 @@ __append_end_msg() {
 	EOM
 }
 
+whiptail_focal_warning() {
+
+	[ -n "$TESTING" ] && return
+
+	read -r -d '' focal_warning_continue <<- EOM
+
+	WARNING: Ubuntu 20.04 is only supported as a minion role.
+
+	This node may not install or operate as expected if installed
+	as a manager, managersearch, standalone, eval, or import.
+
+	Would you like to continue the install?
+
+	EOM
+	whiptail --title "$whiptail_title" \
+		--yesno "$focal_warning_continue" 14 75 --defaultno
+
+	local exitstatus=$?
+	return $exitstatus
+
+}
+
 whiptail_gauge_post_setup() {
 
 	if [ -n "$TESTING" ]; then