diff --git a/maeve/docker-compose.yml b/maeve/docker-compose.yml
index d9bafda4..a49a4975 100644
--- a/maeve/docker-compose.yml
+++ b/maeve/docker-compose.yml
@@ -26,7 +26,7 @@ services:
       retries: 3
 
   gateway:
-    image: ghcr.io/us-joet/everest-demo/gateway:${TAG}
+    image: ghcr.io/everest/everest-demo/maeve-gateway:${TAG}
     depends_on:
       mqtt:
         condition: service_healthy
@@ -67,7 +67,7 @@ services:
     user: "${UID}:${GID}"
 
   manager:
-    image: ghcr.io/us-joet/everest-demo/manager:${TAG}
+    image: ghcr.io/everest/everest-demo/maeve-manager:${TAG}
     build:
       context: manager
     depends_on: