diff --git a/.node-version b/.node-version
new file mode 100644
index 000000000..b009dfb9d
--- /dev/null
+++ b/.node-version
@@ -0,0 +1 @@
+lts/*
diff --git a/src/Testcontainers.DynamoDb/DynamoDbBuilder.cs b/src/Testcontainers.DynamoDb/DynamoDbBuilder.cs
index 531ef2473..cfd22579f 100644
--- a/src/Testcontainers.DynamoDb/DynamoDbBuilder.cs
+++ b/src/Testcontainers.DynamoDb/DynamoDbBuilder.cs
@@ -20,11 +20,11 @@ public DynamoDbBuilder()
     /// <summary>
     /// Initializes a new instance of the <see cref="DynamoDbBuilder" /> class.
     /// </summary>
-    /// <param name="dockerResourceConfiguration">The Docker resource configuration.</param>
-    private DynamoDbBuilder(DynamoDbConfiguration dockerResourceConfiguration)
-        : base(dockerResourceConfiguration)
+    /// <param name="resourceConfiguration">The Docker resource configuration.</param>
+    private DynamoDbBuilder(DynamoDbConfiguration resourceConfiguration)
+        : base(resourceConfiguration)
     {
-        DockerResourceConfiguration = dockerResourceConfiguration;
+        DockerResourceConfiguration = resourceConfiguration;
     }
 
     /// <inheritdoc />
@@ -48,13 +48,13 @@ protected override DynamoDbBuilder Init()
     }
 
     /// <inheritdoc />
-    protected override DynamoDbBuilder Clone(IContainerConfiguration resourceConfiguration)
+    protected override DynamoDbBuilder Clone(IResourceConfiguration<CreateContainerParameters> resourceConfiguration)
     {
         return Merge(DockerResourceConfiguration, new DynamoDbConfiguration(resourceConfiguration));
     }
 
     /// <inheritdoc />
-    protected override DynamoDbBuilder Clone(IResourceConfiguration<CreateContainerParameters> resourceConfiguration)
+    protected override DynamoDbBuilder Clone(IContainerConfiguration resourceConfiguration)
     {
         return Merge(DockerResourceConfiguration, new DynamoDbConfiguration(resourceConfiguration));
     }
diff --git a/src/Testcontainers.EventStoreDb/EventStoreDbBuilder.cs b/src/Testcontainers.EventStoreDb/EventStoreDbBuilder.cs
index 32377502b..6e73a3886 100644
--- a/src/Testcontainers.EventStoreDb/EventStoreDbBuilder.cs
+++ b/src/Testcontainers.EventStoreDb/EventStoreDbBuilder.cs
@@ -20,11 +20,11 @@ public EventStoreDbBuilder()
     /// <summary>
     /// Initializes a new instance of the <see cref="EventStoreDbBuilder" /> class.
     /// </summary>
-    /// <param name="dockerResourceConfiguration">The Docker resource configuration.</param>
-    private EventStoreDbBuilder(EventStoreDbConfiguration dockerResourceConfiguration)
-        : base(dockerResourceConfiguration)
+    /// <param name="resourceConfiguration">The Docker resource configuration.</param>
+    private EventStoreDbBuilder(EventStoreDbConfiguration resourceConfiguration)
+        : base(resourceConfiguration)
     {
-        DockerResourceConfiguration = dockerResourceConfiguration;
+        DockerResourceConfiguration = resourceConfiguration;
     }
 
     /// <inheritdoc />
@@ -50,13 +50,13 @@ protected override EventStoreDbBuilder Init()
     }
 
     /// <inheritdoc />
-    protected override EventStoreDbBuilder Clone(IContainerConfiguration resourceConfiguration)
+    protected override EventStoreDbBuilder Clone(IResourceConfiguration<CreateContainerParameters> resourceConfiguration)
     {
         return Merge(DockerResourceConfiguration, new EventStoreDbConfiguration(resourceConfiguration));
     }
 
     /// <inheritdoc />
-    protected override EventStoreDbBuilder Clone(IResourceConfiguration<CreateContainerParameters> resourceConfiguration)
+    protected override EventStoreDbBuilder Clone(IContainerConfiguration resourceConfiguration)
     {
         return Merge(DockerResourceConfiguration, new EventStoreDbConfiguration(resourceConfiguration));
     }
diff --git a/src/Testcontainers.FakeGcsServer/FakeGcsServerBuilder.cs b/src/Testcontainers.FakeGcsServer/FakeGcsServerBuilder.cs
index 31664d075..d253da5fa 100644
--- a/src/Testcontainers.FakeGcsServer/FakeGcsServerBuilder.cs
+++ b/src/Testcontainers.FakeGcsServer/FakeGcsServerBuilder.cs
@@ -22,11 +22,11 @@ public FakeGcsServerBuilder()
     /// <summary>
     /// Initializes a new instance of the <see cref="FakeGcsServerBuilder" /> class.
     /// </summary>
-    /// <param name="dockerResourceConfiguration">The Docker resource configuration.</param>
-    private FakeGcsServerBuilder(FakeGcsServerConfiguration dockerResourceConfiguration)
-        : base(dockerResourceConfiguration)
+    /// <param name="resourceConfiguration">The Docker resource configuration.</param>
+    private FakeGcsServerBuilder(FakeGcsServerConfiguration resourceConfiguration)
+        : base(resourceConfiguration)
     {
-        DockerResourceConfiguration = dockerResourceConfiguration;
+        DockerResourceConfiguration = resourceConfiguration;
     }
 
     /// <inheritdoc />
diff --git a/src/Testcontainers.LocalStack/LocalStackBuilder.cs b/src/Testcontainers.LocalStack/LocalStackBuilder.cs
index f11f88d3e..3bfdca00c 100644
--- a/src/Testcontainers.LocalStack/LocalStackBuilder.cs
+++ b/src/Testcontainers.LocalStack/LocalStackBuilder.cs
@@ -20,11 +20,11 @@ public LocalStackBuilder()
     /// <summary>
     /// Initializes a new instance of the <see cref="LocalStackBuilder" /> class.
     /// </summary>
-    /// <param name="dockerResourceConfiguration">The Docker resource configuration.</param>
-    private LocalStackBuilder(LocalStackConfiguration dockerResourceConfiguration)
-        : base(dockerResourceConfiguration)
+    /// <param name="resourceConfiguration">The Docker resource configuration.</param>
+    private LocalStackBuilder(LocalStackConfiguration resourceConfiguration)
+        : base(resourceConfiguration)
     {
-        DockerResourceConfiguration = dockerResourceConfiguration;
+        DockerResourceConfiguration = resourceConfiguration;
     }
 
     /// <inheritdoc />
@@ -48,13 +48,13 @@ protected override LocalStackBuilder Init()
     }
 
     /// <inheritdoc />
-    protected override LocalStackBuilder Clone(IContainerConfiguration resourceConfiguration)
+    protected override LocalStackBuilder Clone(IResourceConfiguration<CreateContainerParameters> resourceConfiguration)
     {
         return Merge(DockerResourceConfiguration, new LocalStackConfiguration(resourceConfiguration));
     }
 
     /// <inheritdoc />
-    protected override LocalStackBuilder Clone(IResourceConfiguration<CreateContainerParameters> resourceConfiguration)
+    protected override LocalStackBuilder Clone(IContainerConfiguration resourceConfiguration)
     {
         return Merge(DockerResourceConfiguration, new LocalStackConfiguration(resourceConfiguration));
     }
diff --git a/src/Testcontainers.Minio/MinioBuilder.cs b/src/Testcontainers.Minio/MinioBuilder.cs
index 184c384b1..5373864ea 100644
--- a/src/Testcontainers.Minio/MinioBuilder.cs
+++ b/src/Testcontainers.Minio/MinioBuilder.cs
@@ -24,11 +24,11 @@ public MinioBuilder()
     /// <summary>
     /// Initializes a new instance of the <see cref="MinioBuilder" /> class.
     /// </summary>
-    /// <param name="dockerResourceConfiguration">The Docker resource configuration.</param>
-    private MinioBuilder(MinioConfiguration dockerResourceConfiguration)
-        : base(dockerResourceConfiguration)
+    /// <param name="resourceConfiguration">The Docker resource configuration.</param>
+    private MinioBuilder(MinioConfiguration resourceConfiguration)
+        : base(resourceConfiguration)
     {
-        DockerResourceConfiguration = dockerResourceConfiguration;
+        DockerResourceConfiguration = resourceConfiguration;
     }
 
     /// <inheritdoc />
@@ -91,13 +91,13 @@ protected override void Validate()
     }
 
     /// <inheritdoc />
-    protected override MinioBuilder Clone(IContainerConfiguration resourceConfiguration)
+    protected override MinioBuilder Clone(IResourceConfiguration<CreateContainerParameters> resourceConfiguration)
     {
         return Merge(DockerResourceConfiguration, new MinioConfiguration(resourceConfiguration));
     }
 
     /// <inheritdoc />
-    protected override MinioBuilder Clone(IResourceConfiguration<CreateContainerParameters> resourceConfiguration)
+    protected override MinioBuilder Clone(IContainerConfiguration resourceConfiguration)
     {
         return Merge(DockerResourceConfiguration, new MinioConfiguration(resourceConfiguration));
     }
diff --git a/tests/Testcontainers.Keycloak.Tests/KeycloakContainerTest.cs b/tests/Testcontainers.Keycloak.Tests/KeycloakContainerTest.cs
index 23884b4d8..1aac0872f 100644
--- a/tests/Testcontainers.Keycloak.Tests/KeycloakContainerTest.cs
+++ b/tests/Testcontainers.Keycloak.Tests/KeycloakContainerTest.cs
@@ -27,11 +27,11 @@ public async Task GetOpenIdEndpointReturnsHttpStatusCodeOk()
         httpClient.BaseAddress = new Uri(_keycloakContainer.GetBaseAddress());
 
         // When
-        using var response = await httpClient.GetAsync("/realms/master/.well-known/openid-configuration")
+        using var httpResponse = await httpClient.GetAsync("/realms/master/.well-known/openid-configuration")
             .ConfigureAwait(true);
 
         // Then
-        Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+        Assert.Equal(HttpStatusCode.OK, httpResponse.StatusCode);
     }
 
     [Fact]
diff --git a/tests/Testcontainers.Nats.Tests/NatsContainerTest.cs b/tests/Testcontainers.Nats.Tests/NatsContainerTest.cs
index 54ed07645..84847b43c 100644
--- a/tests/Testcontainers.Nats.Tests/NatsContainerTest.cs
+++ b/tests/Testcontainers.Nats.Tests/NatsContainerTest.cs
@@ -24,18 +24,18 @@ public Task DisposeAsync()
     public async Task HealthcheckReturnsHttpStatusCodeOk()
     {
         // Given
-        using var client = new HttpClient();
-        client.BaseAddress = new Uri(_natsContainer.GetManagementEndpoint());
+        using var httpClient = new HttpClient();
+        httpClient.BaseAddress = new Uri(_natsContainer.GetManagementEndpoint());
 
         // When
-        using var response = await client.GetAsync("/healthz")
+        using var httpResponse = await httpClient.GetAsync("/healthz")
             .ConfigureAwait(true);
 
-        var jsonStatusString = await response.Content.ReadAsStringAsync()
+        var jsonStatusString = await httpResponse.Content.ReadAsStringAsync()
             .ConfigureAwait(true);
 
         // Then
-        Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+        Assert.Equal(HttpStatusCode.OK, httpResponse.StatusCode);
         Assert.Equal("{\"status\":\"ok\"}", jsonStatusString);
     }
 
diff --git a/tests/Testcontainers.Pulsar.Tests/PulsarContainerTest.cs b/tests/Testcontainers.Pulsar.Tests/PulsarContainerTest.cs
index 76eac8184..b25d6aff2 100644
--- a/tests/Testcontainers.Pulsar.Tests/PulsarContainerTest.cs
+++ b/tests/Testcontainers.Pulsar.Tests/PulsarContainerTest.cs
@@ -84,20 +84,20 @@ public PulsarAuthConfiguration()
         {
         }
     }
-    
+
     [UsedImplicitly]
-    public sealed class PulsarDefaultConfigurationLts4 : PulsarContainerTest
+    public sealed class PulsarV4Configuration : PulsarContainerTest
     {
-        public PulsarDefaultConfigurationLts4()
+        public PulsarV4Configuration()
             : base(new PulsarBuilder().WithImage("apachepulsar/pulsar:4.0.2").Build(), false)
         {
         }
     }
-    
+
     [UsedImplicitly]
-    public sealed class PulsarAuthConfigurationLts4 : PulsarContainerTest
+    public sealed class PulsarV4AuthConfiguration : PulsarContainerTest
     {
-        public PulsarAuthConfigurationLts4()
+        public PulsarV4AuthConfiguration()
             : base(new PulsarBuilder().WithImage("apachepulsar/pulsar:4.0.2").WithAuthentication().Build(), true)
         {
         }