diff --git a/setup/so-setup b/setup/so-setup
index 949f2b2d7..7ea298a7d 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -305,8 +305,10 @@ export percentage=0
 		master_pillar 2>> "$setup_log"
 	fi
 
-	set_progress_str 14 'Configuring firewall'
-	set_initial_firewall_policy 2>> "$setup_log"
+	if [[ $is_minion ]]; then
+		set_progress_str 14 'Configuring firewall'
+		set_initial_firewall_policy 2>> "$setup_log"
+	fi
 
 	set_progress_str 16 'Running first Salt checkin'
 	salt_firstcheckin 2>> "$setup_log"
@@ -334,22 +336,26 @@ export percentage=0
 		salt-key -ya "$MINION_ID" >> "$setup_log" 2>&1
 	fi
 
-	set_progress_str 22 'Generating CA and checking in'
-	salt_checkin 2>> "$setup_log"
-
-	set_progress_str 23 "$(print_salt_state_apply 'schedule')"
-	salt-call state.apply -l info schedule >> $setup_log 2>&1
-
-	set_progress_str 24 'Copying minion pillars to master'
+	set_progress_str 22 'Copying minion pillars to master'
 	copy_minion_tmp_files 2>> "$setup_log"
 
+	set_progress_str 23 'Generating CA and checking in'
+	salt_checkin 2>> "$setup_log"
+
+	set_progress_str 24 "$(print_salt_state_apply 'schedule')"
+	salt-call state.apply -l info schedule >> $setup_log 2>&1
+
+	
 	if [[ $is_master || $is_helix ]]; then
-		set_progress_str 25 'Downloading containers from the internet'
+		set_progress_str 25 'Configuring firewall'
+		set_initial_firewall_policy 2>> "$setup_log"
+		
+		set_progress_str 26 'Downloading containers from the internet'
 		salt-call state.apply -l info registry >> "$setup_log" 2>&1
 		docker_seed_registry 2>> "$setup_log" # ~ 60% when finished
 	fi
 
-	set_progress_str 61 "$(print_salt_state_apply 'firewall')"
+	set_progress_str 62 "$(print_salt_state_apply 'firewall')"
 	salt-call state.apply -l info firewall >> $setup_log 2>&1
 
 	set_progress_str 63 "$(print_salt_state_apply 'common')"