diff --git a/extensions/filebeat/config/filebeat.yml b/extensions/filebeat/config/filebeat.yml
index e5095d5..c3772da 100644
--- a/extensions/filebeat/config/filebeat.yml
+++ b/extensions/filebeat/config/filebeat.yml
@@ -2,6 +2,8 @@
 ## https://github.com/elastic/beats/blob/main/deploy/docker/filebeat.docker.yml
 #
 
+name: filebeat
+
 filebeat.config:
   modules:
     path: ${path.config}/modules.d/*.yml
@@ -17,6 +19,9 @@ filebeat.autodiscover:
 processors:
   - add_cloud_metadata: ~
 
+monitoring:
+  enabled: true
+
 output.elasticsearch:
   hosts: [ http://elasticsearch:9200 ]
   username: elastic
@@ -26,5 +31,6 @@ output.elasticsearch:
 ## https://www.elastic.co/guide/en/beats/filebeat/current/http-endpoint.html
 #
 
-http.enabled: true
-http.host: 0.0.0.0
+http:
+  enabled: true
+  host: 0.0.0.0
diff --git a/extensions/heartbeat/config/heartbeat.yml b/extensions/heartbeat/config/heartbeat.yml
index 1d700a6..911ed25 100644
--- a/extensions/heartbeat/config/heartbeat.yml
+++ b/extensions/heartbeat/config/heartbeat.yml
@@ -2,6 +2,8 @@
 ## https://github.com/elastic/beats/blob/main/deploy/docker/heartbeat.docker.yml
 #
 
+name: heartbeat
+
 heartbeat.monitors:
 - type: http
   schedule: '@every 5s'
@@ -18,6 +20,9 @@ heartbeat.monitors:
 processors:
 - add_cloud_metadata: ~
 
+monitoring:
+  enabled: true
+
 output.elasticsearch:
   hosts: [ http://elasticsearch:9200 ]
   username: elastic
@@ -27,5 +32,6 @@ output.elasticsearch:
 ## https://www.elastic.co/guide/en/beats/heartbeat/current/http-endpoint.html
 #
 
-http.enabled: true
-http.host: 0.0.0.0
+http:
+  enabled: true
+  host: 0.0.0.0
diff --git a/extensions/metricbeat/config/metricbeat.yml b/extensions/metricbeat/config/metricbeat.yml
index 48824d7..14606c5 100644
--- a/extensions/metricbeat/config/metricbeat.yml
+++ b/extensions/metricbeat/config/metricbeat.yml
@@ -2,6 +2,8 @@
 ## https://github.com/elastic/beats/blob/main/deploy/docker/metricbeat.docker.yml
 #
 
+name: metricbeat
+
 metricbeat.config:
   modules:
     path: ${path.config}/modules.d/*.yml
@@ -47,6 +49,9 @@ metricbeat.modules:
 processors:
   - add_cloud_metadata: ~
 
+monitoring:
+  enabled: true
+
 output.elasticsearch:
   hosts: [ http://elasticsearch:9200 ]
   username: elastic
@@ -56,5 +61,6 @@ output.elasticsearch:
 ## https://www.elastic.co/guide/en/beats/metricbeat/current/http-endpoint.html
 #
 
-http.enabled: true
-http.host: 0.0.0.0
+http:
+  enabled: true
+  host: 0.0.0.0