diff --git a/pillar/data/addtotab.sh b/pillar/data/addtotab.sh
index ac3d913a5..b4c80e6fe 100644
--- a/pillar/data/addtotab.sh
+++ b/pillar/data/addtotab.sh
@@ -54,7 +54,8 @@ if [ $TYPE == 'evaltab' ] || [ $TYPE == 'standalonetab' ]; then
     salt-call state.apply utility queue=True
   fi
 fi
-#if [ $TYPE == 'nodestab' ]; then
+if [ $TYPE == 'nodestab' ]; then
+  salt-call state.apply elasticseach
 #  echo "    nodetype: $NODETYPE" >> $local_salt_dir/pillar/data/$TYPE.sls
 #  echo "    hotname: $HOTNAME" >> $local_salt_dir/pillar/data/$TYPE.sls
-#fi
+fi
diff --git a/salt/elasticsearch/init.sls b/salt/elasticsearch/init.sls
index 0b28ee6d1..7f3a7af56 100644
--- a/salt/elasticsearch/init.sls
+++ b/salt/elasticsearch/init.sls
@@ -189,12 +189,10 @@ so-elasticsearch:
     - user: elasticsearch
     - extra_hosts: 
       - {{ grains.host }}:{{ NODEIP }}
-      {%- if ismanager %}
       {%- if salt['pillar.get']('nodestab', {}) %}
-      {%- for SN, SNDATA in salt['pillar.get']('nodestab', {}).items() %}
+        {%- for SN, SNDATA in salt['pillar.get']('nodestab', {}).items() %}
       - {{ SN.split('_')|first }}:{{ SNDATA.ip }}
-      {%- endfor %}
-      {%- endif %}
+        {%- endfor %}
       {%- endif %}
     - environment:
       - discovery.type=single-node