diff --git a/docker-compose.yml b/docker-compose.yml
index dce4ba78..02efa84a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 services:
   frontend:
     #build: ./frontend
-    image: ghcr.io/frikky/shuffle-frontend:0.7.1
+    image: frikky/shuffle:frontend
     container_name: shuffle-frontend
     hostname: shuffle-frontend
     ports:
@@ -17,7 +17,7 @@ services:
       - backend
   backend:
     #build: ./backend
-    image: ghcr.io/frikky/shuffle-backend:0.7.1
+    image: frikky/shuffle:backend
     container_name: shuffle-backend
     hostname: ${BACKEND_HOSTNAME}
     # Here for debugging:
@@ -43,7 +43,7 @@ services:
       - database
   orborus:
     #build: ./functions/onprem/orborus
-    image: ghcr.io/frikky/orborus:0.6.2
+    image: frikky/shuffle:orborus
     container_name: shuffle-orborus
     hostname: shuffle-orborus
     networks:
@@ -63,7 +63,7 @@ services:
     restart: unless-stopped
   database:
     #build: ./backend/database
-    image: ghcr.io/frikky/shuffle-database:1.0.0
+    image: frikky/shuffle:database
     container_name: shuffle-database
     hostname: shuffle-database
     ports: