diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index cb89ade95..19a04aa99 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -13,7 +13,7 @@
     "ghcr.io/devcontainers/features/docker-in-docker:2": {
       "moby": true
     },
-    "ghcr.io/devcontainers/features/dotnet:2.2.2": {
+    "ghcr.io/devcontainers/features/dotnet:2.4.0": {
       "version": "9.0",
       "installUsingApt": false
     }
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 2e5189342..423e29db9 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -88,6 +88,6 @@
         <PackageVersion Include="RavenDB.Client" Version="5.4.100"/>
         <PackageVersion Include="Selenium.WebDriver" Version="4.8.1"/>
         <PackageVersion Include="StackExchange.Redis" Version="2.6.90"/>
-        <PackageVersion Include="Toxiproxy.Net" Version="2.0.1"/>
+        <PackageVersion Include="ToxiproxyNetCore" Version="1.0.40"/>
     </ItemGroup>
 </Project>
diff --git a/Testcontainers.dic b/Testcontainers.dic
index a8eab215e..24f1725ce 100644
--- a/Testcontainers.dic
+++ b/Testcontainers.dic
@@ -35,5 +35,6 @@ testcontainer
 testcontainers
 tlsverify
 toml
+toxiproxy
 vstest
 weaviate
\ No newline at end of file
diff --git a/Testcontainers.sln.DotSettings b/Testcontainers.sln.DotSettings
index 71a67e934..e3423d7d2 100644
--- a/Testcontainers.sln.DotSettings
+++ b/Testcontainers.sln.DotSettings
@@ -44,6 +44,7 @@
   <s:Boolean x:Key="/Default/UserDictionary/Words/=testcontainers/@EntryIndexedValue">True</s:Boolean>
   <s:Boolean x:Key="/Default/UserDictionary/Words/=tlsverify/@EntryIndexedValue">True</s:Boolean>
   <s:Boolean x:Key="/Default/UserDictionary/Words/=toml/@EntryIndexedValue">True</s:Boolean>
+  <s:Boolean x:Key="/Default/UserDictionary/Words/=toxiproxy/@EntryIndexedValue">True</s:Boolean>
   <s:Boolean x:Key="/Default/UserDictionary/Words/=vstest/@EntryIndexedValue">True</s:Boolean>
   <s:Boolean x:Key="/Default/UserDictionary/Words/=weaviate/@EntryIndexedValue">True</s:Boolean>
   <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CheckNamespace/@EntryIndexedValue">DO_NOT_SHOW</s:String>
diff --git a/docs/modules/playwright.md b/docs/modules/playwright.md
index 6c2bb3f74..73fc0ab95 100644
--- a/docs/modules/playwright.md
+++ b/docs/modules/playwright.md
@@ -41,7 +41,7 @@ To execute the tests, use the command `dotnet test` from a terminal.
 The Playwright container is configured with a network that can be shared with other containers. This is useful when testing applications that need to communicate with other services. Use the `GetNetwork()` method to access the container's network:
 
 ```csharp
-var helloWorldContainer = new ContainerBuilder()
-    .WithNetwork(playwrightContainer.GetNetwork())
+IContainer helloWorldContainer = new ContainerBuilder()
+    .WithNetwork(_playwrightContainer.GetNetwork())
     .Build();
 ```
\ No newline at end of file
diff --git a/src/Testcontainers.Mosquitto/MosquittoBuilder.cs b/src/Testcontainers.Mosquitto/MosquittoBuilder.cs
index ff0bb3b38..d02a53319 100644
--- a/src/Testcontainers.Mosquitto/MosquittoBuilder.cs
+++ b/src/Testcontainers.Mosquitto/MosquittoBuilder.cs
@@ -1,4 +1,4 @@
-namespace Testcontainers.Mosquitto;
+namespace Testcontainers.Mosquitto;
 
 /// <inheritdoc cref="ContainerBuilder{TBuilderEntity, TContainerEntity, TConfigurationEntity}" />
 [PublicAPI]
diff --git a/src/Testcontainers.Mosquitto/MosquittoConfiguration.cs b/src/Testcontainers.Mosquitto/MosquittoConfiguration.cs
index c2128bb3f..34c433720 100644
--- a/src/Testcontainers.Mosquitto/MosquittoConfiguration.cs
+++ b/src/Testcontainers.Mosquitto/MosquittoConfiguration.cs
@@ -1,4 +1,4 @@
-namespace Testcontainers.Mosquitto;
+namespace Testcontainers.Mosquitto;
 
 /// <inheritdoc cref="ContainerConfiguration" />
 [PublicAPI]
diff --git a/src/Testcontainers.Mosquitto/MosquittoContainer.cs b/src/Testcontainers.Mosquitto/MosquittoContainer.cs
index 2a40596df..4570d4ada 100644
--- a/src/Testcontainers.Mosquitto/MosquittoContainer.cs
+++ b/src/Testcontainers.Mosquitto/MosquittoContainer.cs
@@ -1,4 +1,4 @@
-namespace Testcontainers.Mosquitto;
+namespace Testcontainers.Mosquitto;
 
 /// <inheritdoc cref="DockerContainer" />
 [PublicAPI]
diff --git a/src/Testcontainers.Mosquitto/Testcontainers.Mosquitto.csproj b/src/Testcontainers.Mosquitto/Testcontainers.Mosquitto.csproj
index 058c1e82b..bff8ca4dd 100644
--- a/src/Testcontainers.Mosquitto/Testcontainers.Mosquitto.csproj
+++ b/src/Testcontainers.Mosquitto/Testcontainers.Mosquitto.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFrameworks>net8.0;net9.0;netstandard2.0;netstandard2.1</TargetFrameworks>
         <LangVersion>latest</LangVersion>
diff --git a/tests/Testcontainers.Mosquitto.Tests/Testcontainers.Mosquitto.Tests.csproj b/tests/Testcontainers.Mosquitto.Tests/Testcontainers.Mosquitto.Tests.csproj
index dd152d79e..2f1c01934 100644
--- a/tests/Testcontainers.Mosquitto.Tests/Testcontainers.Mosquitto.Tests.csproj
+++ b/tests/Testcontainers.Mosquitto.Tests/Testcontainers.Mosquitto.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFrameworks>net9.0</TargetFrameworks>
         <IsPackable>false</IsPackable>
diff --git a/tests/Testcontainers.Toxiproxy.Tests/Testcontainers.Toxiproxy.Tests.csproj b/tests/Testcontainers.Toxiproxy.Tests/Testcontainers.Toxiproxy.Tests.csproj
index 83a477bcc..43730ebec 100644
--- a/tests/Testcontainers.Toxiproxy.Tests/Testcontainers.Toxiproxy.Tests.csproj
+++ b/tests/Testcontainers.Toxiproxy.Tests/Testcontainers.Toxiproxy.Tests.csproj
@@ -11,7 +11,7 @@
         <PackageReference Include="coverlet.collector"/>
         <PackageReference Include="xunit.runner.visualstudio"/>
         <PackageReference Include="xunit.v3"/>
-        <PackageReference Include="Toxiproxy.Net"/>
+        <PackageReference Include="ToxiproxyNetCore"/>
         <PackageReference Include="StackExchange.Redis"/>
         <!-- -8<- [end:PackageReferences] -->
     </ItemGroup>
diff --git a/tests/Testcontainers.Toxiproxy.Tests/ToxiproxyContainerTest.cs b/tests/Testcontainers.Toxiproxy.Tests/ToxiproxyContainerTest.cs
index ae104a847..d4d36744d 100644
--- a/tests/Testcontainers.Toxiproxy.Tests/ToxiproxyContainerTest.cs
+++ b/tests/Testcontainers.Toxiproxy.Tests/ToxiproxyContainerTest.cs
@@ -73,7 +73,9 @@ public async Task LatencyToxicIncreasesResponseTime()
         proxy.Enabled = true;
         proxy.Listen = "0.0.0.0:" + redisProxyPort;
         proxy.Upstream = RedisNetworkAlias + ":6379";
-        var redisProxy = client.Add(proxy);
+
+        var redisProxy = await client.AddAsync(proxy)
+            .ConfigureAwait(true);
         // # --8<-- [end:ProxyConfiguration]
 
         // Don't establish a connection directly to the Redis container.
@@ -104,7 +106,9 @@ await db.StringSetAsync(key, value)
         latencyToxic.Toxicity = 1;
         latencyToxic.Attributes.Latency = 1100;
         latencyToxic.Attributes.Jitter = 100;
-        redisProxy.Add(latencyToxic);
+
+        await redisProxy.AddAsync(latencyToxic)
+            .ConfigureAwait(true);
         // # --8<-- [end:ToxicConfiguration]
 
         var latencyWithToxic = await MeasureLatencyAsync(db, key, value)