diff --git a/docker-compose.yml b/docker-compose.yml
index 440b6c3..fdcae44 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,14 +5,14 @@ services:
     image: eclipse-mosquitto
     restart: unless-stopped
     volumes:
-      - ./mosquitto/moquitto.conf:/mosquitto/config/mosquitto.conf
-    user: 1883:1883
+      - ./mosquitto/config:/mosquitto/config
+      - ./mosquitto/data/:/mosquitto/data/
     healthcheck:
       test: ["CMD", "mosquitto_sub", "-t", "$$SYS/#", "-C", "1", "-i", "healthcheck", "-W", "3"]
       interval: 30s
       timeout: 10s
       retries: 5
-      start_period: 10s
+      start_period: 5s
 
   z2m:
     container_name: zigbee2mqtt
diff --git a/mosquitto/moquitto.conf b/mosquitto/config/mosquitto.conf
similarity index 74%
rename from mosquitto/moquitto.conf
rename to mosquitto/config/mosquitto.conf
index 8ab991b..4ced6d7 100644
--- a/mosquitto/moquitto.conf
+++ b/mosquitto/config/mosquitto.conf
@@ -5,3 +5,4 @@ allow_anonymous true
 listener 1880 127.0.0.1
 
 persistence true
+persistence_location /mosquitto/data/
\ No newline at end of file
diff --git a/mosquitto/data/.gitkeep b/mosquitto/data/.gitkeep
new file mode 100644
index 0000000..e69de29