diff --git a/salt/strelka/files/backend/backend.yaml b/salt/strelka/files/backend/backend.yaml
index 96aa450b7..53c29e3fa 100644
--- a/salt/strelka/files/backend/backend.yaml
+++ b/salt/strelka/files/backend/backend.yaml
@@ -1,6 +1,6 @@
 {%- if grains.role in ['so-sensor', 'so-heavynode'] -%}
-  {%- set mainint = salt['pillar.get']('sensor:mainint') %}
-  {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint[0], salt['pillar.get']('sensor:mainip')) %}
+  {%- set mainint = salt['pillar.get']('host:mainint') %}
+  {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint)[0] %}
 {%- else %}
   {%- set ip = salt['pillar.get']('global:managerip') %}
 {%- endif -%}
diff --git a/salt/strelka/files/filestream/filestream.yaml b/salt/strelka/files/filestream/filestream.yaml
index 681aad222..0661cabfa 100644
--- a/salt/strelka/files/filestream/filestream.yaml
+++ b/salt/strelka/files/filestream/filestream.yaml
@@ -1,6 +1,6 @@
 {%- if grains.role in ['so-sensor', 'so-heavynode'] -%}
-  {%- set mainint = salt['pillar.get']('sensor:mainint') %}
-  {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint[0], salt['pillar.get']('sensor:mainip')) %}
+  {%- set mainint = salt['pillar.get']('host:mainint') %}
+  {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint)[0] %}
 {%- else %}
   {%- set ip = salt['pillar.get']('global:managerip') %}
 {%- endif -%}
diff --git a/salt/strelka/files/frontend/frontend.yaml b/salt/strelka/files/frontend/frontend.yaml
index 1233aadad..137966c8e 100644
--- a/salt/strelka/files/frontend/frontend.yaml
+++ b/salt/strelka/files/frontend/frontend.yaml
@@ -1,6 +1,6 @@
 {%- if grains.role in ['so-sensor', 'so-heavynode'] -%}
-  {%- set mainint = salt['pillar.get']('sensor:mainint') %}
-  {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint[0], salt['pillar.get']('sensor:mainip')) %}
+  {%- set mainint = salt['pillar.get']('host:mainint') %}
+  {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint)[0] %}
 {%- else %}
   {%- set ip = salt['pillar.get']('global:managerip') %}
 {%- endif -%}
diff --git a/salt/strelka/files/manager/manager.yaml b/salt/strelka/files/manager/manager.yaml
index 466b94a8a..bd15b6423 100644
--- a/salt/strelka/files/manager/manager.yaml
+++ b/salt/strelka/files/manager/manager.yaml
@@ -1,6 +1,6 @@
 {%- if grains.role in ['so-sensor', 'so-heavynode'] -%}
-  {%- set mainint = salt['pillar.get']('sensor:mainint') %}
-  {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint[0], salt['pillar.get']('sensor:mainip')) %}
+  {%- set mainint = salt['pillar.get']('host:mainint') %}
+  {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint)[0] %}
 {%- else %}
   {%- set ip = salt['pillar.get']('global:managerip') %}
 {%- endif -%}