diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 648ea8f..095c83e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -26,6 +26,11 @@ jobs:
               uses: actions/setup-dotnet@v3
               with:
                   dotnet-version: '9.0'
+            
+            - name: Setup .NET 10.0
+              uses: actions/setup-dotnet@v3
+              with:
+                  dotnet-version: '10.0'
 
             - name: Build
               run: dotnet build Yllibed.HttpServer.slnx /p:Configuration=Release
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 19923cb..b774a97 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -13,6 +13,5 @@
     <PackageVersion Include="PolySharp" Version="1.15.0" />
     <PackageVersion Include="System.Collections.Immutable" Version="9.0.8" />
     <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="9.0.8" />
-    <PackageVersion Include="System.ValueTuple" Version="4.6.1" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Yllibed.HttpServer.Json.Tests/Yllibed.HttpServer.Json.Tests.csproj b/Yllibed.HttpServer.Json.Tests/Yllibed.HttpServer.Json.Tests.csproj
index 0d45916..55c36d9 100644
--- a/Yllibed.HttpServer.Json.Tests/Yllibed.HttpServer.Json.Tests.csproj
+++ b/Yllibed.HttpServer.Json.Tests/Yllibed.HttpServer.Json.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="MSTest.Sdk/3.10.4">
 	<PropertyGroup>
-		<TargetFrameworks>net9.0</TargetFrameworks>
+		<TargetFrameworks>net9.0;net10.0</TargetFrameworks>
 		<IsTestProject>true</IsTestProject>
 		<ImplicitUsings>enable</ImplicitUsings>
 	</PropertyGroup>
@@ -16,15 +16,12 @@
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 		<PackageReference Include="Microsoft.Extensions.Logging" />
-		<PackageReference Include="System.Diagnostics.DiagnosticSource" />
-		<PackageReference Include="System.ValueTuple" />
 		<PackageReference Update="Microsoft.NET.Test.Sdk" VersionOverride="17.14.1" />
 	</ItemGroup>
 
 	<ItemGroup>
 	  <ProjectReference Include="..\Yllibed.HttpServer.Json\Yllibed.HttpServer.Json.csproj" />
 	  <ProjectReference Include="..\Yllibed.HttpServer\Yllibed.HttpServer.csproj" />
-
 	  <Compile Include="..\Yllibed.HttpServer.Tests\SseTestClient.cs" Link="Shared\SseTestClient.cs" />
 	</ItemGroup>
 </Project>
diff --git a/Yllibed.HttpServer.Json/Yllibed.HttpServer.Json.csproj b/Yllibed.HttpServer.Json/Yllibed.HttpServer.Json.csproj
index 19a8bd1..883571f 100644
--- a/Yllibed.HttpServer.Json/Yllibed.HttpServer.Json.csproj
+++ b/Yllibed.HttpServer.Json/Yllibed.HttpServer.Json.csproj
@@ -1,5 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
+		<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
 		<PackageId>Yllibed.HttpServer.Json</PackageId>
 		<Title>Yllibed HttpServer Json Adapter</Title>
 		<Product>Yllibed HttpServer Json Adapter</Product>
diff --git a/Yllibed.HttpServer.Tests/Yllibed.HttpServer.Tests.csproj b/Yllibed.HttpServer.Tests/Yllibed.HttpServer.Tests.csproj
index e18dcf8..a5dfc2f 100644
--- a/Yllibed.HttpServer.Tests/Yllibed.HttpServer.Tests.csproj
+++ b/Yllibed.HttpServer.Tests/Yllibed.HttpServer.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="MSTest.Sdk/3.10.4">
 	<PropertyGroup>
-		<TargetFrameworks>net9.0</TargetFrameworks>
+		<TargetFrameworks>net9.0;net10.0</TargetFrameworks>
 		<ImplicitUsings>enable</ImplicitUsings>
 	</PropertyGroup>
 
@@ -18,8 +18,6 @@
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="System.Diagnostics.DiagnosticSource" />
-		<PackageReference Include="System.ValueTuple" />
 		<PackageReference Update="Microsoft.NET.Test.Sdk" VersionOverride="17.14.1" />
 	</ItemGroup>
 </Project>
diff --git a/Yllibed.HttpServer/Yllibed.HttpServer.csproj b/Yllibed.HttpServer/Yllibed.HttpServer.csproj
index dd47f20..e610fde 100644
--- a/Yllibed.HttpServer/Yllibed.HttpServer.csproj
+++ b/Yllibed.HttpServer/Yllibed.HttpServer.csproj
@@ -1,5 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
+		<TargetFrameworks>netstandard2.0;net8.0;net9.0;net10.0</TargetFrameworks>
 		<PackageId>Yllibed.HttpServer</PackageId>
 		<Title>Yllibed HttpServer</Title>
 		<Product>Yllibed HttpServer</Product>
@@ -21,6 +22,5 @@
 
 	<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
 		<PackageReference Include="System.Collections.Immutable" />
-		<PackageReference Include="System.ValueTuple" />
 	</ItemGroup>
 </Project>