diff --git a/.env b/.env
index 171f8c4..e71859f 100644
--- a/.env
+++ b/.env
@@ -4,3 +4,8 @@ ALFRESCO_LICENSE_DIR=~/alfresco/license
 PROXY_PROTOCOL=http
 PROXY_HOST=localhost
 PROXY_PORT=8080
+
+ATR_TAG=2.0.0
+ATE_AIO_TAG=3.0.0
+ASFS_TAG=2.0.0
+AAMQ_TAG=5.17.1-jre17-centos7
diff --git a/docker-compose.yml b/docker-compose.yml
index 59bc4a8..85fae38 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,6 @@
 # Sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml
 #
-# Using version 2 as 3 does not support resource constraint options (cpu_*, mem_* limits) for non swarm mode in Compose
-version: "2"
+version: "3"
 
 services:
     platform:
@@ -21,7 +20,7 @@ services:
             - shared-file-store
     
     transform-router:
-        image: quay.io/alfresco/alfresco-transform-router:latest
+        image: quay.io/alfresco/alfresco-transform-router:${ATR_TAG}
         environment:
             ACTIVEMQ_URL: "nio://activemq:61616"
             CORE_AIO_URL : "http://transform-core-aio:8090"
@@ -31,7 +30,7 @@ services:
             - shared-file-store
     
     transform-core-aio:
-        image: alfresco/alfresco-transform-core-aio:latest
+        image: alfresco/alfresco-transform-core-aio:${ATE_AIO_TAG}
         environment:
             ACTIVEMQ_URL: "nio://activemq:61616"
             FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
@@ -40,7 +39,7 @@ services:
             - shared-file-store
 
     shared-file-store:
-        image: alfresco/alfresco-shared-file-store:latest
+        image: alfresco/alfresco-shared-file-store:${ASFS_TAG}
         volumes:
             - shared-file-store-volume:/tmp/Alfresco/sfs
     
@@ -48,7 +47,7 @@ services:
         image: postgres:latest
 
     activemq:
-        image: alfresco/alfresco-activemq:latest
+        image: alfresco/alfresco-activemq:${AAMQ_TAG}
 
     proxy:
         build: ./nginx-ingress