diff --git a/salt/elasticfleet/enabled.sls b/salt/elasticfleet/enabled.sls
index 9173f1d38..cb189f9a9 100644
--- a/salt/elasticfleet/enabled.sls
+++ b/salt/elasticfleet/enabled.sls
@@ -21,7 +21,7 @@ include:
   - elasticfleet.manager
 {%- endif %}
 
-{% if GLOBALS.role not in ['so-fleet'] %}
+{% if GLOBALS.role != "so-fleet" %}
 # Wait for Elasticsearch to be ready - no reason to try running Elastic Fleet server if ES is not ready
 wait_for_elasticsearch_elasticfleet:
   cmd.run:
diff --git a/salt/elasticfleet/manager.sls b/salt/elasticfleet/manager.sls
index 7c57c1ece..72f53be79 100644
--- a/salt/elasticfleet/manager.sls
+++ b/salt/elasticfleet/manager.sls
@@ -9,6 +9,9 @@
 {%   from 'docker/docker.map.jinja' import DOCKERMERGED %}
 {%   from 'elasticfleet/map.jinja' import ELASTICFLEETMERGED %}
 
+include:
+  - elasticfleet.config
+
 # If enabled, automatically update Fleet Logstash Outputs
 {% if ELASTICFLEETMERGED.config.server.enable_auto_configuration and grains.role not in ['so-import', 'so-eval'] %}
 so-elastic-fleet-auto-configure-logstash-outputs: