diff --git a/docker/mqtt/mosquitto/docker-compose.yaml b/docker/mqtt/mosquitto/docker-compose.yaml
new file mode 100644
index 0000000..fb11dec
--- /dev/null
+++ b/docker/mqtt/mosquitto/docker-compose.yaml
@@ -0,0 +1,33 @@
+version: "3"
+
+volumes:
+  mosquitto_data: {}
+  mosquitto_log: {}
+
+services:
+  mosquitto:
+    container_name: mosquitto
+    image: eclipse-mosquitto:latest
+    volumes:
+      - ./mosquitto/mosquitto.conf:/mosquitto/config/mosquitto.conf
+      - ./mosquitto/passwd:/etc/mosquitto/passwd
+      - mosquitto_data:/mosquitto/data
+      - mosquitto_log:/mosquitto/log
+    ports:
+      - "1883:1883"
+      - "9001:9001"
+    restart: always
+
+  zigbee2mqtt:
+    container_name: zigbee2mqtt
+    image: koenkk/zigbee2mqtt
+    volumes:
+      - ./data:/app/data
+      - /run/udev:/run/udev:ro
+    devices:
+      - /dev/ttyACM2:/dev/ttyACM2
+    restart: always
+    network_mode: host
+    privileged: true
+    environment:
+      - TZ=Europe/Sofia
diff --git a/docker/mosquitto/mosquitto.conf b/docker/mqtt/mosquitto/mosquitto.conf
similarity index 100%
rename from docker/mosquitto/mosquitto.conf
rename to docker/mqtt/mosquitto/mosquitto.conf