diff --git a/setup/so-setup b/setup/so-setup
index 8bc2c687a..0e3749bce 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -717,8 +717,12 @@ echo "1" > /root/accept_changes
 	if [[ $is_manager && ! $is_eval ]]; then
 		add_soremote_user_manager >> $setup_log 2>&1
 	fi
-
-	host_pillar >> $setup_log 2>&1
+    if [[ ! $is_analyst ]]; then
+	    host_pillar >> $setup_log 2>&1
+	fi
+	if [[ $is_analyst ]]; then
+	    analyst_workstation_pillar
+	fi
 	ntp_pillar >> $setup_log 2>&1