diff --git a/pillar/top.sls b/pillar/top.sls
index afdd155c6..17bf33e02 100644
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -30,6 +30,7 @@ base:
 
   'G@role:so-helix':
     - masters.{{ grains.id }}
+    - sensors.{{ grains.id }}
     - static
     - firewall.*
     - fireeye
diff --git a/setup/functions.sh b/setup/functions.sh
index ac678cb9f..910be0437 100644
--- a/setup/functions.sh
+++ b/setup/functions.sh
@@ -1124,6 +1124,9 @@ sensor_pillar() {
       SPIN=$(echo $SPIN |  cut -d\" -f2)
     echo "    - $SPIN" >> $SENSORPILLARPATH/$MINION_ID.sls
     done
+  elif [ $INSTALLTYPE == 'HELIXSENSOR' ]; then
+    echo "  bro_lbprocs: $LBPROCS" >> $SENSORPILLARPATH/$MINION_ID.sls
+    echo "  suriprocs: $LBPROCS" >> $SENSORPILLARPATH/$MINION_ID.sls
   else
     echo "  bro_lbprocs: $BASICBRO" >> $SENSORPILLARPATH/$MINION_ID.sls
     echo "  suriprocs: $BASICSURI" >> $SENSORPILLARPATH/$MINION_ID.sls
diff --git a/setup/so-setup.sh b/setup/so-setup.sh
index 219ec589d..a53e24aaf 100644
--- a/setup/so-setup.sh
+++ b/setup/so-setup.sh
@@ -151,6 +151,7 @@ if (whiptail_you_sure) ; then
     whiptail_helix_apikey
     whiptail_homenet_master
     RULESETUP=ETOPEN
+    calculate_useable_cores
     whiptail_make_changes
     set_hostname
     clear_master
@@ -193,6 +194,7 @@ if (whiptail_you_sure) ; then
       patch_pillar >> $SETUPLOG 2>&1
       echo "** Generating the FireEye pillar **" >> $SETUPLOG
       fireeye_pillar >> $SETUPLOG 2>&1
+      sensor_pillar >> $SETUPLOG 2>&1
       echo -e "XXX\n24\nCopying Minion Pillars to Master... \nXXX"
       copy_minion_tmp_files >> $SETUPLOG 2>&1
       # Do a checkin to push the key up