diff --git a/pillar/data/addtotab.sh b/pillar/data/addtotab.sh
index 9737111c6..a3aaa2c24 100644
--- a/pillar/data/addtotab.sh
+++ b/pillar/data/addtotab.sh
@@ -12,6 +12,7 @@ MANINT=$6
 ROOTFS=$7
 NSM=$8
 MONINT=$9
+INITIALSETUP=$10
 #NODETYPE=$10
 #HOTNAME=$11
 
@@ -49,8 +50,10 @@ if [ $TYPE == 'sensorstab' ]; then
 fi
 if [ $TYPE == 'evaltab' ]; then
   echo "    monint: $MONINT" >> $local_salt_dir/pillar/data/$TYPE.sls
-  salt-call state.apply grafana queue=True
-  salt-call state.apply utility queue=True
+  if [ ! $10 ]; then
+    salt-call state.apply grafana queue=True
+    salt-call state.apply utility queue=True
+  fi
 fi
 #if [ $TYPE == 'nodestab' ]; then
 #  echo "    nodetype: $NODETYPE" >> $local_salt_dir/pillar/data/$TYPE.sls
diff --git a/setup/so-functions b/setup/so-functions
index 53abe311e..5550b94a6 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1386,7 +1386,6 @@ set_initial_firewall_policy() {
 	case "$install_type" in
 		'MASTER')
 			printf "  - %s\n" "$MAINIP" | tee -a $local_salt_dir/pillar/firewall/minions.sls $local_salt_dir/pillar/firewall/masterfw.sls
-			salt-call state.apply firewall queue=True
 			$default_salt_dir/pillar/data/addtotab.sh mastertab "$MINION_ID" "$MAINIP" "$num_cpu_cores" "$random_uid" "$MNIC" "$filesystem_root" "$filesystem_nsm"
 			;;
 		'EVAL' | 'MASTERSEARCH')
@@ -1394,11 +1393,9 @@ set_initial_firewall_policy() {
 				$local_salt_dir/pillar/firewall/masterfw.sls\
 				$local_salt_dir/pillar/firewall/forward_nodes.sls\
 				$local_salt_dir/pillar/firewall/search_nodes.sls
-			salt-call state.apply firewall queue=True
 			case "$install_type" in 
 				'EVAL')
-				    
-					$default_salt_dir/pillar/data/addtotab.sh evaltab "$MINION_ID" "$MAINIP" "$num_cpu_cores" "$random_uid" "$MNIC" "$filesystem_root" "$filesystem_nsm" bond0
+					$default_salt_dir/pillar/data/addtotab.sh evaltab "$MINION_ID" "$MAINIP" "$num_cpu_cores" "$random_uid" "$MNIC" "$filesystem_root" "$filesystem_nsm" bond0 True
 					;;
 				'MASTERSEARCH')
 					$default_salt_dir/pillar/data/addtotab.sh mastersearchtab "$MINION_ID" "$MAINIP" "$num_cpu_cores" "$random_uid" "$MNIC" "$filesystem_root" "$filesystem_nsm"