diff --git a/.ci/tasks/build.yaml b/.ci/tasks/build.yaml
index 84cc1fd4..ddcc2df9 100644
--- a/.ci/tasks/build.yaml
+++ b/.ci/tasks/build.yaml
@@ -4,7 +4,7 @@ image_resource:
   type: docker-image
   source:
     repository: mcr.microsoft.com/dotnet/sdk
-    tag: 7.0-alpine3.15-amd64
+    tag: 8.0.101-alpine3.18-amd64
 inputs:
 - name: source
 params:
diff --git a/.ci/tasks/publish-nugget.yaml b/.ci/tasks/publish-nugget.yaml
index ab26634e..53812edd 100644
--- a/.ci/tasks/publish-nugget.yaml
+++ b/.ci/tasks/publish-nugget.yaml
@@ -4,7 +4,7 @@ image_resource:
   type: docker-image
   source:
     repository: mcr.microsoft.com/dotnet/sdk
-    tag: 7.0-alpine3.15-amd64
+    tag: 8.0.101-alpine3.18-amd64
 inputs:
 - name: source
 - name: version
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c6cc9810..6a990abc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,6 +1,6 @@
 name: dotnet package
 
-on: 
+on:
   push:
   pull_request:
     branches:
@@ -12,7 +12,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        dotnet: ['3.1.x','5.0.x','6.0.x','7.0.x']
+        dotnet:
+          - 3.1.x
+          - 5.0.x
+          - 6.0.x
+          - 7.0.x
+          - 8.0.x
     steps:
       - uses: actions/checkout@v3
       - name: Setup dotnet
@@ -23,10 +28,11 @@ jobs:
             5.0.x
             6.0.x
             7.0.x
+            8.0.x
       - name: DotNetBuild
         shell: pwsh
         run: ./ci-build.ps1
       - name: Test
         run: dotnet test --no-restore --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
       - name: Codecov
-        uses: codecov/codecov-action@v3
\ No newline at end of file
+        uses: codecov/codecov-action@v3
diff --git a/MigraDocCore.DocumentObjectModel/MigraDocCore.DocumentObjectModel.csproj b/MigraDocCore.DocumentObjectModel/MigraDocCore.DocumentObjectModel.csproj
index fa69758b..5646487b 100644
--- a/MigraDocCore.DocumentObjectModel/MigraDocCore.DocumentObjectModel.csproj
+++ b/MigraDocCore.DocumentObjectModel/MigraDocCore.DocumentObjectModel.csproj
@@ -1,6 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <Authors>Stefan Steiger and Contributors</Authors>
diff --git a/MigraDocCore.Rendering/MigraDocCore.Rendering.csproj b/MigraDocCore.Rendering/MigraDocCore.Rendering.csproj
index 461e2c9d..0ccbc3f9 100644
--- a/MigraDocCore.Rendering/MigraDocCore.Rendering.csproj
+++ b/MigraDocCore.Rendering/MigraDocCore.Rendering.csproj
@@ -1,6 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <Authors>Stefan Steiger and Contributors</Authors>
diff --git a/PdfSharpCore.Charting/PdfSharpCore.Charting.csproj b/PdfSharpCore.Charting/PdfSharpCore.Charting.csproj
index 22a0392c..f3c24cf1 100644
--- a/PdfSharpCore.Charting/PdfSharpCore.Charting.csproj
+++ b/PdfSharpCore.Charting/PdfSharpCore.Charting.csproj
@@ -1,6 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <Authors>Stefan Steiger and Contributors</Authors>
diff --git a/PdfSharpCore/PdfSharpCore.csproj b/PdfSharpCore/PdfSharpCore.csproj
index aa737ac8..c830a386 100644
--- a/PdfSharpCore/PdfSharpCore.csproj
+++ b/PdfSharpCore/PdfSharpCore.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <Authors>Stefan Steiger and Contributors</Authors>
@@ -51,7 +51,7 @@ PdfSharpCore is a partial port of PdfSharp.Xamarin for .NET Core Additionally Mi
     <PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" />
     <PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta17" />
   </ItemGroup>
-	
+
   <ItemGroup>
     <None Include="..\LICENSE.md" Pack="true" PackagePath="" />
     <None Include="..\README.md" Pack="true" PackagePath="" />