diff --git a/salt/elasticfleet/sostatus.sls b/salt/elasticfleet/sostatus.sls
index 964abe929..392733a4c 100644
--- a/salt/elasticfleet/sostatus.sls
+++ b/salt/elasticfleet/sostatus.sls
@@ -10,7 +10,7 @@ append_so-elastic-fleet_so-status.conf:
   file.append:
     - name: /opt/so/conf/so-status/so-status.conf
     - text: so-elastic-fleet
-    - unless: grep -q so-elastic-fleet /opt/so/conf/so-status/so-status.conf
+    - unless: grep -q ^so-elastic-fleet$ /opt/so/conf/so-status/so-status.conf
 
 {% else %}
 
diff --git a/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-setup b/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-setup
index f6f053e2a..7c5db70f7 100755
--- a/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-setup
+++ b/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-setup
@@ -81,6 +81,7 @@ GRIDNODESENROLLMENTOKEN=$(curl -K /opt/so/conf/elasticsearch/curl.config -L "loc
 pillar_file=/opt/so/saltstack/local/pillar/minions/{{ GLOBALS.minion_id }}.sls
 printf '%s\n'\
     "elasticfleet:"\
+    "  enabled: True"\
     "  config:"\
     "    server:"\
     "      es_token: '$ESTOKEN'"\
diff --git a/salt/manager/tools/sbin/so-minion b/salt/manager/tools/sbin/so-minion
index 69d77a9cf..3342f3c15 100755
--- a/salt/manager/tools/sbin/so-minion
+++ b/salt/manager/tools/sbin/so-minion
@@ -143,6 +143,7 @@ function add_fleet_to_minion() {
     # Write out settings to minion file
     printf '%s\n'\
 		"elasticfleet:"\
+		"  enabled: True"\
 		"  config:"\
 		"    server:"\
 		"      es_token: '$ESTOKEN'"\