diff --git a/pillar/top.sls b/pillar/top.sls
index 77db6fe60..627fed80b 100644
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -82,6 +82,7 @@ base:
     - elasticsearch.search
     - global
     - minions.{{ grains.id }}
+    - data.nodestab
 
   '*_import':
     - zeeklogs
diff --git a/salt/elasticsearch/files/elasticsearch.yml b/salt/elasticsearch/files/elasticsearch.yml
index b5d0b0293..a7a6ad34a 100644
--- a/salt/elasticsearch/files/elasticsearch.yml
+++ b/salt/elasticsearch/files/elasticsearch.yml
@@ -43,6 +43,14 @@ node.name: {{ grains.host }}
 script.max_compilations_rate: 1000/1m
 {%- if TRUECLUSTER is sameas true %}
   {%- if grains.role == 'so-manager' %}
-node.roles: [ master ]
+    {%- if salt['pillar.get']('nodestab', {}) %}
+node.roles: [ master, remote_cluster_client ]
+    {%- endif %}
+  {%- else %}
+node.roles: [ data, ingest, ml ] 
   {%- endif %}
+discovery.seed_hosts:
+   - {{ grains.master }}
+cluster.initial_master_nodes: 
+   - {{ grains.master }}
 {%- endif %}