diff --git a/docker-compose.yml b/docker-compose.yml
index 6cf13ff..4dde961 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -311,31 +311,28 @@ services:
       - "32414:32414"
       - "32469:32469"
 
-  ##
-  ## remember, need to docker-compose stop hassio && docker-compose rm hassio && docker-compose pull hassio && docker-compose up hassio &
-  ##
-  hassio:
-    image: homeassistant/amd64-hassio-supervisor:2021.06.8
-    container_name: hassio_supervisor
-    labels:
-      - "com.centurylinklabs.watchtower.enable=false"
+  hass:
+    image: homeassistant/home-assistant
+    container_name: hass
     privileged: true
     restart: always
-    entrypoint: ["/bin/bash", "-c", "/scripts/start_hassio.sh"]
     security_opt:
       - seccomp:unconfined
-    environment:
-      - HOMEASSISTANT_REPOSITORY=homeassistant/qemux86-64-homeassistant
-      - SUPERVISOR_SHARE=/srv/docker/container/hassio
-      - SUPERVISOR_NAME=hassio_supervisor
-      - DBUS_SYSTEM_BUS_ADDRESS=unix:path=/var/run/dbus/system_bus_socket
     volumes:
-      - /srv/docker/container/hassio:/data
-      - /srv/docker/container/hassio/scripts:/scripts
+      - /srv/docker/container/hass:/config
       - /var/run/docker.sock:/var/run/docker.sock
       - /var/run/dbus/system_bus_socket:/var/run/dbus/system_bus_socket
       - /etc/localtime:/etc/localtime:ro
-
+    labels:
+      - "com.centurylinklabs.watchtower.enable=false"
+      - "traefik.enable=true"
+      - "traefik.http.routers.hass.rule=Host(`hass.depaoli.id.au`)"
+      - "traefik.http.routers.hass.tls=true"
+      - "traefik.http.routers.hass.tls.options=tls12@file"
+      - "traefik.http.routers.hass.entrypoints=secureweb"
+    ports:
+      - "8123:8123"
+    
   sabnzbd:
     image: linuxserver/sabnzbd
     container_name: sabnzbd
@@ -584,3 +581,14 @@ services:
       - "traefik.http.routers.bitwarden_rs.tls=true"
       - "traefik.http.routers.bitwarden_rs.tls.options=tls12@file"
       - "traefik.http.routers.bitwarden_rs.entrypoints=secureweb"
+
+  # auto-update docker images
+  watchtower:
+    container_name: watchtower
+    image: containrrr/watchtower
+    command: --schedule "0 0 3 * * *" --debug --stop-timeout 60s --label-enable --cleanup
+    restart: always
+    labels:
+      - "com.centurylinklabs.watchtower.enable=true"
+    volumes:
+      - "/var/run/docker.sock:/var/run/docker.sock"