diff --git a/setup/so-functions b/setup/so-functions
index 996620336..8620d5c70 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1808,53 +1808,93 @@ manager_global() {
 		"  cluster_routing_allocation_disk_watermark_high: '98%'"\
 		"  cluster_routing_allocation_disk_watermark_flood_stage: '98%'"\
 		"  index_settings:"\
-		"    so-beats:"\
-		"      shards: 1"\
+		"    so-beats"\
+                "      index_template:"\
+                "        template:"\
+                "          settings:"\
+                "            index:"\
+                "              number_of_shards: 1"\
 		"      warm: 7"\
 		"      close: 30"\
 		"      delete: 365"\
 		"    so-firewall:"\
-		"      shards: 1"\
+		"      index_template:"\
+                "        template:"\
+                "          settings:"\
+                "            index:"\
+                "              number_of_shards: 1"\
 		"      warm: 7"\
 		"      close: 30"\
 		"      delete: 365"\
 		"    so-flow:"\
-		"      shards: 1"\
+		"      index_template:"\
+                "        template:"\
+                "          settings:"\
+                "            index:"\
+                "              number_of_shards: 1"\
 		"      warm: 7"\
 		"      close: 30"\
 		"      delete: 365"\
 		"    so-ids:"\
-		"      shards: 1"\
+		"      index_template:"\
+                "        template:"\
+                "          settings:"\
+                "            index:"\
+                "              number_of_shards: 1"\
 		"      warm: 7"\
 		"      close: 30"\
 		"      delete: 365"\
 		"    so-import:"\
-		"      shards: 1"\
+		"      index_template:"\
+                "        template:"\
+                "          settings:"\
+                "            index:"\
+                "              number_of_shards: 1"\
 		"      warm: 7"\
 		"      close: 73000"\
 		"      delete: 73001"\
 		"    so-osquery:"\
-		"      shards: 1"\
+		"      index_template:"\
+                "        template:"\
+                "          settings:"\
+                "            index:"\
+                "              number_of_shards: 1"\
 		"      warm: 7"\
 		"      close: 30"\
 		"      delete: 365"\
 		"    so-ossec:"\
-		"      shards: 1"\
+		"      index_template:"\
+                "        template:"\
+                "          settings:"\
+                "            index:"\
+                "              number_of_shards: 1"\
 		"      warm: 7"\
 		"      close: 30"\
 		"      delete: 365"\
 		"    so-strelka:"\
-		"      shards: 1"\
+		"      index_template:"\
+                "        template:"\
+                "          settings:"\
+                "            index:"\
+                "              number_of_shards: 1"\
 		"      warm: 7"\
 		"      close: 30"\
 		"      delete: 365"\
 		"    so-syslog:"\
-		"      shards: 1"\
+		"      index_template:"\
+                "        template:"\
+                "          settings:"\
+                "            index:"\
+                "              number_of_shards: 1"\
 		"      warm: 7"\
 		"      close: 30"\
 		"      delete: 365"\
 		"    so-zeek:"\
-		"      shards: 5"\
+		"      index_template:"\
+                "        template:"\
+                "          settings:"\
+                "            index:"\
+                "              number_of_shards: 1"\
 		"      warm: 7"\
 		"      close: 45"\
 		"      delete: 365"\