diff --git a/docker-compose.yml b/docker-compose.yml
index a21a3ad..d01d02e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -44,7 +44,7 @@ services:
     labels:
       - "com.centurylinklabs.watchtower.enable=true"
       - "traefik.enable=true"
-      - "traefik.http.routers.sonarr.rule=Host(`sonarr.depaoli.id.au`)"
+      - "traefik.http.routers.sonarr.rule=Host(`son.depaoli.id.au`)"
       - "traefik.http.routers.sonarr.tls=true"
       - "traefik.http.routers.sonarr.entrypoints=secureweb"
     volumes:
@@ -63,7 +63,7 @@ services:
     labels:
       - "com.centurylinklabs.watchtower.enable=true"
       - "traefik.enable=true"
-      - "traefik.http.routers.radarr.rule=Host(`radarr.depaoli.id.au`)"
+      - "traefik.http.routers.radarr.rule=Host(`rad.depaoli.id.au`)"
       - "traefik.http.routers.radarr.tls=true"
       - "traefik.http.routers.radarr.entrypoints=secureweb"
     volumes:
@@ -277,7 +277,7 @@ services:
       - "32469:32469"
 
   hassio:
-    image: homeassistant/amd64-hassio-supervisor:latest
+    image: homeassistant/amd64-hassio-supervisor:2021.02.11
     container_name: hassio_supervisor
     labels:
       - "com.centurylinklabs.watchtower.enable=false"
@@ -488,3 +488,26 @@ services:
       - '/srv/docker/container/padb/data:/var/lib/postgresql/data'
       - '/srv/docker/container/padb/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d'
 
+  paweb:
+    container_name: paweb
+    build: '/home/ddp/src/photoassistant'
+    volumes:
+      - '/srv/docker/container/letsencrypt/etc:/etc/letsencrypt'
+    labels:
+      - "com.centurylinklabs.watchtower.enable=false"
+      - "traefik.enable=true"
+      - "traefik.tcp.routers.paweb-tcp.rule=HostSNI(`pa.depaoli.id.au`)"
+      - "traefik.tcp.routers.paweb-tcp.tls.passthrough=true"
+      - "traefik.tcp.routers.paweb-tcp.entrypoints=secureweb"
+
+  bitwarden_rs:
+    container_name: bitwarden
+    image: bitwardenrs/server:latest
+    volumes:
+      - '/srv/docker/container/bitwarden_rs/data:/data'
+    labels:
+      - "com.centurylinklabs.watchtower.enable=true"
+      - "traefik.enable=true"
+      - "traefik.http.routers.bitwarden_rs.rule=Host(`bw.depaoli.id.au`) || Host(`ddphome.asuscomm.com`)"
+      - "traefik.http.routers.bitwarden_rs.tls=true"
+      - "traefik.http.routers.bitwarden_rs.entrypoints=secureweb"