diff --git a/setup/so-functions b/setup/so-functions
index 6447a7ded..97b3fcdd4 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1430,8 +1430,8 @@ create_global() {
 	# Continue adding other details	
 	echo "  imagerepo: '$IMAGEREPO'" >> $global_pillar_file
 	echo "  pipeline: 'redis'" >> $global_pillar_file
-	echo "  repo_host: '$MAINIP'" >> $global_pillar_file
-	echo "  registry_host: '$MAINIP'" >> $global_pillar_file
+	echo "  repo_host: '$HOSTNAME'" >> $global_pillar_file
+	echo "  registry_host: '$HOSTNAME'" >> $global_pillar_file
 	echo "  endgamehost: '$ENDGAMEHOST'" >> $global_pillar_file
 }