diff --git a/kibana/config/kibana.yml b/kibana/config/kibana.yml
index 8901be3..dc22eb4 100644
--- a/kibana/config/kibana.yml
+++ b/kibana/config/kibana.yml
@@ -4,7 +4,7 @@
 #
 server.name: kibana
 server.host: 0.0.0.0
-elasticsearch.hosts: [ 'http://elasticsearch:9200' ]
+elasticsearch.hosts: [ http://elasticsearch:9200 ]
 monitoring.ui.container.elasticsearch.enabled: true
 
 ## X-Pack security credentials
@@ -15,8 +15,15 @@ elasticsearch.password: ${KIBANA_SYSTEM_PASSWORD}
 ## Fleet
 ## https://www.elastic.co/guide/en/kibana/current/fleet-settings-kb.html
 #
-xpack.fleet.agents.fleet_server.hosts: [ 'http://fleet-server:8220' ]
-xpack.fleet.agents.elasticsearch.hosts: [ 'http://elasticsearch:9200' ]
+xpack.fleet.agents.fleet_server.hosts: [ http://fleet-server:8220 ]
+
+xpack.fleet.outputs:
+  - id: fleet-default-output
+    name: default
+    type: elasticsearch
+    hosts: [ http://elasticsearch:9200 ]
+    is_default: true
+    is_default_monitoring: true
 
 xpack.fleet.packages:
   - name: fleet_server