diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0e54385..fe4fa7f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,6 +33,10 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: "7.0.x"
+      - name: Setup .NET 8.0
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: "8.0.x"
       - name: Setup .NET
         uses: actions/setup-dotnet@v1
       - name: Run tests
diff --git a/src/Webserver.API/Webserver.API.csproj b/src/Webserver.API/Webserver.API.csproj
index 1494cd8..5ba5385 100644
--- a/src/Webserver.API/Webserver.API.csproj
+++ b/src/Webserver.API/Webserver.API.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net48;netstandard2.0;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net48;netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
     <AssemblyName>Siemens.Simatic.S7.Webserver.API</AssemblyName>
     <RootNamespace>Siemens.Simatic.S7.Webserver.API</RootNamespace>
     <Platforms>x64;AnyCPU;x86</Platforms>
diff --git a/tests/Webserver.API.UnitTests/Webserver.Api.UnitTests.csproj b/tests/Webserver.API.UnitTests/Webserver.Api.UnitTests.csproj
index e885974..40e5bb6 100644
--- a/tests/Webserver.API.UnitTests/Webserver.Api.UnitTests.csproj
+++ b/tests/Webserver.API.UnitTests/Webserver.Api.UnitTests.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>net48;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0;net7.0;net8.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <AssemblyName>Webserver.API.UnitTests</AssemblyName>
     <RootNamespace>Webserver.API.UnitTests</RootNamespace>