diff --git a/config/mosquitto/mosquitto.conf b/config/mosquitto/mosquitto.conf
new file mode 100644
index 0000000..376696e
--- /dev/null
+++ b/config/mosquitto/mosquitto.conf
@@ -0,0 +1,7 @@
+listener 1883
+allow_anonymous true
+persistence true
+persistence_location /mosquitto/data/
+log_dest file /mosquitto/log/mosquitto.log
+log_dest stdout
+log_type all
diff --git a/config/zigbee2mqtt/configuration.yaml b/config/zigbee2mqtt/configuration.yaml
new file mode 100644
index 0000000..94c597c
--- /dev/null
+++ b/config/zigbee2mqtt/configuration.yaml
@@ -0,0 +1,35 @@
+homeassistant:
+  enabled: true
+mqtt:
+  base_topic: zigbee2mqtt
+  server: mqtt://mosquitto:1883
+serial:
+  port: /dev/ttyUSB0
+  adapter: zstack
+  baudrate: 115200
+advanced:
+  log_level: info
+  network_key:
+    - 238
+    - 209
+    - 133
+    - 184
+    - 129
+    - 11
+    - 248
+    - 203
+    - 168
+    - 170
+    - 235
+    - 78
+    - 181
+    - 189
+    - 134
+    - 225
+  pan_id: 13533
+  channel: 11
+frontend:
+  enabled: true
+  port: 8080
+  host: 0.0.0.0
+version: 4
diff --git a/docker-compose.yml b/docker-compose.yml
index 1c85f39..ba0db6e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,6 +8,51 @@ services:
       - bot_token
     restart: unless-stopped
 
+  mosquitto:
+    image: eclipse-mosquitto:latest
+    container_name: mosquitto
+    restart: unless-stopped
+    ports:
+      - "1883:1883"
+      - "9001:9001"
+    volumes:
+      - ./config/mosquitto:/mosquitto/config:ro
+      - /var/lib/z420/mosquitto/data:/mosquitto/data
+      - /var/lib/z420/mosquitto/log:/mosquitto/log
+    user: "1883:1883"
+    
+  zigbee2mqtt:
+    image: koenkk/zigbee2mqtt:latest
+    container_name: zigbee2mqtt
+    restart: unless-stopped
+    volumes:
+      - /var/lib/z420/zigbee2mqtt:/app/data
+      - ./config/zigbee2mqtt/configuration.yaml:/app/data/configuration.yaml
+      - /run/udev:/run/udev:ro
+    devices:
+      - /dev/serial/by-id/usb-1a86_USB_Serial-if00-port0:/dev/ttyUSB0
+    environment:
+      - TZ=Europe/Helsinki
+    ports:
+      - "8081:8080"
+    depends_on:
+      - mosquitto
+    group_add:
+      - dialout
+    user: "1000:1000"
+
+  homeassistant:
+    image: ghcr.io/home-assistant/home-assistant:stable
+    container_name: homeassistant
+    restart: unless-stopped
+    network_mode: host
+    volumes:
+      - /var/lib/z420/homeassist:/config
+      - /etc/localtime:/etc/localtime:ro
+    privileged: true
+    environment:
+      - TZ=Europe/Helsinki
+
 secrets:
   bot_token:
     file: ./secrets/bot_token.txt
\ No newline at end of file