diff --git a/setup/so-functions b/setup/so-functions
index 55cb71327..f3e738678 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -398,13 +398,11 @@ check_requirements() {
 		req_mem=12
 		req_cores=4
 		req_nics=2
-	elif [[ "$eval_or_dist" == 'fleet' ]]; then
-		req_mem=4
-		req_cores=4
 	elif [[ "$eval_or_dist" == 'dist' ]]; then
 		req_mem=8
 		req_cores=4
 		if [[ "$node_type" == 'sensor' ]]; then req_nics=2; else req_nics=1; fi
+		if [[ "$node_type" == 'fleet' ]]; then req_mem=4; fi
 	fi
 
 	if [[ $num_nics -lt $req_nics ]]; then
diff --git a/setup/so-setup b/setup/so-setup
index f5d43eb38..45452a0a7 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -128,7 +128,6 @@ elif [ "$install_type" = 'HEAVYNODE' ]; then
 	is_sensor=true
 elif [ "$install_type" = 'FLEET' ]; then
 	is_minion=true
-	is_fleet_standalone=true
 	OSQUERY=1
 elif [ "$install_type" = 'HELIXSENSOR' ]; then
 	is_helix=true
@@ -136,10 +135,10 @@ fi
 
 if [[ $is_eval ]]; then
 	check_requirements "eval"
+elif [[ "$is_minon" && "$OSQUERY" == 1 ]]; then
+	check_requirements "dist" "fleet"
 elif [[ $is_distmaster || $is_minion ]]; then
 	check_requirements "dist"
-elif [[ $is_fleet_standalone ]]; then
-	check_requirements "fleet"
 elif [[ $is_sensor && ! $is_eval ]]; then
 	check_requirements "dist" "sensor"
 fi
@@ -237,7 +236,7 @@ if [[ $is_master ]]; then
 	get_redirect
 fi
 
-if [[ $is_distmaster || ( $is_sensor || $is_node || $is_fleet_standalone ) && ! $is_eval ]]; then
+if [[ $is_distmaster || ( $is_sensor || $is_node || [[ "$is_minon" && "$OSQUERY" == 1 ]] ) && ! $is_eval ]]; then
 	whiptail_master_updates
 	if [[ $setup_type == 'network' && $MASTERUPDATES == 1 ]]; then
 		whiptail_master_updates_warning
@@ -329,7 +328,7 @@ if [[ $is_minion ]]; then
 	copy_ssh_key >> $setup_log 2>&1
 fi
 
-if [[ $is_fleet_standalone ]]; then
+if [[ "$is_minon" && "$OSQUERY" == 1 ]]; then
 	host_pillar >> $setup_log 2>&1
 fi