diff --git a/docker-compose.yml b/docker-compose.yml
index 152213f..4acc7d6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,7 +16,7 @@ services:
     env_file:
       - .env
     environment:
-      - HOSTNAME=${HOSTNAME}
+      - DOCKER_HOST=${HOSTNAME}
     volumes:
       - ./promtail:/etc/promtail
       - /var/run/docker.sock:/var/run/docker.sock
diff --git a/promtail/promtail-config.yml b/promtail/promtail-config.yml
index ed3ff15..a16c988 100644
--- a/promtail/promtail-config.yml
+++ b/promtail/promtail-config.yml
@@ -20,7 +20,7 @@ scrape_configs:
       - source_labels: ['__meta_docker_container_log_stream']
         target_label: 'logstream'
       - target_label: 'host'
-        replacement: '${HOSTNAME}'
+        replacement: '${DOCKER_HOST}'
     pipeline_stages:
       - match:
           selector: '{container="appdaemon"}'
@@ -31,3 +31,11 @@ scrape_configs:
                 level:
                 app:
                 msg:
+      - match:
+          selector: '{container="zigbee2mqtt"} |= "MQTT publish"'
+          stages:
+            - regex:
+                expression: "topic '(?P<topic>zigbee2mqtt\/(?P<device>[^\/]+).*?)', payload '(?P<payload>.*?)'$"
+            - labels:
+                topic:
+                device: