diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml
index b4f5a2b..05a905f 100644
--- a/docker/homeautomation/docker-compose.yml
+++ b/docker/homeautomation/docker-compose.yml
@@ -8,14 +8,15 @@ services:
     volumes:
       - /docker/homeautomation/home-assistant:/config
       - /etc/localtime:/etc/localtime:ro
-    devices:
-      - /dev/ttyACM0:/dev/ttyACM0
     restart: always
     networks:
       - home-assistant
       - proxy
     ports:
       - "8123:8123"
+    depends_on:
+      - deconz
+      - mosquitto
     labels:
       - "traefik.enable=true"
 
@@ -32,6 +33,26 @@ services:
       - "traefik.docker.network=proxy"
       - "traefik.http.services.home-assistant.loadbalancer.server.port=8123"
 
+  deconz:
+    container_name: deconz
+    image: marthoc/deconz
+    environment:
+      - TZ=Europe/Helsinki
+      - DECONZ_WEB_PORT=8083
+      - DECONZ_WS_PORT=8084
+      - DECONZ_VNC_PORT=5901
+      - DECONZ_VNC_MODE=1
+      - DECONZ_VNC_PASSWORD=${DECONZ_VNC_PASSWORD}
+      - DEBUG_OTAU=1
+    network_mode: host
+    volumes:
+      - /docker/homeautomation/deconz:/root/.local/share/dresden-elektronik/deCONZ
+
+      - /etc/localtime:/etc/localtime:ro
+    restart: always
+    devices:
+      - /dev/ttyACM0
+
   node-red:
     container_name: node-red
     image: nodered/node-red
@@ -64,6 +85,17 @@ services:
       - "traefik.docker.network=proxy"
       - "traefik.http.services.node.loadbalancer.server.port=1880"
 
+  mosquitto:
+    container_name: mosquitto
+    image: eclipse-mosquitto
+    environment:
+      - TZ=Europe/Helsinki
+    network_mode: host
+    volumes:
+      - /docker/homeautomation/mosquitto:/mosquitto
+      - /etc/localtime:/etc/localtime:ro
+    restart: always
+
   mariadb:
     container_name: mariadb-hass
     image: mariadb
diff --git a/docker/homeautomation/docker-compose.yml.orig b/docker/homeautomation/docker-compose.yml.orig
new file mode 100644
index 0000000..225e773
--- /dev/null
+++ b/docker/homeautomation/docker-compose.yml.orig
@@ -0,0 +1,121 @@
+version: '3'
+services:
+  home-assistant:
+    container_name: home-assistant
+    image: homeassistant/home-assistant
+    environment:
+      - TZ=Europe/Helsinki
+    volumes:
+      - /docker/homeautomation/home-assistant:/config
+      - /etc/localtime:/etc/localtime:ro
+<<<<<<< HEAD
+    devices:
+      - /dev/ttyACM0:/dev/ttyACM0
+=======
+>>>>>>> parent of 36c8746... Move from deconz to zha
+    restart: always
+    networks:
+      - home-assistant
+      - proxy
+    ports:
+      - '8123:8123'
+    depends_on:
+      - deconz
+      - mosquitto
+    labels:
+      - 'traefik.enable=true'
+
+      - 'traefik.http.routers.home-assistant-redirect.entrypoints=http'
+      - 'traefik.http.routers.home-assistant-redirect.rule=Host(`home.reekynet.com`)'
+      - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https'
+      - 'traefik.http.routers.home-assistant-redirect.middlewares=http2https'
+
+      - 'traefik.http.routers.home-assistant.entrypoints=https'
+      - 'traefik.http.routers.home-assistant.rule=Host(`home.reekynet.com`)'
+      - 'traefik.http.routers.home-assistant.tls=true'
+      - 'traefik.http.routers.home-assistant.tls.certresolver=http'
+      - 'traefik.http.routers.home-assistant.service=home-assistant'
+      - 'traefik.docker.network=proxy'
+      - 'traefik.http.services.home-assistant.loadbalancer.server.port=8123'
+
+  deconz:
+    container_name: deconz
+    image: marthoc/deconz
+    environment:
+      - TZ=Europe/Helsinki
+      - DECONZ_WEB_PORT=8083
+      - DECONZ_WS_PORT=8084
+      - DECONZ_VNC_PORT=5901
+      - DECONZ_VNC_MODE=1
+      - DECONZ_VNC_PASSWORD=${DECONZ_VNC_PASSWORD}
+      - DEBUG_OTAU=1
+    network_mode: host
+    volumes:
+      - /docker/homeautomation/deconz:/root/.local/share/dresden-elektronik/deCONZ
+
+      - /etc/localtime:/etc/localtime:ro
+    restart: always
+    devices:
+      - /dev/ttyACM0
+
+  node-red:
+    container_name: node-red
+    image: nodered/node-red
+    environment:
+      - TZ=Europe/Helsinki
+    networks:
+      - home-assistant
+      - proxy
+    ports:
+      - '1880:1880'
+    volumes:
+      - /docker/homeautomation/node-red:/data
+      - /etc/localtime:/etc/localtime:ro
+    restart: always
+    depends_on:
+      - home-assistant
+    labels:
+      - 'traefik.enable=true'
+
+      - 'traefik.http.routers.node-red-redirect.entrypoints=http'
+      - 'traefik.http.routers.node-red-redirect.rule=Host(`node.reekynet.com`)'
+      - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https'
+      - 'traefik.http.routers.node-red-redirect.middlewares=http2https'
+
+      - 'traefik.http.routers.node-red.entrypoints=https'
+      - 'traefik.http.routers.node-red.rule=Host(`node.reekynet.com`)'
+      - 'traefik.http.routers.node-red.tls=true'
+      - 'traefik.http.routers.node-red.tls.certresolver=http'
+      - 'traefik.http.routers.node-red.service=node-red'
+      - 'traefik.docker.network=proxy'
+      - 'traefik.http.services.node.loadbalancer.server.port=1880'
+
+  mosquitto:
+    container_name: mosquitto
+    image: eclipse-mosquitto
+    environment:
+      - TZ=Europe/Helsinki
+    network_mode: host
+    volumes:
+      - /docker/homeautomation/mosquitto:/mosquitto
+      - /etc/localtime:/etc/localtime:ro
+    restart: always
+
+  mariadb:
+    container_name: mariadb-hass
+    image: mariadb
+    environment:
+      - TZ=Europe/Helsinki
+      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
+    networks:
+      - home-assistant
+    volumes:
+      - /docker/homeautomation/mariadb:/var/lib/mysql
+      - /etc/localtime:/etc/localtime:ro
+    restart: always
+
+networks:
+  home-assistant:
+    external: false
+  proxy:
+    external: true