diff --git a/setup/so-setup b/setup/so-setup
index 566767e82..55caa7cdc 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -346,22 +346,22 @@ fi
 	# Set initial percentage to 0
 	export percentage=0
 
-	set_progress_str 1 'Updating packages'
+        if [[ $is_minion ]]; then
+                set_progress_str 1 'Configuring firewall'
+                set_initial_firewall_policy >> $setup_log 2>&1
+        fi
+
+	set_progress_str 2 'Updating packages'
 	update_packages >> $setup_log 2>&1
 
 	if [[ $is_sensor || $is_helix ]]; then
-		set_progress_str 2 'Creating bond interface'
+		set_progress_str 3 'Creating bond interface'
 		create_sensor_bond >> $setup_log 2>&1
 		
-		set_progress_str 3 'Generating sensor pillar'
+		set_progress_str 4 'Generating sensor pillar'
 		sensor_pillar >> $setup_log 2>&1
 	fi
 
-	if [[ $is_minion ]]; then
-		set_progress_str 4 'Configuring firewall'
-		set_initial_firewall_policy >> $setup_log 2>&1
-	fi
-
 	set_progress_str 5 'Installing Salt and dependencies'
 	saltify 2>> $setup_log