diff --git a/salt/elasticsearch/init.sls b/salt/elasticsearch/init.sls
index 575d8162c..f213ff562 100644
--- a/salt/elasticsearch/init.sls
+++ b/salt/elasticsearch/init.sls
@@ -148,5 +148,7 @@ so-elasticsearch-pipelines:
 so-elasticsearch-templates:
   cmd.run:
     - name: /usr/sbin/so-elasticsearch-templates
-    - cwd: /
+    - cwd: /opt/so
+    - watch: 
+      - /opt/so/saltstack/salt/logstash/pipelines/templates/so/*.json
 
diff --git a/salt/kibana/bin/so-kibana-config-load b/salt/kibana/bin/so-kibana-config-load
index 9f6913c11..de6961c04 100644
--- a/salt/kibana/bin/so-kibana-config-load
+++ b/salt/kibana/bin/so-kibana-config-load
@@ -32,8 +32,8 @@ sleep 30s
 
 # Sub our IP for placholders
 for i in FLEETPLACEHOLDER PCAPPLACEHOLDER SOCTOPUSPLACEHOLDER PLACEHOLDER; do
-        sed -i "s/$i/{{ MASTER }}/g" /opt/so/saltstack/salt/kibana/saved_objects.ndjson
+        sed "s/$i/{{ MASTER }}/g" /opt/so/conf/kibana/saved_objects.ndjson.template > /opt/so/conf/kibana/saved_objects.ndjson
 done
 
 # Load saved objects
-curl -X POST "localhost:5601/api/saved_objects/_import" -H "kbn-xsrf: true" --form file=@/opt/so/saltstack/salt/kibana/saved_objects.ndjson
+curl -X POST "localhost:5601/api/saved_objects/_import" -H "kbn-xsrf: true" --form file=@/opt/so/conf/kibana/saved_objects.ndjson > /dev/null 2>&1
diff --git a/salt/kibana/saved_objects.ndjson b/salt/kibana/files/saved_objects.ndjson
similarity index 100%
rename from salt/kibana/saved_objects.ndjson
rename to salt/kibana/files/saved_objects.ndjson
diff --git a/salt/kibana/init.sls b/salt/kibana/init.sls
index 8fc5e0683..0f0fa987e 100644
--- a/salt/kibana/init.sls
+++ b/salt/kibana/init.sls
@@ -59,7 +59,19 @@ synckibanacustom:
     - user: 932
     - group: 939
 
-# File.Recurse for custom saved dashboards
+kibanabin:
+  file.managed:
+    - name: /usr/sbin/so-kibana-config-load
+    - source: salt://kibana/bin/so-kibana-config-load
+    - mode: 755
+    - template: jinja
+
+kibanadashtemplate:
+  file.managed:
+    - name: /opt/so/conf/kibana/saved_objects.ndjson.template
+    - source: salt://kibana/files/saved_objects.ndjson
+    - user: 932
+    - group: 939
 
 # Start the kibana docker
 so-kibana:
@@ -80,12 +92,12 @@ so-kibana:
       - 0.0.0.0:5601:5601
 
 so-kibana-config-load:
-  cmd.script:
-    - shell: /bin/bash
-    - runas: socore
+  cmd.run:
+    - name: /usr/sbin/so-kibana-config-load
     - cwd: /opt/so
-    - source: salt://kibana/bin/so-kibana-config-load
-    - template: jinja
+    - onchanges:
+      - file: kibanadashtemplate
+
 
 # Keep the setting correct
 #KibanaHappy:
@@ -93,4 +105,4 @@ so-kibana-config-load:
 #    - shell: /bin/bash
 #    - runas: socore
 #    - source: salt://kibana/bin/keepkibanahappy.sh
-#    - template: jinja
+#    - template: jinja
\ No newline at end of file