diff --git a/salt/manager/tools/sbin/so-minion b/salt/manager/tools/sbin/so-minion
index d5d7bb770..5cddb3e68 100755
--- a/salt/manager/tools/sbin/so-minion
+++ b/salt/manager/tools/sbin/so-minion
@@ -196,8 +196,8 @@ function add_sensoroni_to_minion() {
 
 	printf '%s\n'\
     "sensoroni:"\
-		"  node_description: '${NODE_DESCRIPTION//\'/''}'"\
-        "  " >> $PILLARFILE
+	"  node_description: '${NODE_DESCRIPTION//\'/''}'"\
+    "  " >> $PILLARFILE
 }	
 
 # Sensor settings for the minion pillar
@@ -206,15 +206,25 @@ function add_sensor_to_minion() {
 	echo "  interface: '$INTERFACE'" >> $PILLARFILE
 	echo "  mtu: 9000" >> $PILLARFILE
 	echo "zeek:" >> $PILLARFILE
-	echo "    config:" >> $PILLARFILE
-	echo "        node:" >> $PILLARFILE
-	echo "            lb_procs: '$CORECOUNT'" >> $PILLARFILE
+	echo "  enabled: True" >> $PILLARFILE
+	echo "  config:" >> $PILLARFILE
+	echo "    node:" >> $PILLARFILE
+	echo "      lb_procs: '$CORECOUNT'" >> $PILLARFILE
 	echo "suricata:" >> $PILLARFILE
-	echo "    config:" >> $PILLARFILE
-	echo "        af-packet:" >> $PILLARFILE
-	echo "            threads: '$CORECOUNT'" >> $PILLARFILE
-#	echo "pcap:" >> $PILLARFILE
-#	echo "    enabled: True" >> $PILLARFILE
+	echo "  config:" >> $PILLARFILE
+	echo "    af-packet:" >> $PILLARFILE
+	echo "      threads: '$CORECOUNT'" >> $PILLARFILE
+	echo "pcap:" >> $PILLARFILE
+	echo "    enabled: True" >> $PILLARFILE
+	echo "  " >> $PILLARFILE
+}
+
+# Add basic host info to the minion file
+function add_playbook_to_minion() {
+    printf '%s\n'\
+    "playbook:"\
+    "  enabled: True"\
+	"  " >> $PILLARFILE
 }
 
 function create_fleet_policy() {
@@ -293,11 +303,13 @@ function createHEAVYNODE() {
 function createMANAGER() {
 	add_elastic_to_minion
 	add_logstash_to_minion
+	add_playbook_to_minion
 }
 
 function createMANAGERSEARCH() {
 	add_elastic_to_minion
 	add_logstash_to_minion
+	add_playbook_to_minion
 }
 
 function createSENSOR() {
@@ -315,6 +327,7 @@ function createSTANDALONE() {
 	add_elastic_to_minion
 	add_logstash_to_minion
 	add_sensor_to_minion
+	add_playbook_to_minion
 }
 
 function testConnection() {
diff --git a/salt/pcap/defaults.yaml b/salt/pcap/defaults.yaml
index 5c9b141b4..62c60e118 100644
--- a/salt/pcap/defaults.yaml
+++ b/salt/pcap/defaults.yaml
@@ -1,5 +1,5 @@
 pcap:
-  enabled: True
+  enabled: False
   config:
     maxdirectoryfiles: 30000
     diskfreepercentage: 10
diff --git a/salt/zeek/defaults.yaml b/salt/zeek/defaults.yaml
index 34ee40a8d..ca3168b8b 100644
--- a/salt/zeek/defaults.yaml
+++ b/salt/zeek/defaults.yaml
@@ -1,5 +1,5 @@
 zeek:
-  enabled: True
+  enabled: False
   config:
     node:
       lb_procs: 0