diff --git a/docker-compose.yml b/docker-compose.yml
index 90f0c49..440b6c3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,6 +6,13 @@ services:
     restart: unless-stopped
     volumes:
       - ./mosquitto/moquitto.conf:/mosquitto/config/mosquitto.conf
+    user: 1883:1883
+    healthcheck:
+      test: ["CMD", "mosquitto_sub", "-t", "$$SYS/#", "-C", "1", "-i", "healthcheck", "-W", "3"]
+      interval: 30s
+      timeout: 10s
+      retries: 5
+      start_period: 10s
 
   z2m:
     container_name: zigbee2mqtt
diff --git a/mosquitto/moquitto.conf b/mosquitto/moquitto.conf
index 2f5d23f..8ab991b 100644
--- a/mosquitto/moquitto.conf
+++ b/mosquitto/moquitto.conf
@@ -1,2 +1,7 @@
+allow_anonymous false
+listener 1883 0.0.0.0
+
 allow_anonymous true
-listener 1883 0.0.0.0
\ No newline at end of file
+listener 1880 127.0.0.1
+
+persistence true