diff --git a/home-assistant/docker-compose.yaml b/home-assistant/docker-compose.yaml
index f204bfe..92d3ba6 100644
--- a/home-assistant/docker-compose.yaml
+++ b/home-assistant/docker-compose.yaml
@@ -3,7 +3,7 @@ services:
   homeassistant:
     container_name: HomeAssistant
     network_mode: host
-    image: "ghcr.io/home-assistant/home-assistant:latest"
+    image: "${DOCKER_REGISTRY:-}ghcr.io/home-assistant/home-assistant:latest"
     volumes:
       - /share/docker_data/ha/:/config
       #- /dev/skyconnect:/dev/ttyUSB1 
@@ -50,7 +50,7 @@ services:
   #     com.centurylinklabs.watchtower.enable: true
   esphome:
     container_name: esphome
-    image: esphome/esphome:latest
+    image: ${DOCKER_REGISTRY:-}esphome/esphome:latest
     volumes:
       - /share/docker_data/esphome/config:/config
       - /etc/localtime:/etc/localtime:ro
@@ -76,7 +76,7 @@ services:
       - homepage.widget.username=jaydee
       - homepage.widget.password=jaydee1
   wyoming-piper-en:
-    image: rhasspy/wyoming-piper
+    image: ${DOCKER_REGISTRY:-}rhasspy/wyoming-piper
     container_name: piper-en
     ports:
       - 10200:10200
@@ -88,7 +88,7 @@ services:
     labels:
       com.centurylinklabs.watchtower.enable: true
   wyoming-whisper-en:
-    image: rhasspy/wyoming-whisper
+    image: ${DOCKER_REGISTRY:-}rhasspy/wyoming-whisper
     container_name: whisper-en
     ports:
       - 10300:10300
@@ -100,7 +100,7 @@ services:
       com.centurylinklabs.watchtower.enable: true
   openwakeword:
     container_name: openwakeword
-    image: rhasspy/wyoming-openwakeword:latest
+    image: ${DOCKER_REGISTRY:-}rhasspy/wyoming-openwakeword:latest
     command: 
       --preload-model 'ok_nabu'
       --custom-model-dir /custom
@@ -123,7 +123,7 @@ services:
       com.centurylinklabs.watchtower.enable: true
   matter-server:
     container_name: matter-server
-    image: ghcr.io/home-assistant-libs/python-matter-server:stable
+    image: ${DOCKER_REGISTRY:-}ghcr.io/home-assistant-libs/python-matter-server:stable
     restart: ${RESTART:-unless-stopped}
     security_opt:
       - apparmor=unconfined
@@ -135,7 +135,7 @@ services:
       com.centurylinklabs.watchtower.enable: true
 
   music-assistant-server:
-    image: ghcr.io/music-assistant/server:latest # <<< Desired release version here (or use beta to get the latest beta version)
+    image: ${DOCKER_REGISTRY:-}ghcr.io/music-assistant/server:latest # <<< Desired release version here (or use beta to get the latest beta version)
     container_name: music-assistant-server
     restart: ${RESTART:-unless-stopped}
     # Network mode must be set to host for MA to work correctly