diff --git a/salt/elasticsearch/config.map.jinja b/salt/elasticsearch/config.map.jinja
index ccd977129..914bda434 100644
--- a/salt/elasticsearch/config.map.jinja
+++ b/salt/elasticsearch/config.map.jinja
@@ -29,7 +29,7 @@
     {% do ESCONFIG.elasticsearch.config.update({'discovery': {'seed_hosts': [grains.master]}}) %}
   {% endif %}
     {% if HIGHLANDER %}
-          {% do ESCONFIG.elasticsearch.config.xpack.ml.enabled.update('True') %}
+        {% do ESCONFIG.elasticsearch.config.xpack.ml.update({'enabled': true}) %}
     {% endif %}
 {% endif %}
 
diff --git a/setup/so-functions b/setup/so-functions
index f2cdbc237..f7d489f42 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1668,6 +1668,10 @@ manager_global() {
 		"  url_base: '$REDIRECTIT'"\
 		"  managerip: '$MAINIP'" > "$global_pillar"
 	
+	if [[ $HIGHLANDER == 'True' ]]; then
+	    printf '%s\n'\
+		"  highlander: True"\ >> "$global_pillar"
+	fi
 	if [[ $is_airgap ]]; then
 		printf '%s\n'\
 			"  airgap: True"\ >> "$global_pillar"