diff --git a/docker-compose.yml b/docker-compose.yml
index 25c463a..e5179b2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,8 +30,8 @@ services:
 
   comicvineapi:
     build:
-      context: https://github.com/rishighan/comicvine-service.git
-    image: frishi/comicvine-service
+      context: https://github.com/rishighan/threetwo-metadata-service.git
+    image: frishi/threetwo-metadata-service
     container_name: comicvine-api
     ports:
       - "3080:3080"
@@ -48,8 +48,8 @@ services:
 
   comicvine:
     build:
-      context: https://github.com/rishighan/comicvine-service.git
-    image: frishi/comicvine-service
+      context: https://github.com/rishighan/threetwo-metadata-service.git
+    image: frishi/threetwo-metadata-service
     container_name: comicvine-service
     environment:
       SERVICES: comicvine
@@ -63,8 +63,8 @@ services:
 
   importapi:
     build:
-      context: https://github.com/rishighan/threetwo-import-service.git
-    image: frishi/threetwo-import-service
+      context: https://github.com/rishighan/threetwo-core-service.git
+    image: frishi/threetwo-core-service
     container_name: importapi
     ports:
       - "3000:3000"
@@ -83,8 +83,8 @@ services:
 
   import:
     build:
-      context: https://github.com/rishighan/threetwo-import-service.git
-    image: frishi/threetwo-import-service
+      context: https://github.com/rishighan/threetwo-core-service.git
+    image: frishi/threetwo-core-service
     container_name: import
     depends_on:
       - db
@@ -101,8 +101,8 @@ services:
 
   imagetransformation:
     build:
-      context: https://github.com/rishighan/threetwo-import-service.git
-    image: frishi/threetwo-import-service
+      context: https://github.com/rishighan/threetwo-core-service.git
+    image: frishi/threetwo-core-service
     container_name: image-transformation
     volumes:
       - ${USERDATA_DIRECTORY}:/threetwo-import-service/userdata
@@ -118,8 +118,8 @@ services:
 
   libraryqueue:
     build:
-      context: https://github.com/rishighan/threetwo-import-service.git
-    image: frishi/threetwo-import-service
+      context: https://github.com/rishighan/threetwo-core-service.git
+    image: frishi/threetwo-core-service
     container_name: library-queue
     volumes:
       - ${USERDATA_DIRECTORY}:/threetwo-import-service/userdata
@@ -135,8 +135,8 @@ services:
 
   settings:
     build:
-      context: https://github.com/rishighan/threetwo-import-service.git
-    image: frishi/threetwo-import-service
+      context: https://github.com/rishighan/threetwo-core-service.git
+    image: frishi/threetwo-core-service
     container_name: settings
     volumes:
       - ${USERDATA_DIRECTORY}:/threetwo-import-service/userdata