diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup
index 960c50f31..333be836b 100755
--- a/salt/manager/tools/sbin/soup
+++ b/salt/manager/tools/sbin/soup
@@ -580,7 +580,7 @@ update_centos_repo() {
 update_salt_mine() {
     echo "Populating the mine with network.ip_addrs pillar.host.mainint for each host."
     set +e
-    salt \* cmd.run cmd='MAININT=$(salt-call pillar.get host:mainint --out=newline_values_only) && salt-call mine.send name=network.ip_addrs interface="$MAININT"'
+    salt \* mine.update
     set -e
 }
 
diff --git a/salt/salt/etc/minion.d/mine_functions.conf.jinja b/salt/salt/etc/minion.d/mine_functions.conf.jinja
index 378d2c435..2ae345cdf 100644
--- a/salt/salt/etc/minion.d/mine_functions.conf.jinja
+++ b/salt/salt/etc/minion.d/mine_functions.conf.jinja
@@ -2,3 +2,7 @@ mine_interval: 35
 mine_functions:
   network.ip_addrs:
     - interface: {{ GLOBALS.main_interface }}
+{% if GLOBALS.is_manager -%}
+  x509.get_pem_entries:
+    - glob_path: '/etc/pki/ca.crt'
+{% endif -%}
diff --git a/salt/salt/master.sls b/salt/salt/master.sls
index 8b2b6c7d0..b10a4df0f 100644
--- a/salt/salt/master.sls
+++ b/salt/salt/master.sls
@@ -18,17 +18,14 @@ salt_master_service:
     - enable: True
 
 checkmine_engine:
-  file.managed:
+  file.absent:
     - name: /etc/salt/engines/checkmine.py
-    - source: salt://salt/engines/checkmine.py
-    - makedirs: True
     - watch_in:
         - service: salt_minion_service
 
 engines_config:
-  file.managed:
+  file.absent:
     - name: /etc/salt/minion.d/engines.conf
-    - source: salt://salt/files/engines.conf
     - watch_in:
         - service: salt_minion_service
 
@@ -38,4 +35,4 @@ engines_config:
   test.fail_without_changes:
     - name: {{sls}}_state_not_allowed
 
-{% endif %}
\ No newline at end of file
+{% endif %}