diff --git a/salt/filebeat/etc/filebeat.yml b/salt/filebeat/etc/filebeat.yml
index 37f0ec9f4..3011c59f0 100644
--- a/salt/filebeat/etc/filebeat.yml
+++ b/salt/filebeat/etc/filebeat.yml
@@ -1,7 +1,7 @@
 {%- if grains.role == 'so-heavynode' %}
 {%- set MANAGER = salt['pillar.get']('sensor:mainip' '') %}
 {%- else %}
-{%- set MANAGER = grains['manager'] %}
+{%- set MANAGER = salt['grains.get']('master') %}
 {%- endif %}
 
 
diff --git a/salt/pcap/files/sensoroni.json b/salt/pcap/files/sensoroni.json
index edcec2f6c..1b383d915 100644
--- a/salt/pcap/files/sensoroni.json
+++ b/salt/pcap/files/sensoroni.json
@@ -1,4 +1,4 @@
-{%- set MANAGER = grains['manager'] -%}
+{%- set MANAGER = salt['grains.get']('master') -%}
 {%- set SENSORONIKEY = salt['pillar.get']('static:sensoronikey', '') -%}
 {
   "logFilename": "/opt/sensoroni/logs/sensoroni.log",
diff --git a/salt/strelka/init.sls b/salt/strelka/init.sls
index a77b635fe..b34ee92da 100644
--- a/salt/strelka/init.sls
+++ b/salt/strelka/init.sls
@@ -12,7 +12,7 @@
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-{%- set MANAGER = grains['manager'] %}
+{%- set MANAGER = salt['grains.get']('master') %}
 {%- set MANAGERIP = salt['pillar.get']('static:managerip', '') %}
 {% set VERSION = salt['pillar.get']('static:soversion', 'HH1.2.2') %}
 {%- set STRELKA_RULES = salt['pillar.get']('strelka:rules', '1') -%}
diff --git a/salt/telegraf/etc/telegraf.conf b/salt/telegraf/etc/telegraf.conf
index f768efe74..70ca7837f 100644
--- a/salt/telegraf/etc/telegraf.conf
+++ b/salt/telegraf/etc/telegraf.conf
@@ -13,7 +13,7 @@
 # them with $. For strings the variable must be within quotes (ie, "$STR_VAR"),
 # for numbers and booleans they should be plain (ie, $INT_VAR, $BOOL_VAR)
 
-{%- set MANAGER = grains['manager'] %}
+{%- set MANAGER = salt['grains.get']('master') %}
 {% set NODEIP = salt['pillar.get']('elasticsearch:mainip', '') %}
 {% set HELIX_API_KEY = salt['pillar.get']('fireeye:helix:api_key', '') %}
 {% set UNIQUEID = salt['pillar.get']('sensor:uniqueid', '') %}
diff --git a/salt/utility/bin/crossthestreams b/salt/utility/bin/crossthestreams
index 31cbdfceb..d21e3c1a4 100644
--- a/salt/utility/bin/crossthestreams
+++ b/salt/utility/bin/crossthestreams
@@ -1,6 +1,6 @@
 #!/bin/bash
 {% set ES = salt['pillar.get']('manager:mainip', '') %}
-{%- set MANAGER = grains['manager'] %}
+{%- set MANAGER = salt['grains.get']('master') %}
 
 # Wait for ElasticSearch to come up, so that we can query for version infromation
 echo -n "Waiting for ElasticSearch..."