diff --git a/compose.yaml b/compose.yaml
index abcc821..2f467db 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -1,6 +1,6 @@
 services:
   api:
-    image: proseim/prose-pod-api:latest
+    image: "${PROSE_POD_API_IMAGE:-proseim/prose-pod-api:${PROSE_POD_API_IMAGE_TAG:-${DEFAULT_DOCKER_TAG:-latest}}}"
     ports:
       - "8000:8000"
       - "8080:8080"
@@ -19,7 +19,7 @@ services:
       - "${ENV_FILE-.env}"
 
   server:
-    image: proseim/prose-pod-server:latest
+    image: "${PROSE_POD_SERVER_IMAGE:-proseim/prose-pod-server:${PROSE_POD_SERVER_IMAGE_TAG:-${DEFAULT_DOCKER_TAG:-latest}}}"
     ports:
       - "5222:5222"
       - "5269:5269"