diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml
index 0aa5bbc397..71b06339b8 100644
--- a/.github/workflows/build-dev.yml
+++ b/.github/workflows/build-dev.yml
@@ -24,6 +24,7 @@ jobs:
     strategy:
       matrix:
         dotnet:
+          - net8.0
           - net7.0
           - net6.0
         test:
@@ -34,15 +35,14 @@ jobs:
           
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: "7.0.x"
-          include-prerelease: true
-      - uses: actions/setup-dotnet@v2
+          fetch-depth: 0
+      - uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
+            8.0.x
+            7.0.x
             6.0.x
-            3.1.x
 
       - name: Run tests ${{ matrix.test }}
         timeout-minutes: 15
@@ -65,15 +65,14 @@ jobs:
             
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: "7.0.x"
-          include-prerelease: true
-      - uses: actions/setup-dotnet@v2
+          fetch-depth: 0
+      - uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
+            8.0.x
+            7.0.x
             6.0.x
-            3.1.x
       - name: Run tests ${{ matrix.test }}
         timeout-minutes: 15
         run: |
@@ -87,18 +86,14 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - uses: actions/setup-dotnet@v2
-        with:
-          dotnet-version: "7.0.102"
-          include-prerelease: true
-      - uses: actions/setup-dotnet@v2
+      - uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
+            8.0.x
+            7.0.x
             6.0.x
-            3.1.x
           
       - name: Create and push NuGet package
         run: |
           dotnet pack ProtoActor.sln -c Release -o nuget -p:SymbolPackageFormat=snupkg -p:GenerateDocumentationFile=true -p:NoWarn=CS1591
           dotnet nuget push nuget/**/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate
-          
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 855052d79c..0827b4ca54 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -23,15 +23,14 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: "7.0.x"
-          include-prerelease: true
-      - uses: actions/setup-dotnet@v2
+          fetch-depth: 0
+      - uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
+            8.0.x
+            7.0.x
             6.0.x
-            3.1.x
 
       - name: Build
         run: dotnet build ProtoActor.sln -c Release
@@ -49,6 +48,7 @@ jobs:
     strategy:
       matrix:
         dotnet:
+          - net8.0
           - net7.0
           - net6.0
         test:
@@ -59,15 +59,14 @@ jobs:
     
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: "7.0.x"
-          include-prerelease: true
-      - uses: actions/setup-dotnet@v2
+          fetch-depth: 0
+      - uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
+            8.0.x
+            7.0.x
             6.0.x
-            3.1.x
 
       - name: Run tests ${{ matrix.test }}
         timeout-minutes: 15
@@ -90,16 +89,15 @@ jobs:
     
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: "7.0.x"
-          include-prerelease: true
-      - uses: actions/setup-dotnet@v2
+          fetch-depth: 0
+      - uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
+            8.0.x
+            7.0.x
             6.0.x
-            3.1.x
       - name: Run tests ${{ matrix.test }}
         timeout-minutes: 15
         run: |
-          dotnet test ${{ matrix.test }} -c Release --logger GitHubActions
\ No newline at end of file
+          dotnet test ${{ matrix.test }} -c Release --logger GitHubActions
diff --git a/benchmarks/AutoClusterBenchmark/AutoClusterBenchmark.csproj b/benchmarks/AutoClusterBenchmark/AutoClusterBenchmark.csproj
index 5bf2b5f32e..794a204548 100644
--- a/benchmarks/AutoClusterBenchmark/AutoClusterBenchmark.csproj
+++ b/benchmarks/AutoClusterBenchmark/AutoClusterBenchmark.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <NoWarn>8981</NoWarn>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
         <OutputType>Exe</OutputType>
         <LangVersion>10</LangVersion>
         <RootNamespace>ClusterExperiment1</RootNamespace>
diff --git a/benchmarks/ClusterBenchmark/ClusterBenchmark.csproj b/benchmarks/ClusterBenchmark/ClusterBenchmark.csproj
index 6d9476b863..ea09a913dc 100644
--- a/benchmarks/ClusterBenchmark/ClusterBenchmark.csproj
+++ b/benchmarks/ClusterBenchmark/ClusterBenchmark.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <NoWarn>8981</NoWarn>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
         <OutputType>Exe</OutputType>
         <LangVersion>10</LangVersion>
         <RootNamespace>ClusterExperiment1</RootNamespace>
diff --git a/benchmarks/ClusterMicroBenchmarks/ClusterMicroBenchmarks.csproj b/benchmarks/ClusterMicroBenchmarks/ClusterMicroBenchmarks.csproj
index 3ec657f160..d16026d7b7 100644
--- a/benchmarks/ClusterMicroBenchmarks/ClusterMicroBenchmarks.csproj
+++ b/benchmarks/ClusterMicroBenchmarks/ClusterMicroBenchmarks.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
         <LangVersion>10</LangVersion>
     </PropertyGroup>
 
diff --git a/benchmarks/GossipBenchmark/Messages/Messages.csproj b/benchmarks/GossipBenchmark/Messages/Messages.csproj
index 288e022bda..7a59490198 100644
--- a/benchmarks/GossipBenchmark/Messages/Messages.csproj
+++ b/benchmarks/GossipBenchmark/Messages/Messages.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <NoWarn>8981</NoWarn>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Google.Protobuf" Version="3.22.0" />
@@ -19,4 +19,4 @@
     <ProjectReference Include="..\..\..\src\Proto.Cluster\Proto.Cluster.csproj" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/benchmarks/GossipBenchmark/Node1/Node1.csproj b/benchmarks/GossipBenchmark/Node1/Node1.csproj
index cf49771983..6b293e7293 100644
--- a/benchmarks/GossipBenchmark/Node1/Node1.csproj
+++ b/benchmarks/GossipBenchmark/Node1/Node1.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
     <LangVersion>10</LangVersion>
@@ -13,4 +13,4 @@
     <ProjectReference Include="..\..\..\src\Proto.Remote\Proto.Remote.csproj" />
     <ProjectReference Include="..\Messages\Messages.csproj" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/benchmarks/GossipBenchmark/Node2/Node2.csproj b/benchmarks/GossipBenchmark/Node2/Node2.csproj
index cf49771983..6b293e7293 100644
--- a/benchmarks/GossipBenchmark/Node2/Node2.csproj
+++ b/benchmarks/GossipBenchmark/Node2/Node2.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
     <LangVersion>10</LangVersion>
@@ -13,4 +13,4 @@
     <ProjectReference Include="..\..\..\src\Proto.Remote\Proto.Remote.csproj" />
     <ProjectReference Include="..\Messages\Messages.csproj" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/benchmarks/InprocessBenchmark/InprocessBenchmark.csproj b/benchmarks/InprocessBenchmark/InprocessBenchmark.csproj
index 0c2d8169e6..29f982fc77 100644
--- a/benchmarks/InprocessBenchmark/InprocessBenchmark.csproj
+++ b/benchmarks/InprocessBenchmark/InprocessBenchmark.csproj
@@ -3,10 +3,10 @@
     <OutputType>Exe</OutputType>
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <LangVersion>10</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Proto.Actor\Proto.Actor.csproj" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/benchmarks/MailboxBenchmark/MailboxBenchmark.csproj b/benchmarks/MailboxBenchmark/MailboxBenchmark.csproj
index 5c5fd833c0..bc03e6c5c9 100644
--- a/benchmarks/MailboxBenchmark/MailboxBenchmark.csproj
+++ b/benchmarks/MailboxBenchmark/MailboxBenchmark.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Proto.Actor\Proto.Actor.csproj" />
@@ -9,4 +9,4 @@
   <ItemGroup>
     <PackageReference Include="BenchmarkDotnet" Version="0.13.2" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/benchmarks/PingPongBenchmark/LocalPingPong.csproj b/benchmarks/PingPongBenchmark/LocalPingPong.csproj
index acbd30723e..252b5f5ba5 100644
--- a/benchmarks/PingPongBenchmark/LocalPingPong.csproj
+++ b/benchmarks/PingPongBenchmark/LocalPingPong.csproj
@@ -4,7 +4,7 @@
     <OutputType>Exe</OutputType>
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <LangVersion>10</LangVersion>
   </PropertyGroup>
 
@@ -12,4 +12,4 @@
     <ProjectReference Include="..\..\src\Proto.Actor\Proto.Actor.csproj" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/benchmarks/PropsBenchmark/PropsBenchmark.csproj b/benchmarks/PropsBenchmark/PropsBenchmark.csproj
index f2fb51d387..b8ad9b97f3 100644
--- a/benchmarks/PropsBenchmark/PropsBenchmark.csproj
+++ b/benchmarks/PropsBenchmark/PropsBenchmark.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>
diff --git a/benchmarks/ProtoActorBenchmarks/ProtoActorBenchmarks.csproj b/benchmarks/ProtoActorBenchmarks/ProtoActorBenchmarks.csproj
index c6897e67fd..a2bd2ae444 100644
--- a/benchmarks/ProtoActorBenchmarks/ProtoActorBenchmarks.csproj
+++ b/benchmarks/ProtoActorBenchmarks/ProtoActorBenchmarks.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <LangVersion>10</LangVersion>
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
diff --git a/benchmarks/RemoteBenchmark/Messages/Messages.csproj b/benchmarks/RemoteBenchmark/Messages/Messages.csproj
index b611f2d2ba..3957e8928d 100644
--- a/benchmarks/RemoteBenchmark/Messages/Messages.csproj
+++ b/benchmarks/RemoteBenchmark/Messages/Messages.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
     <NoWarn>8981</NoWarn>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Google.Protobuf" Version="3.22.0" />
@@ -15,4 +15,4 @@
   <ItemGroup>
     <Protobuf Include="Protos.proto" GrpcServices="Server" AdditionalImportDirs=".; ..\..\..\src" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/benchmarks/RemoteBenchmark/Node1/Node1.csproj b/benchmarks/RemoteBenchmark/Node1/Node1.csproj
index 26d3f9a327..597438389a 100644
--- a/benchmarks/RemoteBenchmark/Node1/Node1.csproj
+++ b/benchmarks/RemoteBenchmark/Node1/Node1.csproj
@@ -4,7 +4,7 @@
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
     <LangVersion>10</LangVersion>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
   </PropertyGroup>
   
   <ItemGroup>
@@ -18,4 +18,4 @@
   <PropertyGroup Condition="'$(TargetFramework)' != 'net5.0'">
     <DefineConstants>NETCORE</DefineConstants>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/benchmarks/RemoteBenchmark/Node2/Node2.csproj b/benchmarks/RemoteBenchmark/Node2/Node2.csproj
index 965f3ceffe..2cf2734a1b 100644
--- a/benchmarks/RemoteBenchmark/Node2/Node2.csproj
+++ b/benchmarks/RemoteBenchmark/Node2/Node2.csproj
@@ -4,7 +4,7 @@
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
     <LangVersion>10</LangVersion>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\Proto.Actor\Proto.Actor.csproj" />
@@ -17,4 +17,4 @@
   <PropertyGroup Condition="'$(TargetFramework)' != 'net5.0'">
     <DefineConstants>NETCORE</DefineConstants>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/benchmarks/SpawnBenchmark/SpawnBenchmark.csproj b/benchmarks/SpawnBenchmark/SpawnBenchmark.csproj
index 88838bd0a2..e8b6721ea3 100644
--- a/benchmarks/SpawnBenchmark/SpawnBenchmark.csproj
+++ b/benchmarks/SpawnBenchmark/SpawnBenchmark.csproj
@@ -4,9 +4,9 @@
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
     <LangVersion>10</LangVersion>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Proto.Actor\Proto.Actor.csproj" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Proto.Actor/Proto.Actor.csproj b/src/Proto.Actor/Proto.Actor.csproj
index fc016a298b..56bda8a96c 100644
--- a/src/Proto.Actor/Proto.Actor.csproj
+++ b/src/Proto.Actor/Proto.Actor.csproj
@@ -5,7 +5,7 @@
         <Nullable>enable</Nullable>
         <IsPackable>true</IsPackable>
         <LangVersion>10</LangVersion>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
@@ -23,4 +23,4 @@
     <ItemGroup>
         <Protobuf Include="Protos.proto" GrpcServices="Server" />
     </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Proto.Cluster.AmazonECS/Proto.Cluster.AmazonECS.csproj b/src/Proto.Cluster.AmazonECS/Proto.Cluster.AmazonECS.csproj
index 20bbf79dee..39a3984124 100644
--- a/src/Proto.Cluster.AmazonECS/Proto.Cluster.AmazonECS.csproj
+++ b/src/Proto.Cluster.AmazonECS/Proto.Cluster.AmazonECS.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <LangVersion>10</LangVersion>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/Proto.Cluster.AzureContainerApps/Proto.Cluster.AzureContainerApps.csproj b/src/Proto.Cluster.AzureContainerApps/Proto.Cluster.AzureContainerApps.csproj
index 651b42e39c..aa6f65d03c 100644
--- a/src/Proto.Cluster.AzureContainerApps/Proto.Cluster.AzureContainerApps.csproj
+++ b/src/Proto.Cluster.AzureContainerApps/Proto.Cluster.AzureContainerApps.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
     <PropertyGroup>
         <LangVersion>10</LangVersion>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Azure.Identity" Version="1.10.2" />
diff --git a/src/Proto.Cluster.Consul/Proto.Cluster.Consul.csproj b/src/Proto.Cluster.Consul/Proto.Cluster.Consul.csproj
index 551600f354..482452e16b 100644
--- a/src/Proto.Cluster.Consul/Proto.Cluster.Consul.csproj
+++ b/src/Proto.Cluster.Consul/Proto.Cluster.Consul.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
     <PropertyGroup>
         <LangVersion>10</LangVersion>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Consul" Version="1.6.10.7" />
@@ -10,4 +10,4 @@
     <ItemGroup>
         <ProjectReference Include="..\Proto.Cluster\Proto.Cluster.csproj" />
     </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Proto.Cluster.Identity.MongoDb/Proto.Cluster.Identity.MongoDb.csproj b/src/Proto.Cluster.Identity.MongoDb/Proto.Cluster.Identity.MongoDb.csproj
index c6e0e2ca7d..b6a87a24b1 100644
--- a/src/Proto.Cluster.Identity.MongoDb/Proto.Cluster.Identity.MongoDb.csproj
+++ b/src/Proto.Cluster.Identity.MongoDb/Proto.Cluster.Identity.MongoDb.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <LangVersion>10</LangVersion>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
         <Nullable>enable</Nullable>
     </PropertyGroup>
 
diff --git a/src/Proto.Cluster.Identity.Redis/Proto.Cluster.Identity.Redis.csproj b/src/Proto.Cluster.Identity.Redis/Proto.Cluster.Identity.Redis.csproj
index b7ed22413a..52a90d1de4 100644
--- a/src/Proto.Cluster.Identity.Redis/Proto.Cluster.Identity.Redis.csproj
+++ b/src/Proto.Cluster.Identity.Redis/Proto.Cluster.Identity.Redis.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <LangVersion>10</LangVersion>
         <Nullable>enable</Nullable>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/Proto.Cluster.Kubernetes/Proto.Cluster.Kubernetes.csproj b/src/Proto.Cluster.Kubernetes/Proto.Cluster.Kubernetes.csproj
index 2fb15e176f..d9503bce05 100644
--- a/src/Proto.Cluster.Kubernetes/Proto.Cluster.Kubernetes.csproj
+++ b/src/Proto.Cluster.Kubernetes/Proto.Cluster.Kubernetes.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <LangVersion>10</LangVersion>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/Proto.Cluster.SeedNode.MongoDb/Proto.Cluster.SeedNode.MongoDb.csproj b/src/Proto.Cluster.SeedNode.MongoDb/Proto.Cluster.SeedNode.MongoDb.csproj
index dd11e2de43..9dc755994d 100644
--- a/src/Proto.Cluster.SeedNode.MongoDb/Proto.Cluster.SeedNode.MongoDb.csproj
+++ b/src/Proto.Cluster.SeedNode.MongoDb/Proto.Cluster.SeedNode.MongoDb.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <IsPackable>true</IsPackable>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>
diff --git a/src/Proto.Cluster.SeedNode.Redis/Proto.Cluster.SeedNode.Redis.csproj b/src/Proto.Cluster.SeedNode.Redis/Proto.Cluster.SeedNode.Redis.csproj
index ec7af768fd..fa186fd4a5 100644
--- a/src/Proto.Cluster.SeedNode.Redis/Proto.Cluster.SeedNode.Redis.csproj
+++ b/src/Proto.Cluster.SeedNode.Redis/Proto.Cluster.SeedNode.Redis.csproj
@@ -5,7 +5,7 @@
         <IsPackable>true</IsPackable>
         <Nullable>enable</Nullable>
         <LangVersion>10</LangVersion>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/Proto.Cluster.TestProvider/Proto.Cluster.TestProvider.csproj b/src/Proto.Cluster.TestProvider/Proto.Cluster.TestProvider.csproj
index 6f782065f1..b61d1434ec 100644
--- a/src/Proto.Cluster.TestProvider/Proto.Cluster.TestProvider.csproj
+++ b/src/Proto.Cluster.TestProvider/Proto.Cluster.TestProvider.csproj
@@ -2,7 +2,7 @@
     <PropertyGroup>
         <RootNamespace>Proto.Cluster.Consul</RootNamespace>
         <LangVersion>10</LangVersion>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
@@ -10,4 +10,4 @@
     <ItemGroup>
         <ProjectReference Include="..\Proto.Cluster\Proto.Cluster.csproj" />
     </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Proto.Cluster/Proto.Cluster.csproj b/src/Proto.Cluster/Proto.Cluster.csproj
index 98648bb6de..0b8b6785e6 100644
--- a/src/Proto.Cluster/Proto.Cluster.csproj
+++ b/src/Proto.Cluster/Proto.Cluster.csproj
@@ -4,7 +4,7 @@
         <IsPackable>true</IsPackable>
         <Nullable>enable</Nullable>
         <LangVersion>10</LangVersion>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Grpc.Tools" Version="2.51.0" PrivateAssets="All" />
@@ -19,4 +19,4 @@
         <Protobuf Include="PubSubContracts.proto" GrpcServices="Server" AdditionalImportDirs=".; ..\..\src" />
         <Protobuf Include="GrainContracts.proto" GrpcServices="Server" AdditionalImportDirs=".; ..\..\src" />
     </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Proto.OpenTelemetry/Proto.OpenTelemetry.csproj b/src/Proto.OpenTelemetry/Proto.OpenTelemetry.csproj
index b1db379ff8..c29c1aa30a 100644
--- a/src/Proto.OpenTelemetry/Proto.OpenTelemetry.csproj
+++ b/src/Proto.OpenTelemetry/Proto.OpenTelemetry.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
         <Nullable>enable</Nullable>
         <LangVersion>10</LangVersion>
     </PropertyGroup>
diff --git a/src/Proto.Persistence.Couchbase/Proto.Persistence.Couchbase.csproj b/src/Proto.Persistence.Couchbase/Proto.Persistence.Couchbase.csproj
index d1935ba263..9702ba59ae 100644
--- a/src/Proto.Persistence.Couchbase/Proto.Persistence.Couchbase.csproj
+++ b/src/Proto.Persistence.Couchbase/Proto.Persistence.Couchbase.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="CouchbaseNetClient" Version="2.7.22" />
@@ -8,4 +8,4 @@
     <ItemGroup>
         <ProjectReference Include="..\Proto.Persistence\Proto.Persistence.csproj" />
     </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Proto.Persistence.DynamoDB/Proto.Persistence.DynamoDB.csproj b/src/Proto.Persistence.DynamoDB/Proto.Persistence.DynamoDB.csproj
index 7e0c431246..e37ee381f6 100644
--- a/src/Proto.Persistence.DynamoDB/Proto.Persistence.DynamoDB.csproj
+++ b/src/Proto.Persistence.DynamoDB/Proto.Persistence.DynamoDB.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.101.8" />
@@ -8,4 +8,4 @@
     <ItemGroup>
         <ProjectReference Include="..\Proto.Persistence\Proto.Persistence.csproj" />
     </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Proto.Persistence.Marten/Proto.Persistence.Marten.csproj b/src/Proto.Persistence.Marten/Proto.Persistence.Marten.csproj
index 152a9d9fb3..3d2d04af28 100644
--- a/src/Proto.Persistence.Marten/Proto.Persistence.Marten.csproj
+++ b/src/Proto.Persistence.Marten/Proto.Persistence.Marten.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Marten" Version="6.0.2" />
@@ -9,4 +9,4 @@
     <ItemGroup>
         <ProjectReference Include="..\Proto.Persistence\Proto.Persistence.csproj" />
     </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Proto.Persistence.MongoDB/Proto.Persistence.MongoDB.csproj b/src/Proto.Persistence.MongoDB/Proto.Persistence.MongoDB.csproj
index e050536dc2..7e0b5c7c8b 100644
--- a/src/Proto.Persistence.MongoDB/Proto.Persistence.MongoDB.csproj
+++ b/src/Proto.Persistence.MongoDB/Proto.Persistence.MongoDB.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="MongoDB.Driver" Version="2.19.0" />
@@ -8,4 +8,4 @@
     <ItemGroup>
         <ProjectReference Include="..\Proto.Persistence\Proto.Persistence.csproj" />
     </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Proto.Persistence.RavenDB/Proto.Persistence.RavenDB.csproj b/src/Proto.Persistence.RavenDB/Proto.Persistence.RavenDB.csproj
index 82d6b5110b..53b5a50fe7 100644
--- a/src/Proto.Persistence.RavenDB/Proto.Persistence.RavenDB.csproj
+++ b/src/Proto.Persistence.RavenDB/Proto.Persistence.RavenDB.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="RavenDB.Client" Version="5.3.100" />
@@ -8,4 +8,4 @@
     <ItemGroup>
         <ProjectReference Include="..\Proto.Persistence\Proto.Persistence.csproj" />
     </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Proto.Persistence.SqlServer/Proto.Persistence.SqlServer.csproj b/src/Proto.Persistence.SqlServer/Proto.Persistence.SqlServer.csproj
index 86c0dca169..52bd0e11f0 100644
--- a/src/Proto.Persistence.SqlServer/Proto.Persistence.SqlServer.csproj
+++ b/src/Proto.Persistence.SqlServer/Proto.Persistence.SqlServer.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
@@ -9,4 +9,4 @@
     <ItemGroup>
         <ProjectReference Include="..\Proto.Persistence\Proto.Persistence.csproj" />
     </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Proto.Persistence.Sqlite/Proto.Persistence.Sqlite.csproj b/src/Proto.Persistence.Sqlite/Proto.Persistence.Sqlite.csproj
index 29ee181e40..c6cce6f4f2 100644
--- a/src/Proto.Persistence.Sqlite/Proto.Persistence.Sqlite.csproj
+++ b/src/Proto.Persistence.Sqlite/Proto.Persistence.Sqlite.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.12" />
@@ -9,4 +9,4 @@
     <ItemGroup>
         <ProjectReference Include="..\Proto.Persistence\Proto.Persistence.csproj" />
     </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Proto.Persistence/Proto.Persistence.csproj b/src/Proto.Persistence/Proto.Persistence.csproj
index af653d715b..4c2e3f967d 100644
--- a/src/Proto.Persistence/Proto.Persistence.csproj
+++ b/src/Proto.Persistence/Proto.Persistence.csproj
@@ -3,8 +3,8 @@
         <IsPackable>true</IsPackable>
         <Nullable>enable</Nullable>
         <LangVersion>10</LangVersion>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
     </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Proto.Remote/Proto.Remote.csproj b/src/Proto.Remote/Proto.Remote.csproj
index 7bfc12338f..7dac8e4ffe 100644
--- a/src/Proto.Remote/Proto.Remote.csproj
+++ b/src/Proto.Remote/Proto.Remote.csproj
@@ -4,7 +4,7 @@
         <IsPackable>true</IsPackable>
         <Nullable>enable</Nullable>
         <LangVersion>10</LangVersion>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
@@ -22,4 +22,4 @@
         <Protobuf Include="Protos.proto" GrpcServices="Client;Server" AdditionalImportDirs=".; ..\..\src" />
         <None Remove="HealthCheck.proto" />
     </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Proto.TestKit/Proto.TestKit.csproj b/src/Proto.TestKit/Proto.TestKit.csproj
index e86cba7549..2ccb6c424a 100644
--- a/src/Proto.TestKit/Proto.TestKit.csproj
+++ b/src/Proto.TestKit/Proto.TestKit.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
         <IsPackable>true</IsPackable>
         <Nullable>enable</Nullable>
         <LangVersion>10</LangVersion>
@@ -12,4 +12,4 @@
 
     <ItemGroup>
     </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/tests/Proto.Actor.Tests/Proto.Actor.Tests.csproj b/tests/Proto.Actor.Tests/Proto.Actor.Tests.csproj
index d10d24640b..b9df02f9b4 100644
--- a/tests/Proto.Actor.Tests/Proto.Actor.Tests.csproj
+++ b/tests/Proto.Actor.Tests/Proto.Actor.Tests.csproj
@@ -4,11 +4,11 @@
         <RootNamespace>Proto.Tests</RootNamespace>
         <LangVersion>10</LangVersion>
         <OutputType>Library</OutputType>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
         <Nullable>enable</Nullable>
     </PropertyGroup>
     <ItemGroup>
         <ProjectReference Include="..\..\src\Proto.Actor\Proto.Actor.csproj" />
         <ProjectReference Include="..\Proto.TestFixtures\Proto.TestFixtures.csproj" />
     </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/tests/Proto.Cluster.CodeGen.Tests/Proto.Cluster.CodeGen.Tests.csproj b/tests/Proto.Cluster.CodeGen.Tests/Proto.Cluster.CodeGen.Tests.csproj
index 97a290e6a8..c56bc80a11 100644
--- a/tests/Proto.Cluster.CodeGen.Tests/Proto.Cluster.CodeGen.Tests.csproj
+++ b/tests/Proto.Cluster.CodeGen.Tests/Proto.Cluster.CodeGen.Tests.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <IsPackable>false</IsPackable>
         <OutputType>Library</OutputType>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/tests/Proto.Cluster.Identity.Tests/Proto.Cluster.Identity.Tests.csproj b/tests/Proto.Cluster.Identity.Tests/Proto.Cluster.Identity.Tests.csproj
index a1220af0de..12a9984e0c 100644
--- a/tests/Proto.Cluster.Identity.Tests/Proto.Cluster.Identity.Tests.csproj
+++ b/tests/Proto.Cluster.Identity.Tests/Proto.Cluster.Identity.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
     <PropertyGroup>
         <LangVersion>10</LangVersion>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
         <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
         <DockerComposeProjectPath>..\docker-compose\docker-compose.dcproj</DockerComposeProjectPath>
         <Nullable>enable</Nullable>
@@ -18,4 +18,4 @@
     <ItemGroup>
         <None Update="*.json" CopyToOutputDirectory="Always" CopyToPublishDirectory="Always" />
     </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/tests/Proto.Cluster.MongoIdentity.Tests/Proto.Cluster.MongoIdentity.Tests.csproj b/tests/Proto.Cluster.MongoIdentity.Tests/Proto.Cluster.MongoIdentity.Tests.csproj
index 0dd5d43076..8fbb82e1af 100644
--- a/tests/Proto.Cluster.MongoIdentity.Tests/Proto.Cluster.MongoIdentity.Tests.csproj
+++ b/tests/Proto.Cluster.MongoIdentity.Tests/Proto.Cluster.MongoIdentity.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
     <PropertyGroup>
         <LangVersion>10</LangVersion>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
         <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
         <DockerComposeProjectPath>..\docker-compose\docker-compose.dcproj</DockerComposeProjectPath>
         <Nullable>enable</Nullable>
@@ -19,4 +19,4 @@
     <ItemGroup>
         <None Update="*.json" CopyToOutputDirectory="Always" CopyToPublishDirectory="Always" />
     </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/tests/Proto.Cluster.PartitionIdentity.Tests/Proto.Cluster.PartitionIdentity.Tests.csproj b/tests/Proto.Cluster.PartitionIdentity.Tests/Proto.Cluster.PartitionIdentity.Tests.csproj
index 96faeb58e5..006707f044 100644
--- a/tests/Proto.Cluster.PartitionIdentity.Tests/Proto.Cluster.PartitionIdentity.Tests.csproj
+++ b/tests/Proto.Cluster.PartitionIdentity.Tests/Proto.Cluster.PartitionIdentity.Tests.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <NoWarn>8981</NoWarn>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
         <Nullable>enable</Nullable>
         <IsPackable>false</IsPackable>
         <LangVersion>10</LangVersion>
diff --git a/tests/Proto.Cluster.PubSub.Tests/Proto.Cluster.PubSub.Tests.csproj b/tests/Proto.Cluster.PubSub.Tests/Proto.Cluster.PubSub.Tests.csproj
index 37d5aaa9cb..e7451649f2 100644
--- a/tests/Proto.Cluster.PubSub.Tests/Proto.Cluster.PubSub.Tests.csproj
+++ b/tests/Proto.Cluster.PubSub.Tests/Proto.Cluster.PubSub.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>
diff --git a/tests/Proto.Cluster.RedisIdentity.Tests/Proto.Cluster.RedisIdentity.Tests.csproj b/tests/Proto.Cluster.RedisIdentity.Tests/Proto.Cluster.RedisIdentity.Tests.csproj
index 841978cc32..1bdfcdbc8e 100644
--- a/tests/Proto.Cluster.RedisIdentity.Tests/Proto.Cluster.RedisIdentity.Tests.csproj
+++ b/tests/Proto.Cluster.RedisIdentity.Tests/Proto.Cluster.RedisIdentity.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
     <PropertyGroup>
         <LangVersion>10</LangVersion>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
         <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
         <DockerComposeProjectPath>..\docker-compose\docker-compose.dcproj</DockerComposeProjectPath>
         <Nullable>enable</Nullable>
@@ -18,4 +18,4 @@
     <ItemGroup>
         <None Update="*.json" CopyToOutputDirectory="Always" CopyToPublishDirectory="Always" />
     </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/tests/Proto.Cluster.Tests/Proto.Cluster.Tests.csproj b/tests/Proto.Cluster.Tests/Proto.Cluster.Tests.csproj
index 2ed5a9d1cf..883ffbe21d 100644
--- a/tests/Proto.Cluster.Tests/Proto.Cluster.Tests.csproj
+++ b/tests/Proto.Cluster.Tests/Proto.Cluster.Tests.csproj
@@ -2,7 +2,7 @@
     <PropertyGroup>
         <NoWarn>8981</NoWarn>
         <LangVersion>10</LangVersion>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
         <ProjectReference Include="..\..\src\Proto.Cluster.Consul\Proto.Cluster.Consul.csproj" />
@@ -24,4 +24,4 @@
         <Protobuf Include="*.proto" />
     </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/tests/Proto.OpenTelemetry.Tests/Proto.OpenTelemetry.Tests.csproj b/tests/Proto.OpenTelemetry.Tests/Proto.OpenTelemetry.Tests.csproj
index 3679eea088..549793b335 100644
--- a/tests/Proto.OpenTelemetry.Tests/Proto.OpenTelemetry.Tests.csproj
+++ b/tests/Proto.OpenTelemetry.Tests/Proto.OpenTelemetry.Tests.csproj
@@ -5,7 +5,7 @@
         <Nullable>enable</Nullable>
         <LangVersion>10</LangVersion>
         <IsPackable>false</IsPackable>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
@@ -32,4 +32,4 @@
         <Protobuf Include="*.proto" />
     </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/tests/Proto.Persistence.Tests/Proto.Persistence.Tests.csproj b/tests/Proto.Persistence.Tests/Proto.Persistence.Tests.csproj
index 31ad687f46..75d190406e 100644
--- a/tests/Proto.Persistence.Tests/Proto.Persistence.Tests.csproj
+++ b/tests/Proto.Persistence.Tests/Proto.Persistence.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <LangVersion>10</LangVersion>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
@@ -24,4 +24,4 @@
         <ProjectReference Include="..\..\src\Proto.Persistence\Proto.Persistence.csproj" />
         <ProjectReference Include="..\Proto.TestFixtures\Proto.TestFixtures.csproj" />
     </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/tests/Proto.Remote.Tests.Messages/Proto.Remote.Tests.Messages.csproj b/tests/Proto.Remote.Tests.Messages/Proto.Remote.Tests.Messages.csproj
index dee6136287..ff24dc0b20 100644
--- a/tests/Proto.Remote.Tests.Messages/Proto.Remote.Tests.Messages.csproj
+++ b/tests/Proto.Remote.Tests.Messages/Proto.Remote.Tests.Messages.csproj
@@ -3,7 +3,7 @@
         <NoWarn>8981</NoWarn>
         <IsTestProject>false</IsTestProject>
         <LangVersion>10</LangVersion>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Grpc.Tools" Version="2.51.0" PrivateAssets="All" />
@@ -21,4 +21,4 @@
     <ItemGroup>
         <Protobuf Include="Protos.proto" GrpcServices="Server" AdditionalImportDirs=".; ..\..\src" />
     </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/tests/Proto.Remote.Tests/Proto.Remote.Tests.csproj b/tests/Proto.Remote.Tests/Proto.Remote.Tests.csproj
index 5539045694..cd79d45868 100644
--- a/tests/Proto.Remote.Tests/Proto.Remote.Tests.csproj
+++ b/tests/Proto.Remote.Tests/Proto.Remote.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <LangVersion>10</LangVersion>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Divergic.Logging.Xunit" Version="4.0.0" />
@@ -13,4 +13,4 @@
     <PropertyGroup Condition="'$(TargetFramework)' != 'net5.0'">
         <DefineConstants>NETCORE</DefineConstants>
     </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/tests/Proto.TestFixtures/Proto.TestFixtures.csproj b/tests/Proto.TestFixtures/Proto.TestFixtures.csproj
index 312ca54f23..ac24d5f82d 100644
--- a/tests/Proto.TestFixtures/Proto.TestFixtures.csproj
+++ b/tests/Proto.TestFixtures/Proto.TestFixtures.csproj
@@ -2,7 +2,7 @@
     <PropertyGroup>
         <IsTestProject>false</IsTestProject>
         <LangVersion>10</LangVersion>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Remove="AutoFixture.Xunit2"/>
@@ -18,4 +18,4 @@
     <ItemGroup>
         <ProjectReference Include="..\..\src\Proto.Actor\Proto.Actor.csproj"/>
     </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>