diff --git a/setup/so-whiptail b/setup/so-whiptail
index 6e35b6c90..86302ae08 100755
--- a/setup/so-whiptail
+++ b/setup/so-whiptail
@@ -545,7 +545,7 @@ whiptail_install_type() {
 	[ -n "$TESTING" ] && return
 
 	# What kind of install are we doing?
-#	if [[ $is_rocky || $is_centos ]]; then
+	if [[ "$OSVER" != "focal" ]]; then
 		install_type=$(whiptail --title "$whiptail_title" --menu \
 		"What kind of installation would you like to do?\n\nFor more information, please see:\n$DOC_BASE_URL/architecture.html" 18 65 5 \
 			"IMPORT" "Import PCAP or log files " \
@@ -555,14 +555,13 @@ whiptail_install_type() {
 			"OTHER" "Other install types" \
 			3>&1 1>&2 2>&3
 		)
-#	elif [[ $is_ubuntu ]]; then
-#		install_type=$(whiptail --title "$whiptail_title" --menu \
-#		"What kind of installation would you like to do?\n\nFor more information, please see:\n$DOC_BASE_URL/architecture.html" 18 65 5 \
-#			"DISTRIBUTED" "Distributed install submenu " \
-#			"OTHER" "Other install types" \
-#			3>&1 1>&2 2>&3
-#		)
-#	fi
+	elif [[ "$OSVER" == "focal" ]]; then
+		install_type=$(whiptail --title "$whiptail_title" --menu \
+		"What kind of installation would you like to do?\n\nFor more information, please see:\n$DOC_BASE_URL/architecture.html" 18 65 5 \
+			"DISTRIBUTED" "Distributed install submenu " \
+			3>&1 1>&2 2>&3
+		)
+	fi
 
 	local exitstatus=$?
 	whiptail_check_exitstatus $exitstatus
@@ -585,18 +584,18 @@ whiptail_install_type_dist() {
 
 	[ -n "$TESTING" ] && return
 
-#	if [[ $is_rocky || $is_centos ]]; then
+	if [[ "$OSVER" != "focal" ]]; then
 	dist_option=$(whiptail --title "$whiptail_title" --menu "Do you want to start a new deployment or join this box to \nan existing deployment?" 11 75 2 \
 		"New Deployment         " "Create a new Security Onion deployment" \
 		"Existing Deployment    " "Join to an existing Security Onion deployment " \
 		 3>&1 1>&2 2>&3
 	)
-#	elif [[ $is_ubuntu ]]; then
-#	dist_option=$(whiptail --title "$whiptail_title" --menu "Since this is Ubuntu, this box can only be connected to \nan existing deployment." 11 75 2 \
-#		"Existing Deployment    " "Join to an existing Security Onion deployment " \
-#		 3>&1 1>&2 2>&3
-#	)
-#	fi
+	elif [[ "$OSVER" == "focal" ]]; then
+	dist_option=$(whiptail --title "$whiptail_title" --menu "Since this is Ubuntu, this box can only be connected to \nan existing deployment." 11 75 2 \
+		"Existing Deployment    " "Join to an existing Security Onion deployment " \
+		 3>&1 1>&2 2>&3
+	)
+	fi
 
 	local exitstatus=$?
 	whiptail_check_exitstatus $exitstatus