diff --git a/setup/so-functions b/setup/so-functions
index fdfcf37eb..9f2f7edfd 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -873,13 +873,11 @@ master_pillar() {
 		"  esheap: $ES_HEAP_SIZE"\
 		"  esclustername: {{ grains.host }}"\
 		"  freq: 0"\
-		"  domainstats: 0" >> "$pillar_file"
+		"  domainstats: 0" > "$pillar_file"
+		
 
 	if [ "$install_type" = 'EVAL' ] || [ "$install_type" = 'HELIXSENSOR' ] || [ "$install_type" = 'MASTERSEARCH' ] || [ "$install_type" = 'STANDALONE' ]; then
 		printf '%s\n'\
-			"  ls_pipeline_batch_size: 125"\
-			"  ls_input_threads: 1"\
-			"  ls_batch_count: 125"\
 			"  mtu: $MTU" >> "$pillar_file"
 	fi
 
@@ -911,6 +909,11 @@ master_pillar() {
 		"  playbook: $PLAYBOOK"\
 		"  url_base: $REDIRECTIT"\
 		""\
+		"logstash:"\
+		"  ls_pipeline_batch_size: 125"\
+		"  ls_input_threads: 1"\
+		"  ls_batch_count: 125"\
+		""\
 		"kratos:" >> "$pillar_file"
 
 	printf '%s\n'\
@@ -1007,8 +1010,6 @@ node_pillar() {
 		"  esheap: $NODE_ES_HEAP_SIZE"\
 		"  esclustername: {{ grains.host }}"\
 		"  lsheap: $NODE_LS_HEAP_SIZE"\
-		"  ls_pipeline_workers: $LSPIPELINEWORKERS"\
-		"  ls_pipeline_batch_size: $LSPIPELINEBATCH"\
 		"  ls_input_threads: $LSINPUTTHREADS"\
 		"  ls_batch_count: $LSINPUTBATCHCOUNT"\
 		"  es_shard_count: $SHARDCOUNT"\
@@ -1016,6 +1017,10 @@ node_pillar() {
 		"  es_port: $node_es_port"\
 		"  log_size_limit: $log_size_limit"\
 		"  cur_close_days: $CURCLOSEDAYS"\
+		"logstash:"\
+		"  ls_pipeline_batch_size: $LSPIPELINEBATCH"\
+		"  ls_input_threads: $LSINPUTTHREADS"\
+		"  ls_batch_count: $LSINPUTBATCHCOUNT"\
 		"" >> "$pillar_file"
 
 	printf '%s\n'  '----' >> "$setup_log" 2>&1