diff --git a/docker-compose.yml b/docker-compose.yml
index 6ef1c59..aee5e34 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -57,9 +57,14 @@ services:
                 -Djodconverter.enabled=false
                 "
         depends_on:
-            - postgres-acs
-            - activemq
-            - shared-file-store
+            postgres-acs:
+                condition: service_started
+            activemq:
+                condition: service_started
+            shared-file-store:
+                condition: service_started
+            identity:
+                condition: service_healthy
         volumes:
             - "$ALFRESCO_LICENSE_DIR/acs:/usr/local/tomcat/shared/classes/alfresco/extension/license:ro"