diff --git a/common-test/src/main/java/org/alfresco/hxi_connector/common/test/docker/util/DockerContainers.java b/common-test/src/main/java/org/alfresco/hxi_connector/common/test/docker/util/DockerContainers.java
index d76a374f0..8399efc11 100644
--- a/common-test/src/main/java/org/alfresco/hxi_connector/common/test/docker/util/DockerContainers.java
+++ b/common-test/src/main/java/org/alfresco/hxi_connector/common/test/docker/util/DockerContainers.java
@@ -91,8 +91,7 @@ public static AlfrescoRepositoryContainer createExtendedRepositoryContainerWithi
         pullRepositoryImage(enterprise);
         AlfrescoRepositoryContainer repository = new AlfrescoRepositoryContainer(
                 new AlfrescoRepositoryExtension(REPOSITORY_EXTENSION, EXTENDED_REPOSITORY_LOCAL_NAME, enterprise))
-                        .waitingFor(Wait.forLogMessage(".*Server startup in \\[\\d+\\] milliseconds.*\\n", 1))
-                        .withStartupTimeout(Duration.ofMinutes(5))
+                        .waitingFor(Wait.forHttp("/alfresco").forPort(8080).withStartupTimeout(Duration.ofMinutes(5)))
                         .withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger(AlfrescoRepositoryContainer.class.getSimpleName())));
 
         Optional.ofNullable(network).ifPresent(n -> repository.withNetwork(n).withNetworkAliases(REPOSITORY_ALIAS));
@@ -187,6 +186,7 @@ public static GenericContainer<?> createLiveIngesterContainerWithin(Network netw
                 .withEnv("ALFRESCO_TRANSFORM_SHARED-FILE-STORE_PORT", "8099")
                 .withExposedPorts(5007)
                 .withStartupTimeout(Duration.ofMinutes(2))
+                .waitingFor(Wait.forLogMessage(".*Started LiveIngesterApplication.*", 1))
                 .withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger("LiveIngesterContainer")));
 
         Optional.ofNullable(network).ifPresent(n -> liveIngester.withNetwork(n).withNetworkAliases(LIVE_INGESTER_ALIAS));
diff --git a/e2e-test/src/test/java/org/alfresco/hxi_connector/e2e_test/CreateNodeE2eTest.java b/e2e-test/src/test/java/org/alfresco/hxi_connector/e2e_test/CreateNodeE2eTest.java
index 254508642..09971f1f2 100644
--- a/e2e-test/src/test/java/org/alfresco/hxi_connector/e2e_test/CreateNodeE2eTest.java
+++ b/e2e-test/src/test/java/org/alfresco/hxi_connector/e2e_test/CreateNodeE2eTest.java
@@ -74,7 +74,7 @@
 public class CreateNodeE2eTest
 {
     private static final String BUCKET_NAME = "test-hxinsight-bucket";
-    private static final int MAX_ATTEMPTS = 10;
+    private static final int MAX_ATTEMPTS = 5;
     private static final int INITIAL_DELAY_MS = 500;
     private static final String PARENT_ID = "-my-";
     private static final String DUMMY_CONTENT = "Dummy's file dummy content";