diff --git a/salt/top.sls b/salt/top.sls
index e28c60bd0..42203b13e 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -2,6 +2,7 @@
 {%- set WAZUH = salt['pillar.get']('static:wazuh', '0') -%}
 {%- set THEHIVE = salt['pillar.get']('master:thehive', '0') -%}
 {%- set PLAYBOOK = salt['pillar.get']('master:playbook', '0') -%}
+{%- set NAVIGATOR = salt['pillar.get']('master:navigator', '0') -%}
 {%- set FREQSERVER = salt['pillar.get']('master:freq', '0') -%}
 {%- set DOMAINSTATS = salt['pillar.get']('master:domainstats', '0') -%}
 {%- set FLEETMASTER = salt['pillar.get']('static:fleet_master', False) -%}
@@ -68,7 +69,9 @@ base:
     - firewall
     - idstools
     - healthcheck
+    {%- if FLEETMASTER or FLEETNODE or PLAYBOOK != 0 %}
     - mysql
+    {%- endif %}
     {%- if WAZUH != 0 %}
     - wazuh
     {%- endif %}
@@ -97,6 +100,9 @@ base:
     {%- if PLAYBOOK != 0 %}
     - playbook
     {%- endif %}
+    {%- if NAVIGATOR != 0 %}
+    - navigator
+    {%- endif %}
     {%- if FREQSERVER != 0 %}
     - freqserver
     {%- endif %}
@@ -119,7 +125,7 @@ base:
     - master
     - idstools
     - redis
-    {%- if FLEETMASTER or FLEETNODE %}
+    {%- if FLEETMASTER or FLEETNODE or PLAYBOOK != 0 %}
     - mysql
     {%- endif %}
     {%- if WAZUH != 0 %}
@@ -230,7 +236,7 @@ base:
     - master
     - idstools
     - redis
-    {%- if FLEETMASTER or FLEETNODE %}
+    {%- if FLEETMASTER or FLEETNODE or PLAYBOOK != 0 %}
     - mysql
     {%- endif %}
     {%- if WAZUH != 0 %}
diff --git a/setup/so-functions b/setup/so-functions
index 698d89478..b4aeb7f53 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -827,6 +827,7 @@ master_pillar() {
 		"  wazuh: $WAZUH"\
 		"  thehive: $THEHIVE"\
 		"  playbook: $PLAYBOOK"\
+		"  navigator: $NAVIGATOR"\
 		"  strelka: $STRELKA"\
 		""\
 		"kratos:" >> "$pillar_file"
diff --git a/setup/so-setup b/setup/so-setup
index 4d8fa796b..1808a469d 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -427,6 +427,11 @@ export percentage=0
 		salt-call state.apply -l info playbook >> $setup_log 2>&1
 	fi
 
+	if [[ "$NAVIGATOR" = 1 ]]; then
+		set_progress_str 78 "$(print_salt_state_apply 'navigator')"
+		salt-call state.apply -l info navigator >> $setup_log 2>&1
+	fi
+
 	if [[ $is_master || $is_helix ]]; then
 		set_progress_str 79 "$(print_salt_state_apply 'master')"
 		salt-call state.apply -l info master >> $setup_log 2>&1
diff --git a/setup/so-whiptail b/setup/so-whiptail
index 28b244b85..6de8e6fdd 100755
--- a/setup/so-whiptail
+++ b/setup/so-whiptail
@@ -138,7 +138,7 @@ whiptail_create_admin_user() {
 	[ -n "$TESTING" ] && return
 
 	ADMINUSER=$(whiptail --title "Security Onion Install" --inputbox \
-	"Please enter a username for your new admin user. The onion account will be disabled during this install" 10 60 3>&1 1>&2 2>&3)
+	"Please enter a username for a new system admin user. The local onion account will be disabled during this install" 10 60 3>&1 1>&2 2>&3)
 
 }
 
@@ -298,6 +298,7 @@ whiptail_enable_components() {
 	WAZUH "Enable Wazuh" ON \
 	THEHIVE "Enable TheHive" ON \
 	PLAYBOOK "Enable Playbook" ON \
+	NAVIGATOR "Enable ATT&CK Navigator" ON \
 	STRELKA "Enable Strelka" ON 3>&1 1>&2 2>&3)
 	local exitstatus=$?
 	whiptail_check_exitstatus $exitstatus