diff --git a/Directory.Packages.props b/Directory.Packages.props
index 73073f00..32f76391 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -6,16 +6,16 @@
   <ItemGroup>
     <!-- Packages for all targets -->
     <PackageVersion Include="Amazon.Lambda.CloudWatchLogsEvents" Version="2.2.1"/>
-    <PackageVersion Include="Amazon.Lambda.Core" Version="2.8.0"/>
+    <PackageVersion Include="Amazon.Lambda.Core" Version="2.8.1"/>
     <PackageVersion Include="Amazon.Lambda.KafkaEvents" Version="2.1.1"/>
-    <PackageVersion Include="Amazon.Lambda.KinesisEvents" Version="3.0.1"/>
+    <PackageVersion Include="Amazon.Lambda.KinesisEvents" Version="3.0.2"/>
     <PackageVersion Include="Amazon.Lambda.KinesisFirehoseEvents" Version="2.3.1"/>
-    <PackageVersion Include="Amazon.Lambda.RuntimeSupport" Version="1.14.1"/>
+    <PackageVersion Include="Amazon.Lambda.RuntimeSupport" Version="1.14.2"/>
     <PackageVersion Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.5"/>
     <PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="10.0.0"/>
     <PackageVersion Include="AutoFixture.AutoNSubstitute" Version="4.18.1"/>
     <PackageVersion Include="AutoFixture.Xunit3" Version="4.19.0"/>
-    <PackageVersion Include="AWSSDK.Core" Version="4.0.3.9"/>
+    <PackageVersion Include="AWSSDK.Core" Version="4.0.3.20"/>
     <PackageVersion Include="Basic.Reference.Assemblies.Net100" Version="1.8.4"/>
     <PackageVersion Include="Basic.Reference.Assemblies.Net80" Version="1.8.4"/>
     <PackageVersion Include="BenchmarkDotNet" Version="0.15.8"/>
@@ -23,59 +23,62 @@
     <PackageVersion Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.3.9"/>
     <PackageVersion Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.3.9"/>
     <PackageVersion Include="Microsoft.AspNetCore.Routing" Version="2.3.9"/>
-    <PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="10.0.2"/>
-    <PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.2"/>
-    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0"/>
+    <PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="10.0.5"/>
+    <PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.5"/>
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.201"/>
     <!-- Source Gen Libraries -->
     <PackageVersion Include="Microsoft.CSharp" Version="4.7.0"/>
-    <PackageVersion Include="Microsoft.CodeAnalysis" Version="5.0.0"/>
-    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="4.14.0"/>
-    <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="5.0.0"/>
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0"/>
+    <PackageVersion Include="Microsoft.CodeAnalysis" Version="5.3.0"/>
+    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="5.3.0"/>
+    <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="5.3.0"/>
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.3.0"/>
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" Version="1.1.3"/>
     <PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17"/>
-    <PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.14.0"/>
+    <PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.15.0"/>
     <PackageVersion Include="PolySharp" Version="1.15.0"/>
-    <PackageVersion Include="Scriban" Version="6.5.2"/>
+    <PackageVersion Include="Scriban" Version="6.6.0"/>
     <!-- OTEL Libraries -->
     <PackageVersion Include="NSubstitute" Version="5.3.0"/>
-    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.14.0"/>
-    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.14.0"/>
+    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.0"/>
+    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.15.0"/>
     <!-- Testing Libraries -->
-    <PackageVersion Include="AwesomeAssertions" Version="9.3.0"/>
+    <PackageVersion Include="AwesomeAssertions" Version="9.4.0"/>
     <PackageVersion Include="Basic.Reference.Assemblies.Net90" Version="1.8.4"/>
     <PackageVersion Include="JetBrains.Annotations" Version="2025.2.4"/>
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1"/>
-    <PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.0.4"/>
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.3.0"/>
+    <PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.5.2"/>
     <PackageVersion Include="System.Formats.Asn1" Version="6.0.1"/>
     <PackageVersion Include="System.Net.Http" Version="4.3.4"/>
     <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1"/>
     <PackageVersion Include="Verify.SourceGenerators" Version="2.5.0"/>
-    <PackageVersion Include="Verify.XunitV3" Version="31.9.4"/>
+    <PackageVersion Include="Verify.XunitV3" Version="31.13.5"/>
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5"/>
-    <PackageVersion Include="xunit.v3" Version="3.2.2"/>
     <PackageVersion Include="AutoFixture" Version="4.18.1"/>
     <PackageVersion Include="AutoFixture.Xunit2" Version="4.18.1"/>
-    <PackageVersion Include="Microsoft.Extensions.Diagnostics.Testing" Version="10.2.0"/>
+    <PackageVersion Include="Microsoft.Extensions.Diagnostics.Testing" Version="10.4.0"/>
     <!-- Lambda Event Libraries -->
     <PackageVersion Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.3"/>
     <PackageVersion Include="Amazon.Lambda.ApplicationLoadBalancerEvents" Version="2.2.1"/>
     <PackageVersion Include="Amazon.Lambda.SNSEvents" Version="2.1.1"/>
     <PackageVersion Include="Amazon.Lambda.SQSEvents" Version="2.2.1"/>
+    <PackageVersion Include="xunit.v3.mtp-v2" Version="3.2.2"/>
   </ItemGroup>
   <!-- Conditional versions based on target framework -->
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+    <PackageVersion Include="System.Text.Json" Version="8.0.6"/>
+  </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1"/>
-    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1"/>
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="[8.0.1, 9.0.0)"/>
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="[8.0.1, 9.0.0)"/>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.10"/>
-    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.10"/>
-    <PackageVersion Include="OpenTelemetry.Instrumentation.AWSLambda" Version="1.14.2"/>
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="[9.0.14, 10.0.0)"/>
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="[9.0.14, 10.0.0)"/>
+    <PackageVersion Include="OpenTelemetry.Instrumentation.AWSLambda" Version="1.15.0"/>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.1"/>
-    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.1"/>
-    <PackageVersion Include="OpenTelemetry.Instrumentation.AWSLambda" Version="1.12.1"/>
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="[10.0.5, 11.0.0)"/>
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="[10.0.5, 11.0.0)"/>
+    <PackageVersion Include="OpenTelemetry.Instrumentation.AWSLambda" Version="1.15.0"/>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/MinimalLambda.SourceGenerators/MinimalLambda.SourceGenerators.csproj b/src/MinimalLambda.SourceGenerators/MinimalLambda.SourceGenerators.csproj
index ac94ac09..3db2ab7a 100644
--- a/src/MinimalLambda.SourceGenerators/MinimalLambda.SourceGenerators.csproj
+++ b/src/MinimalLambda.SourceGenerators/MinimalLambda.SourceGenerators.csproj
@@ -27,6 +27,7 @@
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all"/>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all"/>
     <PackageReference Include="Scriban" IncludeAssets="Build"/>
+    <PackageReference Include="System.Text.Json"/>
   </ItemGroup>
   <ItemGroup>
     <Compile Remove="Templates\*.scriban"/>
diff --git a/tests/MinimalLambda.Envelopes.UnitTests/MinimalLambda.Envelopes.UnitTests.csproj b/tests/MinimalLambda.Envelopes.UnitTests/MinimalLambda.Envelopes.UnitTests.csproj
index 6d1110d9..40df20d5 100644
--- a/tests/MinimalLambda.Envelopes.UnitTests/MinimalLambda.Envelopes.UnitTests.csproj
+++ b/tests/MinimalLambda.Envelopes.UnitTests/MinimalLambda.Envelopes.UnitTests.csproj
@@ -25,7 +25,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="xunit.v3"/>
+    <PackageReference Include="xunit.v3.mtp-v2"/>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Envelopes\MinimalLambda.Envelopes.ApiGateway\MinimalLambda.Envelopes.ApiGateway.csproj"/>
diff --git a/tests/MinimalLambda.OpenTelemetry.UnitTests/MinimalLambda.OpenTelemetry.UnitTests.csproj b/tests/MinimalLambda.OpenTelemetry.UnitTests/MinimalLambda.OpenTelemetry.UnitTests.csproj
index 777dce12..cd0d270f 100644
--- a/tests/MinimalLambda.OpenTelemetry.UnitTests/MinimalLambda.OpenTelemetry.UnitTests.csproj
+++ b/tests/MinimalLambda.OpenTelemetry.UnitTests/MinimalLambda.OpenTelemetry.UnitTests.csproj
@@ -36,7 +36,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="xunit.v3"/>
+    <PackageReference Include="xunit.v3.mtp-v2"/>
     <PackageReference Include="OpenTelemetry.Extensions.Hosting"/>
   </ItemGroup>
   <ItemGroup>
diff --git a/tests/MinimalLambda.SourceGenerators.UnitTests/MinimalLambda.SourceGenerators.UnitTests.csproj b/tests/MinimalLambda.SourceGenerators.UnitTests/MinimalLambda.SourceGenerators.UnitTests.csproj
index 358a341e..3f542e69 100644
--- a/tests/MinimalLambda.SourceGenerators.UnitTests/MinimalLambda.SourceGenerators.UnitTests.csproj
+++ b/tests/MinimalLambda.SourceGenerators.UnitTests/MinimalLambda.SourceGenerators.UnitTests.csproj
@@ -33,7 +33,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="xunit.v3"/>
+    <PackageReference Include="xunit.v3.mtp-v2"/>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\MinimalLambda\MinimalLambda.csproj"/>
diff --git a/tests/MinimalLambda.Testing.UnitTests/Tests/MinimalLambda.Testing.UnitTests/MinimalLambda.Testing.UnitTests.csproj b/tests/MinimalLambda.Testing.UnitTests/Tests/MinimalLambda.Testing.UnitTests/MinimalLambda.Testing.UnitTests.csproj
index b9196065..f6d68f16 100644
--- a/tests/MinimalLambda.Testing.UnitTests/Tests/MinimalLambda.Testing.UnitTests/MinimalLambda.Testing.UnitTests.csproj
+++ b/tests/MinimalLambda.Testing.UnitTests/Tests/MinimalLambda.Testing.UnitTests/MinimalLambda.Testing.UnitTests.csproj
@@ -32,7 +32,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="xunit.v3"/>
+    <PackageReference Include="xunit.v3.mtp-v2"/>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests/MinimalLambda.UnitTests/MinimalLambda.UnitTests.csproj b/tests/MinimalLambda.UnitTests/MinimalLambda.UnitTests.csproj
index a855f24c..d37e7f9c 100644
--- a/tests/MinimalLambda.UnitTests/MinimalLambda.UnitTests.csproj
+++ b/tests/MinimalLambda.UnitTests/MinimalLambda.UnitTests.csproj
@@ -41,7 +41,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="xunit.v3"/>
+    <PackageReference Include="xunit.v3.mtp-v2"/>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\MinimalLambda\MinimalLambda.csproj"/>