diff --git a/.env b/.env
index 171f8c4..654bc1b 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.4.1.1
+AAMQ_TAG=latest
+POSTGRES_TAG=13
diff --git a/docker-compose.yml b/docker-compose.yml
index fe69681..e9217ca 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,13 +1,21 @@
-# Sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml
+# Originally 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:6.2.0-ga
-        mem_limit: 1700m
+        image: alfresco/alfresco-content-repository-community:${ACS_TAG}
         environment:
+            JAVA_TOOL_OPTIONS: "
+                -Dencryption.keystore.type=JCEKS
+                -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding
+                -Dencryption.keyAlgorithm=DESede
+                -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore
+                -Dmetadata-keystore.password=mp6yc0UD9e
+                -Dmetadata-keystore.aliases=metadata
+                -Dmetadata-keystore.metadata.password=oKIWzVdEdA
+                -Dmetadata-keystore.metadata.algorithm=DESede"
             JAVA_OPTS: "
                 -Ddb.driver=com.mysql.jdbc.Driver
                 -Ddb.username=alfresco
@@ -44,8 +52,7 @@ services:
             - MYSQL_DATABASE=alfresco
 
     activemq:
-        image: alfresco/alfresco-activemq:5.15.8
-        mem_limit: 512m
+        image: alfresco/alfresco-activemq:${AAMQ_TAG}
 
     proxy:
         build: ./nginx-ingress