diff --git a/docker-compose.yml b/docker-compose.yml
index 7d082c3..0005cda 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,117 +2,21 @@ version: '3'
 
 services:
 
-  milvert-nginx:
-    container_name: milvert-nginx
-    image: nginx:latest
-    restart: always
-    networks:
-      - backend
-    labels:
-      - "traefik.enable=true"
-
-        #HTTPS
-      - "traefik.http.routers.milvert-secure.entrypoints=web-secure"
-      - "traefik.http.routers.milvert-secure.rule=Host(`www.${DOMAIN}`, `${DOMAIN}`)"
-      - "traefik.http.routers.milvert-secure.priority=1"
-        # SSL
-      - "traefik.http.routers.milvert-secure.tls.certresolver=milvert"
-      - "traefik.http.routers.milvert-secure.tls=true"
-
-
-    volumes:
-      - "${DIR}/milvert-nginx/conf:/etc/nginx/conf.d"
-      - "${DIR}/milvert-nginx/html:/html"
-
-
-
   zigbee2mqtt:
     container_name: zigbee2mqtt
     networks:
       - backend
-    image: koenkk/zigbee2mqtt:1.8.0
+    image: koenkk/zigbee2mqtt
     volumes:
       - ${DIR}/zigbee2matt:/app/data
     devices:
-      - /dev/ttyACM-zigbee:/dev/ttyACM0
+      - /dev/ttyUSB0:/dev/ttyACM0
     restart: always
     environment:
       - TZ=Europe/Stockholm
 
-  grafana:
-    image: grafana/grafana:6.4.2
-    container_name: grafana
-    networks:
-      - backend
-    volumes:
-      # Data persistency
-      # sudo mkdir -p /srv/docker/grafana/data; chown 472:472 /srv/docker/grafana/data
-      - "${DIR}/grafana:/var/lib/grafana"
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.grafana.rule=Host(`grafana.${DOMAIN}`)"
-      - "traefik.http.routers.grafana.entrypoints=web"
-      - "traefik.http.services.grafana-service.loadbalancer.server.port=3000"
-
-  influx:
-    image: influxdb:1.7
-    container_name: influxdb
-    networks:
-      - backend
-    labels:
-      - "traefik.http.routers.influx.entryPoints=port8086"
-      - "traefik.http.routers.influx.rule=host(`influx.${DOMAIN}`)"
-      - "traefik.http.services.influx-service.loadBalancer.server.port=8086"
-    restart: always
-    volumes:
-      - ${DIR}/influx-data:/var/lib/influxdb
-    environment:
-      - INFLUXDB_DB=SOME_DB_NAME # set any other to create database on initialization
-      - INFLUXDB_HTTP_ENABLED=true
-      - INFLUXDB_HTTP_AUTH_ENABLED=true
-
-      - INFLUXDB_ADMIN_USER=SECURE_USERNAME
-      - INFLUXDB_ADMIN_PASSWORD=SECURE_PASS
-
-  gitea:
-    image: gitea/gitea:1.9.3
-    container_name: gitea
-    networks:
-      - backend
-    restart: always
-    environment:
-      - USER_UID=1001
-      - USER_GID=1005
-    volumes:
-      #- /var/lib/gitea:/data
-      - ${DIR}/gitea:/data
-      - /home/git/.ssh:/data/git/.ssh
-      - /etc/timezone:/etc/timezone:ro
-      - /etc/localtime:/etc/localtime:ro
-    ports:
-      - "127.0.0.1:2222:22"
-      - "3000:3000"
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.services.gitea-service.loadbalancer.server.port=3000"
-      - "traefik.http.routers.gitea-secure.entrypoints=web-secure"
-      - "traefik.http.routers.gitea-secure.rule=Host(`gitea.${DOMAIN}`)"
-      - "traefik.http.routers.gitea-secure.tls.certresolver=milvert"
-
-
-  whoami:
-    # A container that exposes an API to show its IP address
-    image: containous/whoami
-    networks:
-      - backend
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.whoami-secure.entrypoints=web-secure"
-      - "traefik.http.routers.whoami-secure.rule=Host(`whoami.${DOMAIN}`)"
-      - "traefik.http.routers.whoami-secure.tls.certresolver=milvert"
-
   mqtt:
-    image: eclipse-mosquitto:1.6.8
+    image: eclipse-mosquitto
     container_name: mqtt
     networks:
       - frontend
@@ -122,9 +26,10 @@ services:
       - "1883:1883"
       - "9001:9001"
     volumes:
-      - ./mosquitto/mosquitto.conf:/mosquitto/config/mosquitto.conf
-      - ${DIR}/mosquitto/data:/mosquitto/data
-      - ${DIR}/mosquitto/log:/mosquitto/log
+      - ./mosquitto/mosquitto.conf:/mqtt/mosquitto.conf
+      - ${DIR}/mqtt/data:/mqtt/data
+      - ${DIR}/mqtt/log:/mqtt/log
+
     labels:
       - "traefik.http.routers.mqtt.rule=Host(`mqtt.${DOMAIN}`)"
       - "traefik.http.routers.mqtt.entrypoints=mqtt"
@@ -155,33 +60,11 @@ services:
       - "traefik.http.routers.node-red-secure.tls.certresolver=milvert"
       - "traefik.enable=true"
 
-  domoticz:
-    image: linuxserver/domoticz
-    container_name: domoticz
-    networks:
-      - backend
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Europe/Stockholm
-        #- WEBROOT=domoticz #optional
-    volumes:
-      - ${DIR}/domoticz:/config
-    ports:
-      - 8081:8080
-        #devices:
-        #- path to device:path to device
-    restart: unless-stopped
-    labels:
-      - "traefik.http.routers.domo.rule=Host(`domo.${DOMAIN}`)"
-      - "traefik.http.routers.domo.entrypoints=web"
-      - "traefik.http.services.domo-service.loadbalancer.server.port=8080"
-      - "traefik.enable=true"
 
 
   reverse-proxy:
     # The official v2.0 Traefik docker image
-    image: traefik:v2.1
+    image: traefik
     container_name: "traefik"
     networks:
       - backend
diff --git a/zigbee2mqtt/configuration.yaml b/zigbee2mqtt/configuration.yaml
index 59763b3..458d7ca 100644
--- a/zigbee2mqtt/configuration.yaml
+++ b/zigbee2mqtt/configuration.yaml
@@ -7,83 +7,3 @@ advanced:
   log_level: debug
 serial:
   port: /dev/ttyACM0
-devices:
-  '0xd0cf5efffef137e6':
-    friendly_name: '0xd0cf5efffef137e6'
-    retain: false
-  '0xd0cf5efffeffa12e':
-    friendly_name: '0xd0cf5efffeffa12e'
-    retain: false
-  '0x0017880106fca5e2':
-    friendly_name: Philips Lily 1
-    retain: false
-  '0x90fd9ffffe6e8fe2':
-    friendly_name: Arbetsrum gullampa
-    retain: false
-  '0x0017880106fc9e16':
-    friendly_name: Philips Lily 2
-    retain: false
-  '0x0017880106241299':
-    friendly_name: Philips Lily 3
-    retain: false
-  '0x001788010452ec91':
-    friendly_name: Philips Lily 4
-    retain: false
-  '0x000d6ffffe61e2f8':
-    friendly_name: '0x000d6ffffe61e2f8'
-    retain: false
-  '0xccccccfffe4c4499':
-    friendly_name: dimmer_unconnect
-  '0x14b457fffe6d87e8':
-    friendly_name: Kök_Multidimmer
-  '0x086bd7fffe5a6240':
-    friendly_name: Kök 1
-  '0xd0cf5efffed8c794':
-    friendly_name: Kök 6
-  '0x14b457fffe71f90e':
-    friendly_name: Kök 2
-  '0x14b457fffe71ee40':
-    friendly_name: Kök 3
-  '0x086bd7fffe54c813':
-    friendly_name: Kök 4
-  '0x086bd7fffe3b7eaa':
-    friendly_name: Kök 5
-  '0x086bd7fffe5302b2':
-    friendly_name: Kök 7
-  '0x14b457fffe334c7c':
-    friendly_name: Matrum_tak
-  '0xccccccfffe344cb3':
-    friendly_name: Matrum_dimmer
-  '0x086bd7fffe05e8ad':
-    friendly_name: Julstjärna arum
-  '0xd0cf5efffed9d643':
-    friendly_name: Julstjärna 2
-  '0x086bd7fffe38fe88':
-    friendly_name: Julstjärna 3
-  '0x00178801045185ad':
-    friendly_name: Philips Lily 5
-groups:
-  '1':
-    friendly_name: Kök
-    retain: false
-    devices:
-      - '0x90fd9ffffe6e8fe2'
-      - '0x086bd7fffe5a6240'
-      - '0xd0cf5efffed8c794'
-      - '0x14b457fffe71f90e'
-      - '0x14b457fffe71ee40'
-      - '0x086bd7fffe54c813'
-      - '0x086bd7fffe3b7eaa'
-      - '0x086bd7fffe5302b2'
-  '2':
-    friendly_name: Matrum
-    retain: false
-    devices:
-      - '0x14b457fffe334c7c'
-  '57338':
-    friendly_name: Outdoor
-    retain: false
-    devices:
-      - '0x001788010452ec91'
-      - '0x0017880106241299'
-      - '0x0017880106fca5e2'