diff --git a/salt/elasticsearch/init.sls b/salt/elasticsearch/init.sls
index e24eab25e..78a586428 100644
--- a/salt/elasticsearch/init.sls
+++ b/salt/elasticsearch/init.sls
@@ -53,7 +53,7 @@ vm.max_map_count:
 cascriptsync:
   file.managed:
     - name: /usr/sbin/so-catrust
-    - source: salt://elasticsearch/files/scripts/so-catrust
+    - source: salt://elasticsearch/tools/sbin/so-catrust
     - user: 939
     - group: 939
     - mode: 750
@@ -63,9 +63,37 @@ cascriptsync:
 cascriptfun:
   cmd.run:
     - name: /usr/sbin/so-catrust
-
+    - require:
+        - file: cascriptsync
 {% endif %}
 
+# Sync some es scripts
+es_sync_scripts:
+  file.recurse:
+    - name: /usr/sbin
+    - user: root
+    - group: root
+    - file_mode: 755
+    - template: jinja
+    - source: salt://elasticsearch/tools/sbin
+    - defaults:
+        ELASTICCURL: 'curl'
+    - context:
+        ELASTICCURL: {{ ELASTICAUTH.elasticcurl }}
+    - exclude_pat:
+        - so-elasticsearch-pipelines # exclude this because we need to watch it for changes, we sync it in another state
+
+so-elasticsearch-pipelines-script:
+  file.managed:
+    - name: /usr/sbin/so-elasticsearch-pipelines
+    - source: salt://elasticsearch/tools/sbin/so-elasticsearch-pipelines
+    - user: 930
+    - group: 939
+    - mode: 754
+    - template: jinja
+    - defaults:
+        ELASTICCURL: {{ ELASTICAUTH.elasticcurl }}
+
 # Move our new CA over so Elastic and Logstash can use SSL with the internal CA
 catrustdir:
   file.directory:
@@ -297,7 +325,7 @@ so-elasticsearch:
       - file: esyml
       - file: esingestconf
       - file: esingestdynamicconf
-      - file: so-elasticsearch-pipelines-file
+      - file: so-elasticsearch-pipelines-script
     - require:
       - file: esyml
       - file: eslog4jfile
@@ -322,27 +350,17 @@ append_so-elasticsearch_so-status.conf:
     - name: /opt/so/conf/so-status/so-status.conf
     - text: so-elasticsearch
 
-so-elasticsearch-pipelines-file:
-  file.managed:
-    - name: /opt/so/conf/elasticsearch/so-elasticsearch-pipelines
-    - source: salt://elasticsearch/files/so-elasticsearch-pipelines
-    - user: 930
-    - group: 939
-    - mode: 754
-    - template: jinja
-    - defaults:
-        ELASTICCURL: {{ ELASTICAUTH.elasticcurl }}
-
 so-elasticsearch-pipelines:
   cmd.run:
-    - name: /opt/so/conf/elasticsearch/so-elasticsearch-pipelines {{ grains.host }}
+    - name: /usr/sbin/so-elasticsearch-pipelines {{ grains.host }}
     - onchanges:
       - file: esingestconf
       - file: esingestdynamicconf
       - file: esyml
-      - file: so-elasticsearch-pipelines-file
+      - file: so-elasticsearch-pipelines-script
     - require:
       - docker_container: so-elasticsearch
+      - file: so-elasticsearch-pipelines-script
 
 {% if TEMPLATES %}
 so-elasticsearch-templates:
@@ -352,6 +370,7 @@ so-elasticsearch-templates:
     - template: jinja
     - require:
       - docker_container: so-elasticsearch
+      - file: es_sync_scripts
 {% endif %}
 
 so-elasticsearch-roles-load:
@@ -361,6 +380,7 @@ so-elasticsearch-roles-load:
     - template: jinja
     - require:
       - docker_container: so-elasticsearch
+      - file: es_sync_scripts
 
 {% endif %} {# if grains['role'] != 'so-helix' #}
 
diff --git a/salt/elasticsearch/files/scripts/so-catrust b/salt/elasticsearch/tools/sbin/so-catrust
similarity index 100%
rename from salt/elasticsearch/files/scripts/so-catrust
rename to salt/elasticsearch/tools/sbin/so-catrust
diff --git a/salt/elasticsearch/files/so-elasticsearch-pipelines b/salt/elasticsearch/tools/sbin/so-elasticsearch-pipelines
similarity index 100%
rename from salt/elasticsearch/files/so-elasticsearch-pipelines
rename to salt/elasticsearch/tools/sbin/so-elasticsearch-pipelines
diff --git a/salt/common/tools/sbin/so-elasticsearch-roles-load b/salt/elasticsearch/tools/sbin/so-elasticsearch-roles-load
similarity index 100%
rename from salt/common/tools/sbin/so-elasticsearch-roles-load
rename to salt/elasticsearch/tools/sbin/so-elasticsearch-roles-load
diff --git a/salt/common/tools/sbin/so-elasticsearch-templates-load b/salt/elasticsearch/tools/sbin/so-elasticsearch-templates-load
similarity index 100%
rename from salt/common/tools/sbin/so-elasticsearch-templates-load
rename to salt/elasticsearch/tools/sbin/so-elasticsearch-templates-load