diff --git a/setup/so-functions b/setup/so-functions
index 4398cfbcc..3a1d05757 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1640,6 +1640,13 @@ manager_pillar() {
 	printf '%s\n'\
 		"  kratoskey: '$KRATOSKEY'"\
 		"" >> "$pillar_file"
+
+        if [[ -n $ENDGAMEHOST ]]; then
+        	printf '%s\n'\
+			"soc:"\
+                	"  endgamehost: '$ENDGAMEHOST'"\
+                	"" >> "$pillar_file"
+	fi
 }
 
 manager_global() {
diff --git a/setup/so-setup b/setup/so-setup
index 71401602e..95cf84b27 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -967,9 +967,9 @@ else
 			so-learn enable logscan --apply >> $setup_log 2>&1
 		fi
 
-		if [[ -n $ENDGAME_SMP_IP ]]; then
+		if [[ -n $ENDGAMEHOST ]]; then
                         set_progress_str 99 'Configuring firewall for Endgame SMP'
-                        so-firewall --apply includehost endgame $ENDGAME_SMP_IP   >> $setup_log 2>&1
+                        so-firewall --apply includehost endgame $ENDGAMEHOST   >> $setup_log 2>&1
                 fi
 
 	} | whiptail_gauge_post_setup "Running post-installation steps..."