diff --git a/setup/so-functions b/setup/so-functions
index 06f103cfc..dc2a9e7fd 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1200,14 +1200,19 @@ manager_global() {
 		"  features: False"\
 		"elasticsearch:"\
 		"  replicas: 0"\
-		"  true_cluster: False"\
-		"  true_cluster_name: 'so'"\
+		if [ -z "$ESCLUSTERNAME" ]; then 
+		"  true_cluster: False"
+		"  true_cluster_name: 'so'"
+		else
+		"  true_cluster: True"
+		"  true_cluster_name: '$ESCLUSTERNAME'"
+		fi
 		"  discovery_nodes: 1"\
 		"  hot_warm_enabled: False"\
 		"  cluster_routing_allocation_disk.threshold_enabled: true"\
-                "  cluster_routing_allocation_disk_watermark_low: '95%'"\
-                "  cluster_routing_allocation_disk_watermark_high: '98%'"\
-                "  cluster_routing_allocation_disk_watermark_flood_stage: '98%'"\
+        "  cluster_routing_allocation_disk_watermark_low: '95%'"\
+        "  cluster_routing_allocation_disk_watermark_high: '98%'"\
+        "  cluster_routing_allocation_disk_watermark_flood_stage: '98%'"\
 		"  index_settings:"\
 		"    so-beats:"\
 		"      shards: 1"\