diff --git a/.env b/.env
index 7a0aefe..a4ab6e7 100644
--- a/.env
+++ b/.env
@@ -9,9 +9,11 @@ ACS_TAG=7.3.0
 ATR_TAG=2.0.0
 ATE_AIO_TAG=3.0.0
 ASFS_TAG=2.0.0
+APS_TAG=2.3.5
 AAMQ_TAG=5.17.1-jre17-centos7
 POSTGRES_TAG=13
 ASIE_TAG=2.0.5
 ACS_SHARE_TAG=7.3.0
 ALF_SYNC_SERV_TAG=3.7
 ADW_TAG=3.1.0
+ELASTICSEARCH_TAG=7.17.7
diff --git a/docker-compose.yml b/docker-compose.yml
index edacd66..1c50389 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -156,8 +156,7 @@ services:
             APP_BASE_SHARE_URL: "${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/#/preview/s"
 
     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
@@ -168,16 +167,15 @@ 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"
+            - "$ALFRESCO_LICENSE_DIR/aps:/home/alfresco/.activiti/enterprise-license:ro"
             - apsbin-volume:/var/lib/postgresql/data:rw
     
     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
@@ -186,14 +184,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
@@ -203,8 +200,7 @@ services:
             - apsdb-volume:/var/lib/postgresql/data:rw
     
     postgres-aps-admin:
-        image: postgres:11.6
-        mem_limit: 128m
+        image: postgres:${POSTGRES_TAG}
         environment:
             POSTGRES_DB: activiti-admin
             POSTGRES_USER: alfresco
@@ -214,8 +210,7 @@ services:
             - apsadmindb-volume:/var/lib/postgresql/data:rw
     
     search-aps:
-        image: elasticsearch:7.6.0
-        mem_limit: 512m
+        image: elasticsearch:${ELASTICSEARCH_TAG}
         environment:
             discovery.type: single-node
             ES_JAVA_OPTS: "-Xms128m -Xmx256m"