diff --git a/pillar/data/addtotab.sh b/pillar/data/addtotab.sh
index 21a735214..d1178bda2 100644
--- a/pillar/data/addtotab.sh
+++ b/pillar/data/addtotab.sh
@@ -5,20 +5,23 @@
 TYPE=$1
 NAME=$2
 IPADDRESS=$3
-MANINT=$4
-MONINT=$5
+CPUS=$4
+MANINT=$5
+MONINT=$6
+
 
 if grep -q $IPADDRESS "/opt/so/saltstack/pillar/data/$1.sls"; then
   echo "Node Already Present"
 else
   echo "  $NAME:" >> /opt/so/saltstack/pillar/data/$1.sls
   echo "    ip: $IPADDRESS" >> /opt/so/saltstack/pillar/data/$1.sls
+  echo "    manint: $MANINT" >> /opt/so/saltstack/pillar/data/$1.sls
+  echo "    totalcpus: $CPUS"
   if [ $TYPE == 'sensorstab' ]; then
-    echo "    manint: $MANINT" >> /opt/so/saltstack/pillar/data/$1.sls
     echo "    monint: $MONINT" >> /opt/so/saltstack/pillar/data/$1.sls
   fi
-  if [ $TYPE == 'nodestab' ]; then
-    echo "    manint: $MANINT" >> /opt/so/saltstack/pillar/data/$1.sls
+  if [ $TYPE == 'evaltab' ]; then
+    echo "    monint: $MONINT" >> /opt/so/saltstack/pillar/data/$1.sls
   fi
 
   salt-call state.apply common
diff --git a/so-setup-network.sh b/so-setup-network.sh
index 91d8647d3..7ba433830 100644
--- a/so-setup-network.sh
+++ b/so-setup-network.sh
@@ -727,6 +727,7 @@ set_initial_firewall_policy() {
   if [ $INSTALLTYPE == 'MASTERONLY' ]; then
     printf "  - $MAINIP\n" >> /opt/so/saltstack/pillar/firewall/minions.sls
     printf "  - $MAINIP\n" >> /opt/so/saltstack/pillar/firewall/masterfw.sls
+    /opt/so/saltstack/pillar/data/addtotab.sh mastertab $HOSTNAME $MAINIP $CPUCORES $MAININT
   fi
 
   if [ $INSTALLTYPE == 'EVALMODE' ]; then
@@ -734,18 +735,19 @@ set_initial_firewall_policy() {
     printf "  - $MAINIP\n" >> /opt/so/saltstack/pillar/firewall/masterfw.sls
     printf "  - $MAINIP\n" >> /opt/so/saltstack/pillar/firewall/forward_nodes.sls
     printf "  - $MAINIP\n" >> /opt/so/saltstack/pillar/firewall/storage_nodes.sls
+    /opt/so/saltstack/pillar/data/addtotab.sh sensorstab $HOSTNAME $MAINIP $CPUCORES $MAININT bond0
   fi
 
   if [ $INSTALLTYPE == 'SENSORONLY' ]; then
     ssh -i /root/.ssh/so.key socore@$MSRV sudo /opt/so/saltstack/pillar/firewall/addfirewall.sh minions $MAINIP
     ssh -i /root/.ssh/so.key socore@$MSRV sudo /opt/so/saltstack/pillar/firewall/addfirewall.sh forward_nodes $MAINIP
-    ssh -i /root/.ssh/so.key socore@$MSRV sudo /opt/so/saltstack/pillar/data/addtotab.sh sensorstab $HOSTNAME $MAINIP $MAININT bond0
+    ssh -i /root/.ssh/so.key socore@$MSRV sudo /opt/so/saltstack/pillar/data/addtotab.sh sensorstab $HOSTNAME $MAINIP $CPUCORES $MAININT bond0
   fi
 
   if [ $INSTALLTYPE == 'STORAGENODE' ]; then
     ssh -i /root/.ssh/so.key socore@$MSRV sudo /opt/so/saltstack/pillar/firewall/addfirewall.sh minions $MAINIP
     ssh -i /root/.ssh/so.key socore@$MSRV sudo /opt/so/saltstack/pillar/firewall/addfirewall.sh storage_nodes $MAINIP
-    ssh -i /root/.ssh/so.key socore@$MSRV sudo /opt/so/saltstack/pillar/data/addtotab.sh nodestab $HOSTNAME $MAINIP $MAININT
+    ssh -i /root/.ssh/so.key socore@$MSRV sudo /opt/so/saltstack/pillar/data/addtotab.sh nodestab $HOSTNAME $MAINIP $CPUCORES $MAININT
   fi
 
   if [ $INSTALLTYPE == 'PARSINGNODE' ]; then