diff --git a/.env b/.env
index 171f8c4..43cc336 100644
--- a/.env
+++ b/.env
@@ -4,3 +4,7 @@ ALFRESCO_LICENSE_DIR=~/alfresco/license
 PROXY_PROTOCOL=http
 PROXY_HOST=localhost
 PROXY_PORT=8080
+
+ACS_TAG=7.3.0
+AAMQ_TAG=5.17.1-jre17-centos7
+POSTGRES_TAG=13
diff --git a/docker-compose.yml b/docker-compose.yml
index 17f4e97..794f311 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,12 +1,10 @@
 # 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:
-        image: alfresco/alfresco-content-repository-community:7.3.0
-        mem_limit: 1700m
+        image: alfresco/alfresco-content-repository-community:${ACS_TAG}
         environment:
             JAVA_TOOL_OPTIONS: "
                 -Dencryption.keystore.type=JCEKS
@@ -44,8 +42,7 @@ services:
             - activemq
     
     postgres-acs:
-        image: postgres:13
-        mem_limit: 128m
+        image: postgres:${POSTGRES_TAG}
         environment:
             - POSTGRES_PASSWORD=alfresco
             - POSTGRES_USER=alfresco
@@ -53,8 +50,7 @@ services:
         command: postgres -c max_connections=300 -c log_min_messages=LOG
 
     activemq:
-        image: alfresco/alfresco-activemq:5.17.1-jre17-centos7
-        mem_limit: 512m
+        image: alfresco/alfresco-activemq:${AAMQ_TAG}
 
     proxy:
         build: ./nginx-ingress