diff --git a/docker-compose.yaml b/docker-compose.yaml
index a7e2658..f011195 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -113,47 +113,52 @@ services:
       traefik.http.routers.grafana.tls.certResolver: le
 
   influx:
-    image: influxdb:1.8
+    image: influxdb:2.0
     restart: always
-    volumes:
-      - ./influx:/var/lib/influxdb
-      - /etc/timezone:/etc/timezone
-    # Only needed during initial setup
-#   environment:
-#     INFLUXDB_DB: hass
-#     INFLUXDB_USER: hass
-#     INFLUXDB_USER_PASSWORD: hass
-
-
-# Devices
-  deconz:
-    image: marthoc/deconz:amd64-2.05.77
-    restart: always
-    devices:
-      - /dev/conbee:/dev/ttyUSB0
-    volumes:
-      - ./deconz:/root/.local/share/dresden-elektronik/deCONZ
-      - ./deconz-otau:/root/otau
-      - /etc/timezone:/etc/timezone
     networks:
-      web:
       default:
-    environment:
-      DECONZ_VNC_MODE: 1
-      DECONZ_VNC_PASSWORD: secret
-      DEBUG_OTAU: 1
-      DECONZ_WEB_PORT: 8081
-    ports:
-      - 8081:8081
+      web:
+    volumes:
+      - /etc/timezone:/etc/timezone
+      # - ./influx:/var/lib/influxdb
+      - ./influx2:/var/lib/influxdb2
+    # environment:
+        # Only needed if upgrading from influx 1
+    #   DOCKER_INFLUXDB_INIT_MODE: upgrade
+        # Only needed for initial setup
+    #   DOCKER_INFLUXDB_INIT_USERNAME: hass
+    #   DOCKER_INFLUXDB_INIT_PASSWORD: hasspassword
+    #   DOCKER_INFLUXDB_INIT_ORG: hass
+    #   DOCKER_INFLUXDB_INIT_BUCKET: hass
     labels:
       traefik.enable: true
       traefik.docker.network: web
-      traefik.http.services.deconz.loadbalancer.server.port: 8081
-      traefik.http.routers.deconz.rule: HOST(`deconz.${HASS_ROOT}`)
-      traefik.http.routers.deconz.middlewares: auth@file
-      traefik.http.routers.deconz.tls.certResolver: le
-    healthcheck:
-      test: curl http://localhost:5900 || exit 1
+      traefik.http.routers.influx.rule: HOST(`influx.${HASS_ROOT}`)
+      traefik.http.routers.influx.middlewares: auth@file
+      traefik.http.routers.influx.tls.certResolver: le
+
+
+# Devices
+  z2m:
+    image: koenkk/zigbee2mqtt:latest
+    restart: unless-stopped
+    networks:
+      web:
+      default:
+    devices:
+      - /dev/zzh:/dev/ttyUSB0
+    volumes:
+      - ./z2m:/app/data
+      - /etc/timezone:/etc/timezone
+    environment:
+      TZ: Europe/Stockholm
+    labels:
+      traefik.enable: true
+      traefik.docker.network: web
+      traefik.http.services.z2m.loadbalancer.server.port: 8080
+      traefik.http.routers.z2m.rule: HOST(`z2m.${HASS_ROOT}`)
+      traefik.http.routers.z2m.middlewares: auth@file
+      traefik.http.routers.z2m.tls.certResolver: le
 
 # mysensors:
 # rflink:
@@ -176,3 +181,5 @@ services:
       - /dev/gsmmodem:/dev/mobile
     healthcheck:
       test: ["CMD", "wget", "-O", "-", "localhost:5000/signal"]
+    labels:
+      autoheal: "true"