diff --git a/data/configuration.yaml b/data/configuration.yaml
index 83daf8739..3ed7c1ce0 100644
--- a/data/configuration.yaml
+++ b/data/configuration.yaml
@@ -1,15 +1,20 @@
+# Home Assistant integration (MQTT discovery)
 homeassistant: false
+
+# allow new devices to join
 permit_join: true
-frontend: true
+
+# MQTT settings
 mqtt:
+  # MQTT base topic for zigbee2mqtt MQTT messages
   base_topic: zigbee2mqtt
-  server: mqtt://localhost
+  # MQTT server URL
+  server: 'mqtt://localhost'
+  # MQTT server authentication, uncomment if required:
+  # user: my_user
+  # password: my_password
+
+# Serial settings
 serial:
-  port: COM7
-  adapter: deconz
-  adapter_delay: 200
-advanced:
-  log_level: debug
-devices:
-  '0x00124b00271f9834':
-    friendly_name: '0x00124b00271f9834'
+  # Location of CC2531 USB sniffer
+  port: /dev/ttyACM0