diff --git a/modules/azure/src/main/java/org/testcontainers/containers/CosmosDBEmulatorContainer.java b/modules/azure/src/main/java/org/testcontainers/containers/CosmosDBEmulatorContainer.java
index f5238a45d33..a1cfdeaf124 100644
--- a/modules/azure/src/main/java/org/testcontainers/containers/CosmosDBEmulatorContainer.java
+++ b/modules/azure/src/main/java/org/testcontainers/containers/CosmosDBEmulatorContainer.java
@@ -27,7 +27,7 @@ public CosmosDBEmulatorContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
         withExposedPorts(PORT);
-        waitingFor(Wait.forLogMessage("(?s).*Started\\r\\n$", 1));
+        waitingFor(Wait.forLogMessage(".*Started\\r\\n$", 1));
     }
 
     /**
diff --git a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
index e96ae26c02f..99f8cd75b4f 100644
--- a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
+++ b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
@@ -6,7 +6,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.testcontainers.containers.BindMode;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.ComparableVersion;
 import org.testcontainers.utility.DockerImageName;
 
@@ -135,7 +135,7 @@ public ElasticsearchContainer(final DockerImageName dockerImageName) {
         //   matches 7.x JSON logging with whitespace between message field and content
         //   matches 6.x text logging with node name in brackets and just a 'started' message till the end of the line
         String regex = ".*(\"message\":\\s?\"started[\\s?|\"].*|] started\n$)";
-        setWaitStrategy(new LogMessageWaitStrategy().withRegEx(regex));
+        setWaitStrategy(Wait.forLogMessage(regex, 1));
         if (isAtLeastMajorVersion8) {
             withPassword(ELASTICSEARCH_DEFAULT_PASSWORD);
             withCertPath(DEFAULT_CERT_PATH);
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java
index 0325b58e745..e9bff52b781 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java
@@ -1,6 +1,6 @@
 package org.testcontainers.containers;
 
-import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.DockerImageName;
 
 /**
@@ -33,7 +33,7 @@ public BigtableEmulatorContainer(final DockerImageName dockerImageName) {
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, CLOUD_SDK_IMAGE_NAME);
 
         withExposedPorts(PORT);
-        setWaitStrategy(new LogMessageWaitStrategy().withRegEx("(?s).*running.*$"));
+        setWaitStrategy(Wait.forLogMessage(".*running.*$", 1));
         withCommand("/bin/sh", "-c", CMD);
     }
 
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java
index 1d3ec4a01d1..04a7f039be7 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java
@@ -1,6 +1,6 @@
 package org.testcontainers.containers;
 
-import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.DockerImageName;
 
 /**
@@ -33,7 +33,7 @@ public FirestoreEmulatorContainer(final DockerImageName dockerImageName) {
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, CLOUD_SDK_IMAGE_NAME);
 
         withExposedPorts(PORT);
-        setWaitStrategy(new LogMessageWaitStrategy().withRegEx("(?s).*running.*$"));
+        setWaitStrategy(Wait.forLogMessage(".*running.*$", 1));
         withCommand("/bin/sh", "-c", CMD);
     }
 
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java
index cd75c3a07c5..c9b53596ab7 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/PubSubEmulatorContainer.java
@@ -1,6 +1,6 @@
 package org.testcontainers.containers;
 
-import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.DockerImageName;
 
 /**
@@ -33,7 +33,7 @@ public PubSubEmulatorContainer(final DockerImageName dockerImageName) {
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, CLOUD_SDK_IMAGE_NAME);
 
         withExposedPorts(8085);
-        setWaitStrategy(new LogMessageWaitStrategy().withRegEx("(?s).*started.*$"));
+        setWaitStrategy(Wait.forLogMessage(".*started.*$", 1));
         withCommand("/bin/sh", "-c", CMD);
     }
 
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java
index ff36bddd1b2..eff48a8777c 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java
@@ -1,6 +1,6 @@
 package org.testcontainers.containers;
 
-import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.DockerImageName;
 
 /**
@@ -27,7 +27,7 @@ public SpannerEmulatorContainer(final DockerImageName dockerImageName) {
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
         withExposedPorts(GRPC_PORT, HTTP_PORT);
-        setWaitStrategy(new LogMessageWaitStrategy().withRegEx(".*Cloud Spanner emulator running\\..*"));
+        setWaitStrategy(Wait.forLogMessage(".*Cloud Spanner emulator running\\..*", 1));
     }
 
     /**
diff --git a/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java b/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java
index 29e78920917..241d5b18c9e 100644
--- a/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java
+++ b/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java
@@ -8,7 +8,7 @@
 import org.slf4j.event.Level;
 import org.testcontainers.containers.ContainerLaunchException;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.MountableFile;
@@ -82,7 +82,7 @@ public HiveMQContainer(final @NotNull DockerImageName dockerImageName) {
 
         addExposedPort(MQTT_PORT);
 
-        waitStrategy.withStrategy(new LogMessageWaitStrategy().withRegEx("(.*)Started HiveMQ in(.*)"));
+        waitStrategy.withStrategy(Wait.forLogMessage("(.*)Started HiveMQ in(.*)", 1));
         waitingFor(waitStrategy);
 
         withLogConsumer(outputFrame -> {
@@ -160,7 +160,7 @@ protected void containerIsStarted(final @NotNull InspectContainerResponse contai
      */
     public @NotNull HiveMQContainer waitForExtension(final @NotNull String extensionName) {
         final String regEX = "(.*)Extension \"" + extensionName + "\" version (.*) started successfully(.*)";
-        waitStrategy.withStrategy(new LogMessageWaitStrategy().withRegEx(regEX));
+        waitStrategy.withStrategy(Wait.forLogMessage(regEX, 1));
         return self();
     }
 
diff --git a/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java b/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java
index b014c5b4ed6..6dd6f06d85e 100644
--- a/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java
+++ b/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java
@@ -10,7 +10,7 @@
 import org.apache.commons.io.IOUtils;
 import org.testcontainers.containers.BindMode;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.DockerImageName;
 
 import java.nio.charset.StandardCharsets;
@@ -47,7 +47,7 @@ public K3sContainer(DockerImageName dockerImageName) {
         setTmpFsMapping(tmpFsMapping);
 
         setCommand("server", "--disable=traefik", "--tls-san=" + this.getHost());
-        setWaitStrategy(new LogMessageWaitStrategy().withRegEx(".*Node controller sync successful.*"));
+        setWaitStrategy(Wait.forLogMessage(".*Node controller sync successful.*", 1));
     }
 
     @Override
diff --git a/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java b/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
index 12a6e58e4a5..aeaf053ff0a 100644
--- a/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
+++ b/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
@@ -9,7 +9,7 @@
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.ComparableVersion;
 import org.testcontainers.utility.DockerImageName;
 
@@ -79,7 +79,7 @@ public OrientDBContainer(final DockerImageName dockerImageName) {
         serverPassword = DEFAULT_SERVER_PASSWORD;
         databaseName = DEFAULT_DATABASE_NAME;
 
-        waitStrategy = new LogMessageWaitStrategy().withRegEx(".*OrientDB Studio available.*");
+        waitStrategy = Wait.forLogMessage(".*OrientDB Studio available.*", 1);
 
         addExposedPorts(DEFAULT_BINARY_PORT, DEFAULT_HTTP_PORT);
     }