diff --git a/salt/common/tools/sbin/so-minion b/salt/common/tools/sbin/so-minion
index 543315844..cf50a49d7 100755
--- a/salt/common/tools/sbin/so-minion
+++ b/salt/common/tools/sbin/so-minion
@@ -221,8 +221,8 @@ function add_sensor_to_minion() {
 function create_fleet_policy() {
 
 	JSON_STRING=$( jq -n \
-					--arg NAME "FleetServer_$MINIONID" \
-					--arg DESC "Fleet Server - $MINIONID" \
+					--arg NAME "FleetServer_$LSHOSTNAME" \
+					--arg DESC "Fleet Server - $LSHOSTNAME" \
 					'{"name": $NAME,"id":$NAME,"description":$DESC,"namespace":"default","monitoring_enabled":["logs"],"inactivity_timeout":1209600,"has_fleet_server":true}'
 					)
 
@@ -230,13 +230,13 @@ function create_fleet_policy() {
 	curl -K /opt/so/conf/elasticsearch/curl.config -L -X POST "localhost:5601/api/fleet/agent_policies" -H 'kbn-xsrf: true' -H 'Content-Type: application/json' -d "$JSON_STRING"
 
 	JSON_STRING_UPDATE=$( jq -n \
-					--arg NAME "FleetServer_$MINIONID" \
-					--arg DESC "Fleet Server - $MINIONID" \
+					--arg NAME "FleetServer_$LSHOSTNAME" \
+					--arg DESC "Fleet Server - $LSHOSTNAME" \
 					'{"name":$NAME,"description":$DESC,"namespace":"default","monitoring_enabled":["logs"],"inactivity_timeout":1209600,"data_output_id":"so-manager_elasticsearch"}'
 					)
 
 	# Update Fleet Policy - ES Output
-	curl -K /opt/so/conf/elasticsearch/curl.config -L -X PUT "localhost:5601/api/fleet/agent_policies/FleetServer_$MINIONID" -H 'kbn-xsrf: true' -H 'Content-Type: application/json' -d "$JSON_STRING_UPDATE"
+	curl -K /opt/so/conf/elasticsearch/curl.config -L -X PUT "localhost:5601/api/fleet/agent_policies/FleetServer_$LSHOSTNAME" -H 'kbn-xsrf: true' -H 'Content-Type: application/json' -d "$JSON_STRING_UPDATE"
 }	
 
 function updateMine() {
diff --git a/setup/so-setup b/setup/so-setup
index 9bd716880..ddf39fdee 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -637,8 +637,8 @@ if ! [[ -f $install_opt_file ]]; then
 		add_web_user
 		info "Restarting SOC to pick up initial user"
 		logCmd "so-soc-restart"
-		#title "Setting up Elastic Fleet"
-         #       logCmd "so-elastic-fleet-setup"
+		title "Setting up Elastic Fleet"
+        logCmd "so-elastic-fleet-setup"
 		if [[ ! $is_import ]]; then
 			title "Setting up Playbook"
 			logCmd "so-playbook-reset"