diff --git a/roles/raspberry_pi/templates/zigbee2mqtt/docker-compose.yml.j2 b/roles/raspberry_pi/templates/zigbee2mqtt/docker-compose.yml.j2
new file mode 100644
index 0000000..944470a
--- /dev/null
+++ b/roles/raspberry_pi/templates/zigbee2mqtt/docker-compose.yml.j2
@@ -0,0 +1,36 @@
+name: zigbee2mqtt
+services:
+  mosquitto:
+    image: eclipse-mosquitto:{{ raspberry_pi_mosquitto_version }}
+    container_name: mosquitto
+    restart: unless-stopped
+    ports:
+      - 1883:1883
+    volumes:
+      - {{ raspberry_pi_mosquitto_config_dir }}/mosquitto.conf:/mosquitto/config/mosquitto.conf:ro
+      - {{ raspberry_pi_mosquitto_config_dir }}/data:/mosquitto/data
+      - {{ raspberry_pi_mosquitto_config_dir }}/log:/mosquitto/log
+
+  zigbee2mqtt:
+    image: koenkk/zigbee2mqtt:{{ raspberry_pi_z2m_version }}
+    container_name: zigbee2mqtt
+    restart: unless-stopped
+    depends_on:
+      - mosquitto
+    ports:
+      - 8080:8080
+    volumes:
+      - {{ raspberry_pi_z2m_config_dir }}/data:/app/data
+      - {{ raspberry_pi_z2m_config_dir }}/configuration.yaml:/app/data/configuration.yaml
+      - /run/udev:/run/udev:ro
+    devices:
+      - /dev/ttyUSB0:/dev/ttyUSB0
+    environment:
+      - TZ=Europe/Berlin
+    group_add:
+      - dialout
+
+networks:
+  default:
+    driver: bridge
+    name: zigbee2mqtt
diff --git a/roles/raspberry_pi/templates/zigbee2mqtt/mosquitto.conf.j2 b/roles/raspberry_pi/templates/zigbee2mqtt/mosquitto.conf.j2
new file mode 100644
index 0000000..e5720ec
--- /dev/null
+++ b/roles/raspberry_pi/templates/zigbee2mqtt/mosquitto.conf.j2
@@ -0,0 +1,5 @@
+listener 1883
+persistence true
+persistence_location /mosquitto/data/
+log_dest file /mosquitto/log/mosquitto.log
+allow_anonymous true
diff --git a/roles/raspberry_pi/templates/zigbee2mqtt/z2m-configuration.yaml.j2 b/roles/raspberry_pi/templates/zigbee2mqtt/z2m-configuration.yaml.j2
new file mode 100644
index 0000000..46cfd64
--- /dev/null
+++ b/roles/raspberry_pi/templates/zigbee2mqtt/z2m-configuration.yaml.j2
@@ -0,0 +1,16 @@
+homeassistant:
+  enabled: true
+
+mqtt:
+  server: mqtt://mosquitto:1883
+
+serial:
+  port: /dev/serial/by-id/usb-SONOFF_SONOFF_Dongle_Lite_MG21_0263f93f46a2ef11b078926661ce3355-if00-port0
+
+advanced:
+  network_key: {{ vault_raspberry_pi.zigbee2mqtt.network_key }}
+  log_level: info
+
+frontend:
+  enabled: true
+  port: 8080