diff --git a/homeassistant/docker-compose.yml b/homeassistant/docker-compose.yml
index 03047b2..d58eb1a 100644
--- a/homeassistant/docker-compose.yml
+++ b/homeassistant/docker-compose.yml
@@ -2,8 +2,15 @@ services:
   homeassistant:
     image: docker.io/homeassistant/home-assistant:2025.7.1
     container_name: homeassistant
-    network_mode: host
     volumes:
       - ${APPDATA_PATH}/homeassistant/config:/config
       - /etc/localtime:/etc/localtime:ro
+    ports:
+      - ${PORT}:8123
+    networks:
+      - frontend
     restart: unless-stopped
+
+networks:
+  frontend:
+    external: true
diff --git a/vaultwarden/docker-compose.yml b/vaultwarden/docker-compose.yml
index 62571fc..948a386 100644
--- a/vaultwarden/docker-compose.yml
+++ b/vaultwarden/docker-compose.yml
@@ -21,7 +21,7 @@ services:
       timeout: 5s
 
   vaultwarden_server:
-    image: vaultwarden/server:1.34.1
+    image: ghcr.io/dani-garcia/vaultwarden:1.34.1
     container_name: vaultwarden_server
     depends_on:
       vaultwarden_db:
@@ -31,7 +31,7 @@ services:
       - PGID=${PGID}
       - TZ=${TZ}
       - DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@vaultwarden_db:5432/${POSTGRES_DB}
-      - DOMAIN="${DOMAIN}"
+      - DOMAIN=${DOMAIN}
       - WEBSOCKET_ENABLED=${WEBSOCKET_ENABLED}
       - SIGNUPS_ALLOWED=${SIGNUPS_ALLOWED}
       - ADMIN_TOKEN=${ADMIN_TOKEN}