diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 77976a6..cd83dfe 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.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: Restore
         run: dotnet restore --nologo src
@@ -31,10 +33,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 src
       - name: .Net Format
diff --git a/.github/workflows/nightly-release.yml b/.github/workflows/nightly-release.yml
index 8dc5f4e..3893ee1 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 53378dd..66e7c85 100644
--- a/.github/workflows/pr-build.yml
+++ b/.github/workflows/pr-build.yml
@@ -16,10 +16,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 src
@@ -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 src
       - name: .Net Format
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c16d0cb..8d4a0e5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,10 +10,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/DockerComposeBuilder.Examples.Complex/DockerComposeBuilder.Examples.Complex.csproj b/src/DockerComposeBuilder.Examples.Complex/DockerComposeBuilder.Examples.Complex.csproj
index 8a4f358..a0676e6 100644
--- a/src/DockerComposeBuilder.Examples.Complex/DockerComposeBuilder.Examples.Complex.csproj
+++ b/src/DockerComposeBuilder.Examples.Complex/DockerComposeBuilder.Examples.Complex.csproj
@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
-    <LangVersion>11.0</LangVersion>
+    <LangVersion>12.0</LangVersion>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/src/DockerComposeBuilder.Tests/DockerComposeBuilder.Tests.csproj b/src/DockerComposeBuilder.Tests/DockerComposeBuilder.Tests.csproj
index 2cdfff8..2b21634 100644
--- a/src/DockerComposeBuilder.Tests/DockerComposeBuilder.Tests.csproj
+++ b/src/DockerComposeBuilder.Tests/DockerComposeBuilder.Tests.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
     <Nullable>enable</Nullable>
-    <LangVersion>11</LangVersion>
+    <LangVersion>12</LangVersion>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/src/DockerComposeBuilder/DockerComposeBuilder.csproj b/src/DockerComposeBuilder/DockerComposeBuilder.csproj
index 23f40ab..4bf853c 100644
--- a/src/DockerComposeBuilder/DockerComposeBuilder.csproj
+++ b/src/DockerComposeBuilder/DockerComposeBuilder.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net7.0;net8.0</TargetFrameworks>
     <Authors>David Dolyniuk, Jan Trejbal</Authors>
     <Description>The goal of this project is to generate docker-compose literate YAML in C# using the builder design pattern</Description>
     <IncludeSymbols>true</IncludeSymbols>