diff --git a/setup/so-setup b/setup/so-setup
index d4298737d..73e2ec306 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -342,74 +342,74 @@ export percentage=0
 	set_progress_str 61 "$(print_salt_state_apply 'common')"
 	salt-call state.apply -l info common >> $setup_log 2>&1
 
-		if [[ $is_sensor ]]; then
-		set_progress_str 62 "$(print_salt_state_apply 'pcap')"
+	if [[ $is_master || $is_node ]]; then
+		set_progress_str 62 "$(print_salt_state_apply 'elasticsearch')"
+		salt-call state.apply -l info elasticsearch >> $setup_log 2>&1
+	fi
+
+	if [[ $is_sensor ]]; then
+		set_progress_str 63 "$(print_salt_state_apply 'pcap')"
 		salt-call state.apply -l info pcap >> $setup_log 2>&1
 
-		set_progress_str 63 "$(print_salt_state_apply 'suricata')"
+		set_progress_str 64 "$(print_salt_state_apply 'suricata')"
 		salt-call state.apply -l info suricata >> $setup_log 2>&1
 
-		set_progress_str 64 "$(print_salt_state_apply 'zeek')"
+		set_progress_str 65 "$(print_salt_state_apply 'zeek')"
 		salt-call state.apply -l info zeek >> $setup_log 2>&1
 	fi
 
 	if [[ $is_node ]]; then
-		set_progress_str 65 "$(print_salt_state_apply 'curator')"
+		set_progress_str 66 "$(print_salt_state_apply 'curator')"
 		salt-call state.apply -l info curator >> $setup_log 2>&1
 	fi
 	
 	if [[ "$OSQUERY" = 1 ]]; then
-		set_progress_str 66 "$(print_salt_state_apply 'fleet')"
+		set_progress_str 67 "$(print_salt_state_apply 'fleet')"
 		salt-call state.apply -l info fleet >> $setup_log 2>&1
 
-		set_progress_str 67 "$(print_salt_state_apply 'redis')"
+		set_progress_str 68 "$(print_salt_state_apply 'redis')"
 		salt-call state.apply -l info redis >> $setup_log 2>&1
 	fi
 
 	if [[ "$WAZUH" = 1 ]]; then
-		set_progress_str 68 "$(print_salt_state_apply 'wazuh')"
+		set_progress_str 69 "$(print_salt_state_apply 'wazuh')"
 		salt-call state.apply -l info wazuh >> $setup_log 2>&1
 	fi
 
 	if [[ "$THEHIVE" = 1 ]]; then
-		set_progress_str 69 "$(print_salt_state_apply 'hive')"
+		set_progress_str 6970 "$(print_salt_state_apply 'hive')"
 		salt-call state.apply -l info hive >> $setup_log 2>&1
 	fi
 
 	if [[ "$STRELKA" = 1 ]]; then
-		set_progress_str 70 "$(print_salt_state_apply 'strelka')"
+		set_progress_str 71 "$(print_salt_state_apply 'strelka')"
 		salt-call state.apply -l info strelka >> $setup_log 2>&1
 	fi
 
 	if [[ "$PLAYBOOK" = 1 ]]; then
-		set_progress_str 71 "$(print_salt_state_apply 'playbook')"
+		set_progress_str 72 "$(print_salt_state_apply 'playbook')"
 		salt-call state.apply -l info playbook >> $setup_log 2>&1
 	fi
 
 	if [[ $is_master || $is_helix ]]; then
-		set_progress_str 72 "$(print_salt_state_apply 'master')"
+		set_progress_str 73 "$(print_salt_state_apply 'master')"
 		salt-call state.apply -l info master >> $setup_log 2>&1
 
-		set_progress_str 73 "$(print_salt_state_apply 'idstools')"
+		set_progress_str 74 "$(print_salt_state_apply 'idstools')"
 		salt-call state.apply -l info idstools >> $setup_log 2>&1
 
-		set_progress_str 74 "$(print_salt_state_apply 'utility')"
+		set_progress_str 75 "$(print_salt_state_apply 'utility')"
 		salt-call state.apply -l info utility >> $setup_log 2>&1
 	fi
 
 	if [[ ( $is_helix || $is_master || $is_node ) && ! $is_eval ]]; then
-		set_progress_str 75 "$(print_salt_state_apply 'logstash')"
+		set_progress_str 76 "$(print_salt_state_apply 'logstash')"
 		salt-call state.apply -l info logstash >> $setup_log 2>&1
 
-		set_progress_str 76 "$(print_salt_state_apply 'filebeat')"
+		set_progress_str 77 "$(print_salt_state_apply 'filebeat')"
 		salt-call state.apply -l info filebeat >> $setup_log 2>&1
 	fi
 
-	if [[ $is_master || $is_node ]]; then
-		set_progress_str 77 "$(print_salt_state_apply 'elasticsearch')"
-		salt-call state.apply -l info elasticsearch >> $setup_log 2>&1
-	fi
-
 	if [[ $is_master ]]; then
 		set_progress_str 78 "$(print_salt_state_apply 'soc')"
 		salt-call state.apply -l info soc >> "$setup_log" 2>&1