diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index f931eb5..301d0c3 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -2,8 +2,8 @@
 version: "3.8"
 
 services:
-  chore-test-app-backend: # Test backend service name
-    image: git.ryankegel.com:3000/ryan/backend:next # Use latest next tag
+  chores-test-app-backend: # Test backend service name
+    image: git.ryankegel.com:3000/kegel/chores/backend:next # Use latest next tag
     ports:
       - "5004:5000" # Host 5004 -> Container 5000
     environment:
@@ -11,19 +11,19 @@ services:
       - FRONTEND_URL=https://devserver.lan:446 # Add this for test env
     # Add volumes, networks, etc., as needed
 
-  chore-test-app-frontend: # Test frontend service name
-    image: git.ryankegel.com:3000/ryan/frontend:next # Use latest next tag
+  chores-test-app-frontend: # Test frontend service name
+    image: git.ryankegel.com:3000/kegel/chores/frontend:next # Use latest next tag
     ports:
       - "446:443" # Host 446 -> Container 443 (HTTPS)
     environment:
-      - BACKEND_HOST=chore-test-app-backend # Points to internal backend service
+      - BACKEND_HOST=chores-test-app-backend # Points to internal backend service
     depends_on:
-      - chore-test-app-backend
+      - chores-test-app-backend
     # Add volumes, networks, etc., as needed
 
 networks:
-  chore-test-app-net:
+  chores-test-app-net:
     driver: bridge
 
 volumes:
-  chore-test-app-backend-data: {}
+  chores-test-app-backend-data: {}
diff --git a/docker-compose.yml b/docker-compose.yml
index 11d50c4..3337ac8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,35 +2,35 @@
 version: "3.8"
 
 services:
-  chore-app-backend: # Production backend service name
-    image: git.ryankegel.com:3000/ryan/backend:latest # Or specific version tag
-    container_name: chore-app-backend-prod # Added for easy identification
+  chores-app-backend: # Production backend service name
+    image: git.ryankegel.com:3000/kegel/chores/backend:latest # Or specific version tag
+    container_name: chores-app-backend-prod # Added for easy identification
     ports:
       - "5001:5000" # Host 5001 -> Container 5000
     environment:
       - FLASK_ENV=production
     volumes:
-      - chore-app-backend-data:/app/data # Assuming backend data storage; adjust path as needed
+      - chores-app-backend-data:/app/data # Assuming backend data storage; adjust path as needed
     networks:
-      - chore-app-net
+      - chores-app-net
     # Add other volumes, networks, etc., as needed
 
-  chore-app-frontend: # Production frontend service name
-    image: git.ryankegel.com:3000/ryan/frontend:latest # Or specific version tag
-    container_name: chore-app-frontend-prod # Added for easy identification
+  chores-app-frontend: # Production frontend service name
+    image: git.ryankegel.com:3000/kegel/chores/frontend:latest # Or specific version tag
+    container_name: chores-app-frontend-prod # Added for easy identification
     ports:
       - "443:443" # Host 443 -> Container 443 (HTTPS)
     environment:
-      - BACKEND_HOST=chore-app-backend # Points to internal backend service
+      - BACKEND_HOST=chores-app-backend # Points to internal backend service
     depends_on:
-      - chore-app-backend
+      - chores-app-backend
     networks:
-      - chore-app-net
+      - chores-app-net
     # Add volumes, networks, etc., as needed
 
 networks:
-  chore-app-net:
+  chores-app-net:
     driver: bridge
 
 volumes:
-  chore-app-backend-data: {}
+  chores-app-backend-data: {}