diff --git a/setup/so-functions b/setup/so-functions
index 4a129d884..0a954af6c 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -843,6 +843,7 @@ master_pillar() {
   echo "  wazuh: $WAZUH" >> $PILLARFILE
   echo "  thehive: $THEHIVE" >> $PILLARFILE
   echo "  playbook: $PLAYBOOK" >> $PILLARFILE
+  echo "  strelka: $STRELKA" >> $PILLARFILE
   echo "" >> $PILLARFILE
   echo "kratos:" >> $PILLARFILE
   if [[ $REDIRECTINFO == 'OTHER' ]]; then
@@ -993,6 +994,7 @@ process_components() {
 	WAZUH=0
 	THEHIVE=0
 	PLAYBOOK=0
+	STRELKA=0
 
 	IFS=$' '
 	for item in $(echo "$CLEAN"); do
diff --git a/setup/so-setup b/setup/so-setup
index 88ae45c9b..1b08132c5 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -716,6 +716,10 @@ if (whiptail_you_sure) ; then
         echo -e "XXX\n93\nInstalling Playbook... \nXXX"
         salt-call state.apply playbook >> $SETUPLOG 2>&1
       fi
+      if [[ $STRELKA == '1' ]]; then
+        echo -e "XXX\n95\nInstalling Strelka... \nXXX"
+        salt-call state.apply strelka >> $SETUPLOG 2>&1
+      fi
       echo -e "XXX\n95\nSetting checkin to run on boot... \nXXX"
       checkin_at_boot >> $SETUPLOG 2>&1
       echo -e "XX\n97\nFinishing touches... \nXXX"
diff --git a/setup/so-whiptail b/setup/so-whiptail
index fa5ee1699..5aa48ac2b 100755
--- a/setup/so-whiptail
+++ b/setup/so-whiptail
@@ -214,7 +214,8 @@ whiptail_enable_components() {
   "OSQUERY" "Enable Fleet with osquery" ON \
   "WAZUH" "Enable Wazuh" ON \
   "THEHIVE" "Enable TheHive" ON \
-  "PLAYBOOK" "Enable Playbook" ON 3>&1 1>&2 2>&3 )
+  "PLAYBOOK" "Enable Playbook" ON \
+  "STRELKA" "Enable Strelka" ON 3>&1 1>&2 2>&3 )
 
   local exitstatus=$?
   whiptail_check_exitstatus $exitstatus