diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 577f2800af5..d835cdb814e 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -109,6 +109,8 @@ https://github.com/elastic/beats/compare/v6.4.0...6.x[Check the HEAD diff]
 - Added the `add_process_metadata` processor to enrich events with process information. {pull}6789[6789]
 - Add Beats Central Management {pull}8559[8559]
 - Report configured queue type. {pull}8091[8091]
+- Allow Bus to buffer events in case listeners are not configured. {pull}8527[8527]
+- Enable `host` and `cloud` metadata processors by default. {pull}8596[8596]
 
 *Auditbeat*
 
diff --git a/auditbeat/auditbeat.yml b/auditbeat/auditbeat.yml
index a3749aa2af0..24edf920051 100644
--- a/auditbeat/auditbeat.yml
+++ b/auditbeat/auditbeat.yml
@@ -142,6 +142,14 @@ output.elasticsearch:
   # Client Certificate Key
   #ssl.key: "/etc/pki/client/cert.key"
 
+#================================ Procesors =====================================
+
+# Configure processors to enhance or manipulate events generated by the beat.
+
+processors:
+  - add_host_metadata: ~
+  - add_cloud_metadata: ~
+
 #================================ Logging =====================================
 
 # Sets log level. The default log level is info.
diff --git a/filebeat/filebeat.yml b/filebeat/filebeat.yml
index 52888b19ea5..15ce2d44494 100644
--- a/filebeat/filebeat.yml
+++ b/filebeat/filebeat.yml
@@ -169,6 +169,14 @@ output.elasticsearch:
   # Client Certificate Key
   #ssl.key: "/etc/pki/client/cert.key"
 
+#================================ Procesors =====================================
+
+# Configure processors to enhance or manipulate events generated by the beat.
+
+processors:
+  - add_host_metadata: ~
+  - add_cloud_metadata: ~
+
 #================================ Logging =====================================
 
 # Sets log level. The default log level is info.
diff --git a/heartbeat/heartbeat.yml b/heartbeat/heartbeat.yml
index 044616ad816..2d881a7db82 100644
--- a/heartbeat/heartbeat.yml
+++ b/heartbeat/heartbeat.yml
@@ -116,6 +116,14 @@ output.elasticsearch:
   # Client Certificate Key
   #ssl.key: "/etc/pki/client/cert.key"
 
+#================================ Procesors =====================================
+
+# Configure processors to enhance or manipulate events generated by the beat.
+
+processors:
+  - add_host_metadata: ~
+  - add_cloud_metadata: ~
+
 #================================ Logging =====================================
 
 # Sets log level. The default log level is info.
diff --git a/libbeat/_meta/config.yml b/libbeat/_meta/config.yml
index 6f460928bac..0db1fd3a290 100644
--- a/libbeat/_meta/config.yml
+++ b/libbeat/_meta/config.yml
@@ -86,6 +86,14 @@ output.elasticsearch:
   # Client Certificate Key
   #ssl.key: "/etc/pki/client/cert.key"
 
+#================================ Procesors =====================================
+
+# Configure processors to enhance or manipulate events generated by the beat.
+
+processors:
+  - add_host_metadata: ~
+  - add_cloud_metadata: ~
+
 #================================ Logging =====================================
 
 # Sets log level. The default log level is info.
diff --git a/metricbeat/metricbeat.yml b/metricbeat/metricbeat.yml
index 5bb313ded91..259092c66df 100644
--- a/metricbeat/metricbeat.yml
+++ b/metricbeat/metricbeat.yml
@@ -113,6 +113,14 @@ output.elasticsearch:
   # Client Certificate Key
   #ssl.key: "/etc/pki/client/cert.key"
 
+#================================ Procesors =====================================
+
+# Configure processors to enhance or manipulate events generated by the beat.
+
+processors:
+  - add_host_metadata: ~
+  - add_cloud_metadata: ~
+
 #================================ Logging =====================================
 
 # Sets log level. The default log level is info.
diff --git a/packetbeat/packetbeat.yml b/packetbeat/packetbeat.yml
index 5bdaa0f6911..e27356624a2 100644
--- a/packetbeat/packetbeat.yml
+++ b/packetbeat/packetbeat.yml
@@ -196,6 +196,14 @@ output.elasticsearch:
   # Client Certificate Key
   #ssl.key: "/etc/pki/client/cert.key"
 
+#================================ Procesors =====================================
+
+# Configure processors to enhance or manipulate events generated by the beat.
+
+processors:
+  - add_host_metadata: ~
+  - add_cloud_metadata: ~
+
 #================================ Logging =====================================
 
 # Sets log level. The default log level is info.
diff --git a/winlogbeat/winlogbeat.yml b/winlogbeat/winlogbeat.yml
index d711c7f10db..361c13f87e0 100644
--- a/winlogbeat/winlogbeat.yml
+++ b/winlogbeat/winlogbeat.yml
@@ -117,6 +117,14 @@ output.elasticsearch:
   # Client Certificate Key
   #ssl.key: "/etc/pki/client/cert.key"
 
+#================================ Procesors =====================================
+
+# Configure processors to enhance or manipulate events generated by the beat.
+
+processors:
+  - add_host_metadata: ~
+  - add_cloud_metadata: ~
+
 #================================ Logging =====================================
 
 # Sets log level. The default log level is info.