From 5c9c7e659f561ca0e85d24ae7df1214d4c2f9bf1 Mon Sep 17 00:00:00 2001
From: Stef Heyenrath <Stef.Heyenrath@gmail.com>
Date: Wed, 10 Dec 2025 11:15:48 +0100
Subject: [PATCH 1/2] Update WireMockContainerBuilder (WithImage and
 WithCustomImage)

---
 .../WireMockContainerBuilder.cs               | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/WireMock.Net.Testcontainers/WireMockContainerBuilder.cs b/src/WireMock.Net.Testcontainers/WireMockContainerBuilder.cs
index 16cf55dd5..51282daf2 100644
--- a/src/WireMock.Net.Testcontainers/WireMockContainerBuilder.cs
+++ b/src/WireMock.Net.Testcontainers/WireMockContainerBuilder.cs
@@ -62,6 +62,29 @@ public WireMockContainerBuilder WithWindowsImage()
         return WithImage(OSPlatform.Windows);
     }
 
+    /// <summary>
+    /// Sets a custom WireMock.Net image for which to create the container.
+    /// </summary>
+    /// <param name="image">The image name.</param>
+    /// <returns>A configured instance of <see cref="WireMockContainerBuilder"/></returns>
+    [PublicAPI]
+    public new WireMockContainerBuilder WithImage(string image)
+    {
+        return WithCustomImage(image);
+    }
+
+    /// <summary>
+    /// Sets a custom WireMock.Net image for which to create the container.
+    /// </summary>
+    /// <param name="image">The image name.</param>
+    /// <returns>A configured instance of <see cref="WireMockContainerBuilder"/></returns>
+    [PublicAPI]
+    public WireMockContainerBuilder WithCustomImage(string image)
+    {
+        _imageOS ??= TestcontainersUtils.GetImageOSAsync.Value.GetAwaiter().GetResult();
+        return base.WithImage(image);
+    }
+
     /// <summary>
     /// Set the admin username and password for the container (basic authentication).
     /// </summary>

From e3e2dc7c6506e4428d55d1154e247de751c8c6cb Mon Sep 17 00:00:00 2001
From: Stef Heyenrath <stef.heyenrath@gmail.com>
Date: Thu, 11 Dec 2025 08:20:11 +0100
Subject: [PATCH 2/2] .

---
 test/WireMock.Net.Tests/Testcontainers/TestcontainersTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/WireMock.Net.Tests/Testcontainers/TestcontainersTests.cs b/test/WireMock.Net.Tests/Testcontainers/TestcontainersTests.cs
index cb1be0500..f3e198931 100644
--- a/test/WireMock.Net.Tests/Testcontainers/TestcontainersTests.cs
+++ b/test/WireMock.Net.Tests/Testcontainers/TestcontainersTests.cs
@@ -92,7 +92,7 @@ public async Task WireMockContainer_Build_WithImageAsText_And_StartAsync_and_Sto
         }
         else
         {
-            wireMockContainerBuilder = wireMockContainerBuilder.WithImage("sheyenrath/wiremock.net");
+            wireMockContainerBuilder = wireMockContainerBuilder.WithImage("sheyenrath/wiremock.net-alpine");
         }
 
         var wireMockContainer = wireMockContainerBuilder.Build();