diff --git a/salt/logstash/init.sls b/salt/logstash/init.sls
index 53a710f9b..9bd77828d 100644
--- a/salt/logstash/init.sls
+++ b/salt/logstash/init.sls
@@ -36,9 +36,9 @@
   {% set DOCKER_OPTIONS = salt['pillar.get']('logstash:docker_options', {}) %}
   {% set TEMPLATES = salt['pillar.get']('elasticsearch:templates', {}) %}
 
-  {% if grains.role in ['so-heavynode'] %}
+  {% if grains.role in ['so-heavynode', 'so-receiver'] %}
     {% set EXTRAHOSTHOSTNAME = salt['grains.get']('host') %}
-    {% set EXTRAHOSTIP = salt['pillar.get']('sensor:mainip') %}
+    {% set EXTRAHOSTIP = salt['grains.get']('ip_interfaces').get(salt['pillar.get']('host:mainint'))[0] %}
   {% else %}
     {% set EXTRAHOSTHOSTNAME = MANAGER %}
     {% set EXTRAHOSTIP = MANAGERIP %}