diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
index 34d9f09..62b2f3c 100644
--- a/.github/workflows/dotnetcore.yml
+++ b/.github/workflows/dotnetcore.yml
@@ -20,7 +20,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.x
+        dotnet-version: 8.x
 
     - name: Test with dotnet
       run: dotnet test --configuration Release
@@ -36,7 +36,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.x
+        dotnet-version: 8.x
 
     - name: Publish with dotnet
       run: dotnet publish src/Cmf.Tools.TestDetector.Console/Cmf.Tools.TestDetector.Console.csproj --output win-64x/ -r win-x64 --self-contained --configuration Release /p:PublishSingleFile=true /p:UseAppHost=true /p:Version=$(git describe --tags --dirty)
diff --git a/src/Cmf.Tools.TestDetector.Console/Cmf.Tools.TestDetector.Console.csproj b/src/Cmf.Tools.TestDetector.Console/Cmf.Tools.TestDetector.Console.csproj
index 066a093..e75cdf1 100644
--- a/src/Cmf.Tools.TestDetector.Console/Cmf.Tools.TestDetector.Console.csproj
+++ b/src/Cmf.Tools.TestDetector.Console/Cmf.Tools.TestDetector.Console.csproj
@@ -1,8 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
+    <SelfContained>true</SelfContained>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Cmf.Tools.TestDetector/Cmf.Tools.TestDetector.csproj b/src/Cmf.Tools.TestDetector/Cmf.Tools.TestDetector.csproj
index 40e65b2..7677c22 100644
--- a/src/Cmf.Tools.TestDetector/Cmf.Tools.TestDetector.csproj
+++ b/src/Cmf.Tools.TestDetector/Cmf.Tools.TestDetector.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Company>Critical Manufacturing</Company>
     <Product>CMF Dev Test Detector</Product>
     <Authors>Critical Manufacturing</Authors>
diff --git a/tests/Cmf.Tools.TestDetector.UnitTests/Cmf.Tools.TestDetector.UnitTests.csproj b/tests/Cmf.Tools.TestDetector.UnitTests/Cmf.Tools.TestDetector.UnitTests.csproj
index 88a31a1..7555d93 100644
--- a/tests/Cmf.Tools.TestDetector.UnitTests/Cmf.Tools.TestDetector.UnitTests.csproj
+++ b/tests/Cmf.Tools.TestDetector.UnitTests/Cmf.Tools.TestDetector.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>