diff --git a/salt/common/tools/sbin/so-allow-view b/salt/common/tools/sbin/so-allow-view
old mode 100644
new mode 100755
diff --git a/salt/common/tools/sbin/so-config-backup b/salt/common/tools/sbin/so-config-backup
old mode 100644
new mode 100755
diff --git a/salt/common/tools/sbin/so-elasticsearch-pipelines-list b/salt/common/tools/sbin/so-elasticsearch-pipelines-list
new file mode 100755
index 000000000..eaf21ad15
--- /dev/null
+++ b/salt/common/tools/sbin/so-elasticsearch-pipelines-list
@@ -0,0 +1,23 @@
+#!/bin/bash
+#
+# Copyright 2014,2015,2016,2017,2018,2019,2020 Security Onion Solutions, LLC
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# 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 NODEIP = salt['pillar.get']('elasticsearch:mainip', '') -%}
+. /usr/sbin/so-common
+if [ "$1" == "" ]; then
+    curl -s {{ NODEIP }}:9200/_ingest/pipeline/* | jq 'keys'
+else
+    curl -s {{ NODEIP }}:9200/_ingest/pipeline/$1 | jq
+fi
diff --git a/salt/common/tools/sbin/so-elasticsearch-templates-list b/salt/common/tools/sbin/so-elasticsearch-templates-list
new file mode 100755
index 000000000..f0cbe36e7
--- /dev/null
+++ b/salt/common/tools/sbin/so-elasticsearch-templates-list
@@ -0,0 +1,23 @@
+#!/bin/bash
+#
+# Copyright 2014,2015,2016,2017,2018,2019,2020 Security Onion Solutions, LLC
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# 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 NODEIP = salt['pillar.get']('elasticsearch:mainip', '') -%}
+. /usr/sbin/so-common
+if [ "$1" == "" ]; then
+    curl -s {{ NODEIP }}:9200/_template/* | jq 'keys'
+else
+    curl -s {{ NODEIP }}:9200/_template/$1 | jq
+fi
diff --git a/salt/common/tools/sbin/so-elasticsearch-templates b/salt/common/tools/sbin/so-elasticsearch-templates-load
similarity index 100%
rename from salt/common/tools/sbin/so-elasticsearch-templates
rename to salt/common/tools/sbin/so-elasticsearch-templates-load
diff --git a/salt/common/tools/sbin/so-test b/salt/common/tools/sbin/so-test
old mode 100644
new mode 100755
diff --git a/salt/common/tools/sbin/so-user-list b/salt/common/tools/sbin/so-user-list
old mode 100644
new mode 100755
diff --git a/salt/elasticsearch/init.sls b/salt/elasticsearch/init.sls
index 43db556fa..4dcf3d44f 100644
--- a/salt/elasticsearch/init.sls
+++ b/salt/elasticsearch/init.sls
@@ -240,7 +240,7 @@ so-elasticsearch-pipelines:
 {% if grains['role'] in ['so-manager', 'so-eval', 'so-managersearch', 'so-standalone', 'so-heavynode', 'so-searchnode', 'so-import'] and TEMPLATES %}
 so-elasticsearch-templates:
   cmd.run:
-    - name: /usr/sbin/so-elasticsearch-templates
+    - name: /usr/sbin/so-elasticsearch-templates-load
     - cwd: /opt/so
 {% endif %}
 
diff --git a/setup/so-functions b/setup/so-functions
index 135c8fbfe..6911016f3 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1271,7 +1271,7 @@ manager_global() {
 	        "soctopus:"\
 		"  playbook:"\
 		"    rulesets:"\
-		"      - windows" >> "$global_pillar"
+		"      - windows" >> "$global_pillar"\
 		"redis_settings:"\
 		"  redis_maxmemory: 812"\