diff --git a/setup/automation/aws_forwardnode_defaults b/setup/automation/distributed_forwardnode_ami
similarity index 100%
rename from setup/automation/aws_forwardnode_defaults
rename to setup/automation/distributed_forwardnode_ami
diff --git a/setup/automation/aws_manager_defaults b/setup/automation/distributed_manager_ami
similarity index 100%
rename from setup/automation/aws_manager_defaults
rename to setup/automation/distributed_manager_ami
diff --git a/setup/automation/aws_searchnode_defaults b/setup/automation/distributed_searchnode_ami
similarity index 100%
rename from setup/automation/aws_searchnode_defaults
rename to setup/automation/distributed_searchnode_ami
diff --git a/setup/automation/aws_eval_defaults b/setup/automation/eval_ami
similarity index 100%
rename from setup/automation/aws_eval_defaults
rename to setup/automation/eval_ami
diff --git a/setup/automation/pm_eval_defaults b/setup/automation/eval_iso
similarity index 100%
rename from setup/automation/pm_eval_defaults
rename to setup/automation/eval_iso
diff --git a/setup/automation/aws_standalone_defaults b/setup/automation/standalone_ami
similarity index 100%
rename from setup/automation/aws_standalone_defaults
rename to setup/automation/standalone_ami
diff --git a/setup/automation/pm_standalone_defaults b/setup/automation/standalone_iso
similarity index 100%
rename from setup/automation/pm_standalone_defaults
rename to setup/automation/standalone_iso
diff --git a/setup/so-setup b/setup/so-setup
index d9bc03444..785d5241f 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -843,8 +843,11 @@ else
 		[ -n "$TESTING" ] && logCmd so-test
 
 		export percentage=95 # set to last percentage used in previous subshell
-		so-soc-stop # Stop SOC so it doesn't accept external requests prior to the reboot
 		if [[ -n $ALLOW_ROLE && -n $ALLOW_CIDR ]]; then 
+			if [[ $is_manager || $is_import ]]; then
+				set_progress_str 96 "Stopping SOC prior to adjusting firewall rules"
+				so-soc-stop # Stop SOC so it doesn't accept external requests prior to the reboot
+			fi
 			set_progress_str 97 "Running so-allow -${ALLOW_ROLE} for ${ALLOW_CIDR}"
 			IP=$ALLOW_CIDR so-allow -$ALLOW_ROLE >> $setup_log 2>&1
 		fi