diff --git a/.gitignore b/.gitignore
index c64d1e2..7bdca3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -160,7 +160,11 @@ cython_debug/
 #.idea/
 
 log/
-state.json
+
 pwfile
 .env
-data/
\ No newline at end of file
+data/
+
+state.json
+database.db
+coordinator_backup.json
\ No newline at end of file
diff --git a/README.md b/README.md
index c2b00b6..24ca4f9 100644
--- a/README.md
+++ b/README.md
@@ -3,4 +3,9 @@ Zigbee smarthome stack
 
 ## Mosquitto
 
+```shell
+docker compose up -d mqtt
+docker compose exec -it mqtt mosquitto_passwd -c /mosquitto/config/pwfile homeassistant
+```
+
 ### [Docker Image](https://hub.docker.com/_/eclipse-mosquitto)
\ No newline at end of file
diff --git a/clear_data.sh b/clear_data.sh
new file mode 100755
index 0000000..2fb9279
--- /dev/null
+++ b/clear_data.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+
+SCRIPT_DIR=$(readlink -f $(dirname "${BASH_SOURCE[0]}"))
+
+rm -rf $SCRIPT_DIR/mosquitto/data/mosquitto.db $SCRIPT_DIR/zigbee2mqtt/log/* $SCRIPT_DIR/zigbee2mqtt/database.db $SCRIPT_DIR/zigbee2mqtt/*.json
\ No newline at end of file
diff --git a/clear_logs.sh b/clear_logs.sh
deleted file mode 100755
index 94d6479..0000000
--- a/clear_logs.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-SCRIPT_DIR=$(readlink -f $(dirname "${BASH_SOURCE[0]}"))
-rm -rf $SCRIPT_DIR/zigbee2mqtt/log/*
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index fdcae44..d96295b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,22 +5,27 @@ services:
     image: eclipse-mosquitto
     restart: unless-stopped
     volumes:
-      - ./mosquitto/config:/mosquitto/config
-      - ./mosquitto/data/:/mosquitto/data/
+      - /etc/localtime:/etc/localtime:ro
+      - /etc/timezone:/etc/timezone:ro
+      - ./mosquitto:/mosquitto
     healthcheck:
       test: ["CMD", "mosquitto_sub", "-t", "$$SYS/#", "-C", "1", "-i", "healthcheck", "-W", "3"]
-      interval: 30s
+      start_period: 15s
+      start_interval: 1s
+      interval: 5s
       timeout: 10s
       retries: 5
-      start_period: 5s
 
   z2m:
     container_name: zigbee2mqtt
     image: koenkk/zigbee2mqtt
     restart: unless-stopped
     depends_on:
-      - mqtt
+      mqtt:
+        condition: service_healthy
     volumes:
+      - /etc/localtime:/etc/localtime:ro
+      - /etc/timezone:/etc/timezone:ro
       - ./zigbee2mqtt:/app/data
       - /run/udev:/run/udev:ro
     ports: