diff --git a/salt/soc/init.sls b/salt/soc/init.sls
index 9905a104a..e2ec511ed 100644
--- a/salt/soc/init.sls
+++ b/salt/soc/init.sls
@@ -3,6 +3,7 @@
 
 {% from 'vars/globals.map.jinja' import GLOBALS %}
 {% from 'docker/docker.map.jinja' import DOCKER %}
+{% from 'soc/merged.map.jinja' import DOCKER_EXTRA_HOSTS %}
 
 include:
   - manager.sync_es_users
@@ -110,12 +111,7 @@ so-soc:
       - /opt/so/conf/soc/soc_users_roles:/opt/sensoroni/rbac/users_roles:rw
       - /opt/so/conf/soc/salt:/opt/sensoroni/salt:rw
       - /opt/so/saltstack:/opt/so/saltstack:rw
-    - extra_hosts:
-    {%- if salt['pillar.get']('nodestab', {}) %}
-      {%- for SN, SNDATA in salt['pillar.get']('nodestab', {}).items() %}
-      - {{ SN.split('_')|first }}:{{ SNDATA.ip }}
-      {%- endfor %}
-    {%- endif %}
+    - extra_hosts: {{ DOCKER_EXTRA_HOSTS }}
     - port_bindings:
       {% for BINDING in DOCKER.containers['so-soc'].port_bindings %}
       - {{ BINDING }}
diff --git a/salt/soc/merged.map.jinja b/salt/soc/merged.map.jinja
index 4ae7ce38e..97d228ebd 100644
--- a/salt/soc/merged.map.jinja
+++ b/salt/soc/merged.map.jinja
@@ -1,5 +1,9 @@
 {% from 'vars/globals.map.jinja' import GLOBALS %}
 {% from 'soc/defaults.map.jinja' import SOCDEFAULTS with context %}
+{% from 'logstash/map.jinja' import LOGSTASH_NODES %}
+{% set DOCKER_EXTRA_HOSTS = LOGSTASH_NODES %}
+{% do DOCKER_EXTRA_HOSTS.append({GLOBALS.influxdb_host:pillar.node_data[GLOBALS.influxdb_host].ip}) %}
+
 {% set SOCMERGED = salt['pillar.get']('soc', SOCDEFAULTS, merge=true) %}
 
 {# if SOCMERGED.server.modules.cases == httpcase details come from the soc pillar #}