diff --git a/docker-compose.setup.yml b/docker-compose.setup.yml
index 98eb47e..c6a72b1 100644
--- a/docker-compose.setup.yml
+++ b/docker-compose.setup.yml
@@ -8,7 +8,7 @@ volumes:
 services:
   setup:
     # build: .
-    image: pvadimr/adaptauthoring
+    image: ${REGISTRY:-pvadimr/adaptauthoring:${TAG:-latest}
     container_name: adaptauthoring
     # extends:
     #   file: docker-compose.yml
diff --git a/docker-compose.yml b/docker-compose.yml
index 419452a..dafd7b7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,6 +15,7 @@ services:
   authoring:
     container_name: adaptauthoring
     image: pvadimr/adaptauthoring
+    image: ${REGISTRY:-pvadimr/adaptauthoring:${TAG:-latest}
     volumes:
       - adaptdata:/adapt_authoring
     # build: .