diff --git a/setup/so-functions b/setup/so-functions
index 8a51a8b31..6ad0510a5 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -155,7 +155,8 @@ analyst_workstation_pillar() {
         "workstation:"\
 		"  gui:"\
         "    enabled: true" >> "$pillar_file"
-
+		"sensoroni:"\
+		"  node_description: '${NODE_DESCRIPTION//\'/''}'"
 }
 
 calculate_useable_cores() {
@@ -786,6 +787,9 @@ collect_zeek() {
 
 configure_minion() {
 	local minion_type=$1
+	if [[ $is_analyst ]]; then 
+	    minion_type=workstation
+	fi
 	echo "Configuring minion type as $minion_type" >> "$setup_log" 2>&1
 	echo "role: so-$minion_type" > /etc/salt/grains
 
@@ -794,6 +798,9 @@ configure_minion() {
 	echo "id: '$MINION_ID'" > "$minion_config"
 
 	case "$minion_type" in
+	    'workstation')
+   			echo "master: '$HOSTNAME'" >> "$minion_config"
+            ;;
 		'helix')
 			cp -f ../salt/ca/files/signing_policies.conf /etc/salt/minion.d/signing_policies.conf
 			echo "master: '$HOSTNAME'" >> "$minion_config"
@@ -2249,38 +2256,41 @@ remove_package() {
 saltify() {
 
 	# Install updates and Salt
-	if [ $OS = 'centos' ]; then
+	if [[ $is_centos ]]; then
 		set_progress_str 6 'Installing various dependencies'
-		if [[ ! $is_iso ]]; then
+		if [[ ! ( $is_iso || $is_analyst_iso ) ]]; then
 		  logCmd "yum -y install wget nmap-ncat"
-		fi 
-		case "$install_type" in
-			'MANAGER' | 'EVAL' | 'MANAGERSEARCH' | 'FLEET' | 'HELIXSENSOR' | 'STANDALONE'| 'IMPORT')
-				reserve_group_ids
-				if [[ ! $is_iso ]]; then
-				  logCmd "yum -y install sqlite curl mariadb-devel"
-				fi 
-				# Download Ubuntu Keys in case manager updates = 1
-				logCmd "mkdir -vp /opt/so/gpg"
-				if [[ ! $is_airgap ]]; then
-				  logCmd "wget -q --inet4-only -O /opt/so/gpg/SALTSTACK-GPG-KEY.pub https://repo.saltstack.com/py3/ubuntu/18.04/amd64/archive/3004/SALTSTACK-GPG-KEY.pub"
-				  logCmd "wget -q --inet4-only -O /opt/so/gpg/docker.pub https://download.docker.com/linux/ubuntu/gpg"
-				  logCmd "wget -q --inet4-only -O /opt/so/gpg/GPG-KEY-WAZUH https://packages.wazuh.com/key/GPG-KEY-WAZUH"
-				fi
-				set_progress_str 7 'Installing salt-master'
-				if [[ ! $is_iso ]]; then
-				  logCmd "yum -y install salt-master-3004"
-				fi
-				logCmd "systemctl enable salt-master"
-				;;
-			*)
-				;;
-		esac
+		fi
+
+		if [[ ! is_analyst ]]; then 
+		    case "$install_type" in
+		    	'MANAGER' | 'EVAL' | 'MANAGERSEARCH' | 'FLEET' | 'HELIXSENSOR' | 'STANDALONE'| 'IMPORT')
+		    		reserve_group_ids
+		    		if [[ ! $is_iso ]]; then
+		    		  logCmd "yum -y install sqlite curl mariadb-devel"
+		    		fi 
+		    		# Download Ubuntu Keys in case manager updates = 1
+		    		logCmd "mkdir -vp /opt/so/gpg"
+		    		if [[ ! $is_airgap ]]; then
+		    		  logCmd "wget -q --inet4-only -O /opt/so/gpg/SALTSTACK-GPG-KEY.pub https://repo.saltstack.com/py3/ubuntu/18.04/amd64/archive/3004/SALTSTACK-GPG-KEY.pub"
+		    		  logCmd "wget -q --inet4-only -O /opt/so/gpg/docker.pub https://download.docker.com/linux/ubuntu/gpg"
+		    		  logCmd "wget -q --inet4-only -O /opt/so/gpg/GPG-KEY-WAZUH https://packages.wazuh.com/key/GPG-KEY-WAZUH"
+		    		fi
+		    		set_progress_str 7 'Installing salt-master'
+		    		if [[ ! $is_iso ]]; then
+		    		  logCmd "yum -y install salt-master-3004"
+		    		fi
+		    		logCmd "systemctl enable salt-master"
+		    		;;
+		    	*)
+		    		;;
+		    esac
+		fi
 		if [[ ! $is_airgap ]]; then
 		  logCmd "yum clean expire-cache"
 		fi
 		set_progress_str 8 'Installing salt-minion & python modules'
-			if [[ ! $is_iso ]]; then
+			if [[ ! ( $is_iso || $is_analyst_iso ) ]]; then
 				logCmd "yum -y install salt-minion-3004 httpd-tools python3 python36-docker python36-dateutil python36-m2crypto python36-mysql python36-packaging python36-lxml yum-utils device-mapper-persistent-data lvm2 openssl jq"
 				logCmd "yum -y update --exclude=salt*"
 			fi
diff --git a/setup/so-setup b/setup/so-setup
index ba9125f31..8d146d00f 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -461,7 +461,12 @@ detect_cloud
 
 short_name=$(echo "$HOSTNAME" | awk -F. '{print $1}')
 
-MINION_ID=$(echo "${short_name}_${install_type}" | tr '[:upper:]' '[:lower:]')
+if [[ $is_analyst ]]; then
+    MINION_ID=$(echo "${short_name}_workstation" | tr '[:upper:]' '[:lower:]')
+fi
+if [[ ! $is_analyst ]]; then
+    MINION_ID=$(echo "${short_name}_${install_type}" | tr '[:upper:]' '[:lower:]')
+fi
 export MINION_ID
 
 echo "MINION_ID = $MINION_ID" >> $setup_log 2>&1