diff --git a/docker-compose.yml b/docker-compose.yml
index c39de01..51b361d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,7 +6,7 @@ version: "2.1"
 services:
     platform:
         image: quay.io/alfresco/alfresco-governance-repository-enterprise:V3.4-latest
-        mem_limit: 1700m
+        mem_limit: 2g
         environment:
             JAVA_OPTS: "
                 -Ddb.driver=org.postgresql.Driver
@@ -71,6 +71,7 @@ services:
     
     transform-router:
         image: quay.io/alfresco/alfresco-transform-router:1.3.1
+        mem_limit: 128m
         environment:
             ACTIVEMQ_URL: "nio://activemq:61616"
             CORE_AIO_URL : "http://transform-core-aio:8090"
@@ -81,6 +82,7 @@ services:
     
     transform-core-aio:
         image: alfresco/alfresco-transform-core-aio:2.3.6
+        mem_limit: 1g
         environment:
             ACTIVEMQ_URL: "nio://activemq:61616"
             FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
@@ -90,6 +92,7 @@ services:
 
     shared-file-store:
         image: alfresco/alfresco-shared-file-store:0.10.0
+        mem_limit: 256m
         volumes:
             - shared-file-store-volume:/tmp/Alfresco/sfs
     
@@ -121,7 +124,7 @@ services:
     
     postgres-acs:
         image: postgres:11.7
-        mem_limit: 512m
+        mem_limit: 128m
         environment:
             - POSTGRES_PASSWORD=alfresco
             - POSTGRES_USER=alfresco
@@ -132,7 +135,7 @@ services:
     
     search:
         image: alfresco/alfresco-search-services:2.0.1
-        mem_limit: 2g
+        mem_limit: 1g
         environment:
             - SOLR_ALFRESCO_HOST=platform
             - SOLR_ALFRESCO_PORT=8080
@@ -145,7 +148,7 @@ services:
 
     activemq:
         image: alfresco/alfresco-activemq:5.15.8
-        mem_limit: 256m
+        mem_limit: 512m
         volumes:
             - activemq-volume:/opt/activemq/data:rw
 
@@ -229,7 +232,7 @@ services:
     
     postgres-aps:
         image: postgres:11.6
-        mem_limit: 256m
+        mem_limit: 128m
         environment:
             POSTGRES_DB: activiti
             POSTGRES_USER: alfresco
@@ -265,7 +268,8 @@ services:
             - esindex-volume:/var/lib/postgresql/data:rw
 
     identity:
-        image: alfresco/alfresco-identity-service:1.3
+        image: alfresco/alfresco-identity-service:1.4.0
+        mem_limit: 512m
         user: jboss
         environment:
             KEYCLOAK_USER: admin
@@ -278,7 +282,7 @@ services:
                 aliases:
                     - "${IDENTITY_SERVICE_HOST}"
         healthcheck:
-            test: ["CMD", "curl", "-f", "http://localhost:8080/auth"]
+            test: ["CMD", "curl", "-f", "http://localhost:8080/auth/realms/alfresco"]
             interval: 10s
             timeout: 10s
             # Really long startup times on Windows
@@ -290,6 +294,7 @@ services:
     proxy:
         build: ./nginx-ingress
         image: local/nginx-ingress:acs-sync-share-adw-aps-aims
+        mem_limit: 256m
         ports:
             - 8080:8080
         depends_on: