diff --git a/.env b/.env
index 171f8c4..47d1267 100644
--- a/.env
+++ b/.env
@@ -4,3 +4,7 @@ ALFRESCO_LICENSE_DIR=~/alfresco/license
 PROXY_PROTOCOL=http
 PROXY_HOST=localhost
 PROXY_PORT=8080
+
+APS_TAG=2.3.5
+POSTGRES_TAG=13
+ELASTICSEARCH_TAG=7.17.7
diff --git a/docker-compose.yml b/docker-compose.yml
index ef48732..3ccd0d8 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:
     activiti-app:
-        image: alfresco/process-services:1.11.1.1
-        mem_limit: 512m
+        image: quay.io/alfresco/alfresco-process-services:${APS_TAG}
         environment:
             ACTIVITI_DATASOURCE_USERNAME: alfresco
             ACTIVITI_DATASOURCE_PASSWORD: alfresco
@@ -17,15 +15,14 @@ services:
             ACTIVITI_ES_REST_CLIENT_ADDRESS: search-aps
             ACTIVITI_ES_REST_CLIENT_PORT: 9200
             ACTIVITI_ES_REST_CLIENT_SCHEMA: http
-            JAVA_OPTS: "-XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"
+            JAVA_OPTS: "-Xms128m -Xmx256m"
         depends_on:
             - postgres-aps
         volumes:
             - "$ALFRESCO_LICENSE_DIR/aps:/root/.activiti/enterprise-license:ro"
     
     activiti-admin:
-        image: alfresco/process-services-admin:1.11.1.1
-        mem_limit: 256m
+        image: quay.io/alfresco/alfresco-process-services-admin:${APS_TAG}
         environment:
             ACTIVITI_ADMIN_DATASOURCE_USERNAME: alfresco
             ACTIVITI_ADMIN_DATASOURCE_PASSWORD: alfresco
@@ -34,14 +31,13 @@ services:
             ACTIVITI_ADMIN_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps-admin:5432/activiti-admin?characterEncoding=UTF-8'
             ACTIVITI_ADMIN_REST_APP_HOST: http://activiti-app
             ACTIVITI_ADMIN_REST_APP_PORT: 8080
-            JAVA_OPTS: "-XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"
+            JAVA_OPTS: "-Xms64m -Xmx128m"
         depends_on:
             - postgres-aps-admin
             - activiti-app
     
     postgres-aps:
-        image: postgres:11.6
-        mem_limit: 128m
+        image: postgres:${POSTGRES_TAG}
         environment:
             POSTGRES_DB: activiti
             POSTGRES_USER: alfresco
@@ -49,8 +45,7 @@ services:
         command: postgres -c max_connections=300 -c log_min_messages=LOG
     
     postgres-aps-admin:
-        image: postgres:11.6
-        mem_limit: 128m
+        image: postgres:${POSTGRES_TAG}
         environment:
             POSTGRES_DB: activiti-admin
             POSTGRES_USER: alfresco
@@ -58,8 +53,7 @@ services:
         command: postgres -c max_connections=50 -c log_min_messages=LOG
     
     search-aps:
-        image: elasticsearch:7.6.0
-        mem_limit: 512m
+        image: elasticsearch:${ELASTICSEARCH_TAG}
         environment:
             discovery.type: single-node
             ES_JAVA_OPTS: "-Xms128m -Xmx256m"