diff --git a/salt/salt/etc/minion.d/mine_functions.conf.jinja b/salt/salt/etc/minion.d/mine_functions.conf.jinja
index 2ae345cdf..e3c62e75c 100644
--- a/salt/salt/etc/minion.d/mine_functions.conf.jinja
+++ b/salt/salt/etc/minion.d/mine_functions.conf.jinja
@@ -1,8 +1,8 @@
 mine_interval: 35
 mine_functions:
   network.ip_addrs:
-    - interface: {{ GLOBALS.main_interface }}
-{% if GLOBALS.is_manager -%}
+    - interface: {{ pillar.host.mainint }}
+{% if grains.role in ['so-eval','so-import','so-manager','so-managersearch','so-standalone'] -%}
   x509.get_pem_entries:
     - glob_path: '/etc/pki/ca.crt'
 {% endif -%}
diff --git a/salt/salt/mine_functions.sls b/salt/salt/mine_functions.sls
new file mode 100644
index 000000000..27a905847
--- /dev/null
+++ b/salt/salt/mine_functions.sls
@@ -0,0 +1,5 @@
+mine_functions:
+  file.managed:
+    - name: /etc/salt/minion.d/mine_functions.conf
+    - source: salt://salt/etc/minion.d/mine_functions.conf.jinja
+    - template: jinja
diff --git a/salt/salt/minion.sls b/salt/salt/minion.sls
index 43f7539f9..865bd367f 100644
--- a/salt/salt/minion.sls
+++ b/salt/salt/minion.sls
@@ -12,6 +12,7 @@ include:
   - salt
   - systemd.reload
   - repo.client
+  - salt.mine_functions
 
 {% if INSTALLEDSALTVERSION|string != SALTVERSION|string %}
 
@@ -78,14 +79,6 @@ salt_minion_service_unit_file:
 
 {% endif %}
 
-mine_functions:
-  file.managed:
-    - name: /etc/salt/minion.d/mine_functions.conf
-    - source: salt://salt/etc/minion.d/mine_functions.conf.jinja
-    - template: jinja
-    - defaults:
-        GLOBALS: {{ GLOBALS }}
-
 # this has to be outside the if statement above since there are <requisite>_in calls to this state
 salt_minion_service:
   service.running:
diff --git a/setup/so-functions b/setup/so-functions
index 679142e2a..eab7a4add 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -649,8 +649,7 @@ configure_minion() {
 		"log_level_logfile: info"\
 		"log_file: /opt/so/log/salt/minion" >> "$minion_config"
 
-	cp -f ../salt/salt/etc/minion.d/mine_functions.conf.jinja /etc/salt/minion.d/mine_functions.conf
-	sed -i "s/{{ GLOBALS.main_interface }}/$MNIC/" /etc/salt/minion.d/mine_functions.conf
+	logCmd "salt-call state.apply salt.mine_functions -l info"
 
 	{
 		logCmd "systemctl enable salt-minion";