diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6bdcd78..8f4756c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,10 +14,12 @@ jobs:
     env:
       DOTNET_CLI_TELEMETRY_OPTOUT: 'true'
     steps:
-      - name: Setup .Net 7.0.x
+      - name: Setup .Net
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: |
+            7.0.x
+            8.0.x
       - uses: actions/checkout@v4
       - name: Restore
         run: dotnet restore --nologo
@@ -32,10 +34,10 @@ jobs:
       DOTNET_CLI_TELEMETRY_OPTOUT: 'true'
     steps:
       - uses: actions/checkout@v4
-      - name: Setup .Net 7.0.x
+      - name: Setup .Net 8.0.x
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: '8.0.x'
       - name: Restore
         run: dotnet restore --nologo
       - name: .Net Format
diff --git a/.github/workflows/nightly-release.yml b/.github/workflows/nightly-release.yml
index 5f47d0c..19fb0b2 100644
--- a/.github/workflows/nightly-release.yml
+++ b/.github/workflows/nightly-release.yml
@@ -11,10 +11,12 @@ jobs:
     env:
       DOTNET_CLI_TELEMETRY_OPTOUT: 'true'
     steps:
-      - name: Setup .Net 7.0.x
+      - name: Setup .Net
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: |
+            7.0.x
+            8.0.x
       - uses: actions/checkout@v4
       - name: Fetch all history for all tags and branches
         run: git fetch --prune --unshallow
diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
index 3ea0720..ab9aecc 100644
--- a/.github/workflows/pr-build.yml
+++ b/.github/workflows/pr-build.yml
@@ -14,10 +14,12 @@ jobs:
     env:
       DOTNET_CLI_TELEMETRY_OPTOUT: 'true'
     steps:
-      - name: Setup .Net 7.0.x
+      - name: Setup .Net
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: |
+            7.0.x
+            8.0.x
       - uses: actions/checkout@v4
       - name: Restore
         run: dotnet restore --nologo
@@ -35,10 +37,10 @@ jobs:
         with:
           ref: ${{ github.head_ref }}
           fetch-depth: 0
-      - name: Setup .Net 7.0.x
+      - name: Setup .Net 8.0.x
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: '8.0.x'
       - name: Restore
         run: dotnet restore --nologo
       - name: Add .Net Format Problem Matcher
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c98c67c..f052080 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,10 +13,12 @@ jobs:
     env:
       DOTNET_CLI_TELEMETRY_OPTOUT: 'true'
     steps:
-      - name: Setup .Net 7.0.x
+      - name: Setup .Net
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: |
+            7.0.x
+            8.0.x
       - uses: actions/checkout@v4
       - name: Fetch all history for all tags and branches
         run: git fetch --prune --unshallow
diff --git a/src/ReportingApi.Tests/ReportingApi.Tests.csproj b/src/ReportingApi.Tests/ReportingApi.Tests.csproj
index 9c8a05e..7545f14 100644
--- a/src/ReportingApi.Tests/ReportingApi.Tests.csproj
+++ b/src/ReportingApi.Tests/ReportingApi.Tests.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <LangVersion>11.0</LangVersion>
+    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+    <LangVersion>12.0</LangVersion>
     <Nullable>enable</Nullable>
     <PackageLicense>MIT</PackageLicense>
   </PropertyGroup>
@@ -10,7 +10,7 @@
   <ItemGroup>
     <ProjectReference Include="..\ReportingApi\ReportingApi.csproj" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <PackageReference Include="coverlet.collector" Version="6.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/ReportingApi/IReportBody.cs b/src/ReportingApi/IReportBody.cs
index 002afb7..66d06e4 100644
--- a/src/ReportingApi/IReportBody.cs
+++ b/src/ReportingApi/IReportBody.cs
@@ -1,5 +1,3 @@
 namespace ReportingApi;
 
-public interface IReportBody
-{
-}
+public interface IReportBody;
diff --git a/src/ReportingApi/ReportingApi.csproj b/src/ReportingApi/ReportingApi.csproj
index c248531..88362ac 100644
--- a/src/ReportingApi/ReportingApi.csproj
+++ b/src/ReportingApi/ReportingApi.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <LangVersion>11.0</LangVersion>
+    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+    <LangVersion>12.0</LangVersion>
     <Nullable>enable</Nullable>
     <PackageLicense>MIT</PackageLicense>
     <RepositoryUrl>https://github.com/aviationexam/reporting-api</RepositoryUrl>
@@ -19,6 +19,8 @@
     <PackageReference Include="System.Text.Json" Version="7.0.3" />
   </ItemGroup>
 
-
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+    <PackageReference Include="System.Text.Json" Version="8.0.0" />
+  </ItemGroup>
 
 </Project>