diff --git a/salt/strelka/files/backend/backend.yaml b/salt/strelka/files/backend/backend.yaml
index 40ea1b5b3..0333afb18 100644
--- a/salt/strelka/files/backend/backend.yaml
+++ b/salt/strelka/files/backend/backend.yaml
@@ -1,4 +1,9 @@
-{%- set ip = salt['pillar.get']('static:masterip', '') %}
+{%- if grains.role == 'so-sensor' -%}
+  {%- set mainint = salt['pillar.get']('sensor:mainint') %}
+  {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint, salt['pillar.get']('sensor:mainip')) %}
+{%- else %}
+  {%- set ip = salt['pillar.get']('static:masterip') %}
+{%- endif -%}
 logging_cfg: '/etc/strelka/logging.yaml'
 limits:
   max_files: 5000
diff --git a/salt/strelka/files/filestream/filestream.yaml b/salt/strelka/files/filestream/filestream.yaml
index 0475840c9..34ec48052 100644
--- a/salt/strelka/files/filestream/filestream.yaml
+++ b/salt/strelka/files/filestream/filestream.yaml
@@ -1,4 +1,9 @@
-{%- set ip = salt['pillar.get']('static:masterip', '') %}
+{%- if grains.role == 'so-sensor' -%}
+  {%- set mainint = salt['pillar.get']('sensor:mainint') %}
+  {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint, salt['pillar.get']('sensor:mainip')) %}
+{%- else %}
+  {%- set ip = salt['pillar.get']('static:masterip') %}
+{%- endif -%}
 conn:
   server: '{{ ip }}:57314'
   cert: ''
diff --git a/salt/strelka/files/frontend/frontend.yaml b/salt/strelka/files/frontend/frontend.yaml
index 1c7b15175..0e02b708e 100644
--- a/salt/strelka/files/frontend/frontend.yaml
+++ b/salt/strelka/files/frontend/frontend.yaml
@@ -1,4 +1,9 @@
-{%- set ip = salt['pillar.get']('static:masterip', '') %}
+{%- if grains.role == 'so-sensor' -%}
+  {%- set mainint = salt['pillar.get']('sensor:mainint') %}
+  {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint, salt['pillar.get']('sensor:mainip')) %}
+{%- else %}
+  {%- set ip = salt['pillar.get']('static:masterip') %}
+{%- endif -%}
 server: ":57314"
 coordinator:
   addr: '{{ ip }}:6380'
diff --git a/salt/strelka/files/manager/manager.yaml b/salt/strelka/files/manager/manager.yaml
index 16a4c697b..b8ffc038f 100644
--- a/salt/strelka/files/manager/manager.yaml
+++ b/salt/strelka/files/manager/manager.yaml
@@ -1,4 +1,10 @@
-{%- set ip = salt['pillar.get']('static:masterip', '') %}
+
+{%- if grains.role == 'so-sensor' -%}
+  {%- set mainint = salt['pillar.get']('sensor:mainint') %}
+  {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint, salt['pillar.get']('sensor:mainip')) %}
+{%- else %}
+  {%- set ip = salt['pillar.get']('static:masterip') %}
+{%- endif -%}
 coordinator:
   addr: '{{ ip }}:6380'
   db: 0