diff --git a/src/Testcontainers.Pulsar/PulsarBuilder.cs b/src/Testcontainers.Pulsar/PulsarBuilder.cs
index 51f2c75b5..86ba5e3bf 100644
--- a/src/Testcontainers.Pulsar/PulsarBuilder.cs
+++ b/src/Testcontainers.Pulsar/PulsarBuilder.cs
@@ -75,7 +75,7 @@ public override PulsarContainer Build()
             waitStrategy = waitStrategy.UntilMessageIsLogged("Function worker service started");
         }
 
-        var pulsarBuilder =  WithWaitStrategy(waitStrategy);
+        var pulsarBuilder = DockerResourceConfiguration.WaitStrategies.Count() > 1 ? this : WithWaitStrategy(waitStrategy);
         return new PulsarContainer(pulsarBuilder.DockerResourceConfiguration);
     }
 
@@ -156,9 +156,6 @@ public Task<bool> UntilAsync(IContainer container)
         /// <inheritdoc cref="IWaitUntil.UntilAsync" />
         private async Task<bool> UntilAsync(PulsarContainer container)
         {
-            _ = Guard.Argument(container, nameof(container))
-                .NotNull();
-
             if (_authenticationEnabled && _authToken == null)
             {
                 try
diff --git a/src/Testcontainers/Configurations/Networks/NetworkDriver.cs b/src/Testcontainers/Configurations/Networks/NetworkDriver.cs
index a27751ebd..8655466b6 100644
--- a/src/Testcontainers/Configurations/Networks/NetworkDriver.cs
+++ b/src/Testcontainers/Configurations/Networks/NetworkDriver.cs
@@ -20,6 +20,12 @@ public readonly struct NetworkDriver
     [PublicAPI]
     public static readonly NetworkDriver Host = new NetworkDriver("host");
 
+    /// <summary>
+    /// Gets network driver nat.
+    /// </summary>
+    [PublicAPI]
+    public static readonly NetworkDriver Nat = new NetworkDriver("nat");
+
     /// <summary>
     /// Initializes a new instance of the <see cref="NetworkDriver" /> struct.
     /// </summary>