diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 749909c3..5f9cdb64 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -34,6 +34,7 @@ jobs:
           dotnet-version: |
             6.x
             7.x
+            8.x
       - name: Restore
         run: dotnet restore
       - name: Build
@@ -80,6 +81,7 @@ jobs:
           dotnet-version: |
             6.x
             7.x
+            8.x
       - name: Create Release NuGet package
         run: |
           arrTag=(${GITHUB_REF//\// })
diff --git a/samples/EndpointRoutingApp/EndpointRoutingApp.fsproj b/samples/EndpointRoutingApp/EndpointRoutingApp.fsproj
index 8cd1274a..53e729b5 100644
--- a/samples/EndpointRoutingApp/EndpointRoutingApp.fsproj
+++ b/samples/EndpointRoutingApp/EndpointRoutingApp.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/samples/ResponseCachingApp/ResponseCachingApp.fsproj b/samples/ResponseCachingApp/ResponseCachingApp.fsproj
index ded0e2dd..46e851b3 100644
--- a/samples/ResponseCachingApp/ResponseCachingApp.fsproj
+++ b/samples/ResponseCachingApp/ResponseCachingApp.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Giraffe/Giraffe.fsproj b/src/Giraffe/Giraffe.fsproj
index 3394f1c2..3cb66e69 100644
--- a/src/Giraffe/Giraffe.fsproj
+++ b/src/Giraffe/Giraffe.fsproj
@@ -8,7 +8,7 @@
     <NeutralLanguage>en-GB</NeutralLanguage>
 
     <!-- Build settings -->
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <DebugType>portable</DebugType>
     <OutputType>Library</OutputType>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/tests/Giraffe.Tests/Giraffe.Tests.fsproj b/tests/Giraffe.Tests/Giraffe.Tests.fsproj
index 0364f96e..047d88ee 100644
--- a/tests/Giraffe.Tests/Giraffe.Tests.fsproj
+++ b/tests/Giraffe.Tests/Giraffe.Tests.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <AssemblyName>Giraffe.Tests</AssemblyName>
   </PropertyGroup>
 
@@ -41,6 +41,10 @@
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="7.0.*" />
  </ItemGroup>
 
+ <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0'">
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.*" />
+ </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.*" />
     <PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.*" />