diff --git a/src/Api/Api.csproj b/src/Api/Api.csproj
index 7b89a594..f78f2d8a 100644
--- a/src/Api/Api.csproj
+++ b/src/Api/Api.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
@@ -17,8 +17,10 @@
   <ItemGroup>
     <PackageReference Include="Amazon.CloudWatch.EMF" Version="2.2.0" />
     <PackageReference Include="AspNetCore.HealthChecks.MongoDb" Version="9.0.0" />
-    <PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.400.1" />
-    <PackageReference Include="AWSSDK.SimpleNotificationService" Version="3.7.502.55" />
+    <PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="4.0.3.26" />
+    <PackageReference Include="AWSSDK.SimpleNotificationService" Version="4.0.2.20" />
+    <!-- Ensure SecurityToken aligns with AWSSDK.Core 4.x to avoid NU1608 -->
+    <PackageReference Include="AWSSDK.SecurityToken" Version="4.0.5.13" />
     <PackageReference Include="Elastic.CommonSchema.Serilog" Version="9.0.0" />
     <PackageReference Include="Elastic.Serilog.Enrichers.Web" Version="9.0.0" />
     <PackageReference Include="FluentValidation" Version="12.1.1" />
@@ -33,7 +35,7 @@
     <PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.6" />
     <PackageReference Include="Swashbuckle.AspNetCore.ReDoc" Version="9.0.6" />
     <PackageReference Include="JsonPath.Net" Version="3.0.2" />
-    <PackageReference Include="JsonPatch.Net" Version="3.3.0" />
+    <PackageReference Include="JsonPatch.Net" Version="5.0.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Data\Data.csproj" />
diff --git a/src/Data/Data.csproj b/src/Data/Data.csproj
index 92c1219b..12134903 100644
--- a/src/Data/Data.csproj
+++ b/src/Data/Data.csproj
@@ -15,8 +15,8 @@
     <PackageReference Include="Microsoft.Extensions.Options" Version="10.0.5" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.5" />
     <PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="10.0.5" />
-    <PackageReference Include="MongoDB.Driver.Authentication.AWS" Version="3.7.0" />
-    <PackageReference Include="MongoDB.Driver" Version="3.7.0" />
+    <PackageReference Include="MongoDB.Driver.Authentication.AWS" Version="3.7.1" />
+    <PackageReference Include="MongoDB.Driver" Version="3.7.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Domain\Domain.csproj" />
diff --git a/tests/Api.Client.Tests/Api.Client.Tests.csproj b/tests/Api.Client.Tests/Api.Client.Tests.csproj
index 843bd9f5..a1883283 100644
--- a/tests/Api.Client.Tests/Api.Client.Tests.csproj
+++ b/tests/Api.Client.Tests/Api.Client.Tests.csproj
@@ -8,6 +8,10 @@
     <RootNamespace>Defra.TradeImportsDataApi.Api.Client.Tests</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
+    <!-- Force the package resolution to the version required by Humanizer.Core.af -->
+    <PackageReference Include="Humanizer" Version="3.0.10" />
+    <!-- Ensure SecurityToken aligns with AWSSDK.Core 4.x to avoid NU1608 -->
+    <PackageReference Include="AWSSDK.SecurityToken" Version="4.0.5.13" />
     <PackageReference Include="FluentValidation" Version="12.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.5" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
diff --git a/tests/Api.IntegrationTests/Api.IntegrationTests.csproj b/tests/Api.IntegrationTests/Api.IntegrationTests.csproj
index a1a2104d..9a4cfd28 100644
--- a/tests/Api.IntegrationTests/Api.IntegrationTests.csproj
+++ b/tests/Api.IntegrationTests/Api.IntegrationTests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -12,7 +12,11 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="AWSSDK.SQS" Version="3.7.502.51" />
+    <!-- Force the package resolution to the version required by Humanizer.Core.af -->
+    <PackageReference Include="Humanizer" Version="3.0.10" />
+    <!-- Ensure SecurityToken aligns with AWSSDK.Core 4.x to avoid NU1608 -->
+    <PackageReference Include="AWSSDK.SecurityToken" Version="4.0.5.13" />
+    <PackageReference Include="AWSSDK.SQS" Version="4.0.2.18" />
     <PackageReference Include="FluentValidation" Version="12.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.5" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
diff --git a/tests/Api.IntegrationTests/Endpoints/SqsTestBase.cs b/tests/Api.IntegrationTests/Endpoints/SqsTestBase.cs
index 1cdb8f5b..c83e5e43 100644
--- a/tests/Api.IntegrationTests/Endpoints/SqsTestBase.cs
+++ b/tests/Api.IntegrationTests/Endpoints/SqsTestBase.cs
@@ -49,8 +49,8 @@ protected async Task DrainAllMessages()
             await AsyncWaiter.WaitForAsync(async () =>
             {
                 var response = await ReceiveMessage();
-
-                foreach (var message in response.Messages)
+                var messages = response.Messages ?? [];
+                foreach (var message in messages)
                 {
                     testOutputHelper?.WriteLine("Drain message: {0} {1}", message.MessageId, message.Body);
 
diff --git a/tests/Api.Tests/Api.Tests.csproj b/tests/Api.Tests/Api.Tests.csproj
index 9885b23b..63a58570 100644
--- a/tests/Api.Tests/Api.Tests.csproj
+++ b/tests/Api.Tests/Api.Tests.csproj
@@ -8,6 +8,10 @@
     <RootNamespace>Defra.TradeImportsDataApi.Api.Tests</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
+    <!-- Force the package resolution to the version required by Humanizer.Core.af -->
+    <PackageReference Include="Humanizer" Version="3.0.10" />
+    <!-- Ensure SecurityToken aligns with AWSSDK.Core 4.x to avoid NU1608 -->
+    <PackageReference Include="AWSSDK.SecurityToken" Version="4.0.5.13" />
     <PackageReference Include="FluentValidation" Version="12.1.1" />
     <PackageReference Include="Microsoft.Extensions.Diagnostics.Testing" Version="10.4.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.5" />
diff --git a/tests/Testing/Testing.csproj b/tests/Testing/Testing.csproj
index 5d91efe0..e2eb4d47 100644
--- a/tests/Testing/Testing.csproj
+++ b/tests/Testing/Testing.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="AutoFixture.Xunit2" Version="4.18.1" />
-    <PackageReference Include="FluentAssertions" Version="8.8.0" />
+    <PackageReference Include="FluentAssertions" Version="8.9.0" />
     <PackageReference Include="MartinCostello.Logging.XUnit" Version="0.7.1" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.5" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
@@ -20,7 +20,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="WireMock.Net.FluentAssertions" Version="1.25.0" />
+    <PackageReference Include="WireMock.Net.FluentAssertions" Version="2.0.0" />
     <PackageReference Include="xunit" Version="2.9.3" />
     <PackageReference Include="NSubstitute" Version="5.3.0" />
     <PackageReference Include="Verify.Xunit" Version="31.12.5" />