diff --git a/docker-compose.yml b/docker-compose.yml
index 495c0c9..66ab8c3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,90 +16,3 @@ services:
     environment:
       - TZ=Europe/Stockholm
 
-  mqtt:
-    image: eclipse-mosquitto
-    container_name: mqtt
-    networks:
-      - frontend
-      - backend
-    restart: always
-    ports:
-      - "1883:1883"
-      - "9001:9001"
-    volumes:
-      - ./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"
-      - "traefik.http.services.mqtt-service.loadbalancer.server.port=9001"
-      - "traefik.enable=true"
-
-  node-red:
-    image: nodered/node-red:latest
-    container_name: "node-red"
-    networks:
-      - backend
-    environment:
-      - TZ=Europe/Stockholm
-    ports:
-      - "1881:1880"
-    #devices:
-        #- /dev/ttyAMA0
-    restart: unless-stopped
-    user: ${UID}
-    volumes:
-      - ${DIR}/nodered:/data
-    labels:
-      - "traefik.http.routers.node-red.rule=Host(`nodered.${DOMAIN}`)"
-      - "traefik.http.routers.node-red.entrypoints=web"
-      - "traefik.http.services.node-red-service.loadbalancer.server.port=1880"
-      - "traefik.http.routers.node-red-secure.entrypoints=web-secure"
-      - "traefik.http.routers.node-red-secure.rule=Host(`nodered.${DOMAIN}`)"
-      - "traefik.http.routers.node-red-secure.tls.certresolver=milvert"
-      - "traefik.enable=true"
-
-
-
-  reverse-proxy:
-    # The official v2.0 Traefik docker image
-    image: traefik
-    container_name: "traefik"
-    networks:
-      - backend
-      - frontend
-    ports:
-      # The HTTP port
-      - "80:80"
-      - "443:443"
-      - "8080:8080"
-    volumes:
-      # So that Traefik can listen to the Docker events
-      - /var/run/docker.sock:/var/run/docker.sock
-      - ./traefik.yml:/etc/traefik/traefik.yml
-      - ./static_config.yml:/etc/traefik/static_config.yml
-        #      - "./log.json:/etc/traefik/log.json"
-        #- ./acme.json:/acme.json
-      - ./letsencrypt:/letsencrypt
-    dns:
-      - 8.8.8.8
-
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.traefik.rule=Host(`tra.${DOMAIN}`)"
-      - "traefik.http.routers.traefik-secure.entrypoints=web-secure"
-      - "traefik.http.routers.traefik-secure.rule=Host(`tra.${DOMAIN}`)"
-      - "traefik.http.routers.traefik-secure.tls.certresolver=milvert"
-      - "traefik.http.routers.traefik-secure.tls=true"
-      - "traefik.http.services.traefik-service.loadbalancer.server.port=8080"
-      - "traefik.http.routers.traefik-secure.middlewares=traefik-auth"
-      - "traefik.http.middlewares.traefik-auth.basicauth.users=simon:$$apr1$$o3vIe.DX$$3XExiBMe8rUo3HujDSYEo0"
-
-networks:
-  frontend:
-    external: true
-  backend:
-    external: false
-
diff --git a/zigbee2mqtt/configuration.yaml b/zigbee2mqtt/configuration.yaml
index 0a0c53d..086dc0f 100644
--- a/zigbee2mqtt/configuration.yaml
+++ b/zigbee2mqtt/configuration.yaml
@@ -1,8 +1,8 @@
 homeassistant: false
 permit_join: true
 mqtt:
-  base_topic: zigbee2mqtt
-  server: 'mqtt://mqtt:1883'
+  base_topic: zigbee_landet
+  server: 'mqtt://10.0.0.3:1883'
 advanced:
   log_level: debug
   pan_id: 6753
@@ -35,6 +35,19 @@ devices:
   '0x680ae2fffed1de68':
     friendly_name: Ute - veranda
   '0x680ae2fffefc0ed4':
-    friendly_name: 'Ute - Björk 1'
+    friendly_name: Ute - Björk 1
   '0x588e81fffe3eb906':
-    friendly_name: 'Ute - Björk 2'
+    friendly_name: Ute - Björk 2
+  '0xd0cf5efffef137e6':
+    friendly_name: motion_landet_1
+groups:
+  '1':
+    friendly_name: ute
+    devices:
+      - '0xccccccfffe2e196c'
+      - '0xccccccfffe2c6653'
+      - '0x680ae2fffed1de68'
+      - '0x680ae2fffefc0ed4'
+      - '0x588e81fffe3eb906'
+  '901':
+    friendly_name: remote