diff --git a/setup/so-functions b/setup/so-functions
index d851c80b1..fbc06fd84 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1725,16 +1725,17 @@ manager_global() {
 		"elastic:"\
 		"  features: False"\
 		"elasticsearch:"\
-		"  replicas: 0" >> "$global_pillar"
 	if [ -n "$ESCLUSTERNAME" ]; then 
 		printf '%s\n'\
 			"  true_cluster: True"\
-			"  true_cluster_name: '$ESCLUSTERNAME'" >> "$global_pillar"
+			"  config:"\
+			"    cluster:"\
+			"      name: '$ESCLUSTERNAME'" >> "$global_pillar"
 	else
 		printf '%s\n'\
-			"  true_cluster: False"\
-			"  true_cluster_name: 'so'" >> "$global_pillar"
+			"  true_cluster: False" >> "$global_pillar"
 	fi
+		"  replicas: 0" >> "$global_pillar"
 	printf '%s\n'\
 		"  discovery_nodes: 1"\
 		"  hot_warm_enabled: False"\