diff --git a/salt/logstash/init.sls b/salt/logstash/init.sls
index bfd08e4fe..86405fa79 100644
--- a/salt/logstash/init.sls
+++ b/salt/logstash/init.sls
@@ -145,7 +145,12 @@ so-logstash:
     - name: so-logstash
     - user: logstash
     - extra_hosts:
+      {% if grains.role in ['so-heavynode'] %}
+      {% set MANAGER = salt['grains.get']('nodename') %}
+      {% set MANAGERIP = salt['pillar.get']('sensor:mainip') %}
+      {% else %}
       - {{ MANAGER }}:{{ MANAGERIP }}
+      {% endif %}
     - environment:
       - LS_JAVA_OPTS=-Xms{{ lsheap }} -Xmx{{ lsheap }}
     - port_bindings:
@@ -205,4 +210,4 @@ append_so-logstash_so-status.conf:
   test.fail_without_changes:
     - name: {{sls}}_state_not_allowed
 
-{% endif %}
\ No newline at end of file
+{% endif %}