diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml
index b117256..a989513 100644
--- a/.github/workflows/cicd.yaml
+++ b/.github/workflows/cicd.yaml
@@ -22,6 +22,9 @@ jobs:
       - uses: actions/setup-dotnet@v3
         with:
           dotnet-version: "7.0.x"
+      - uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: "8.0.x"
       - name: Set RELEASE_VERSION
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
       - name: Restore Packages
@@ -60,11 +63,13 @@ jobs:
           zip -j LyricsScraperNET-net5.0.zip LyricsScraperNET/bin/Release/net5.0/*
           zip -j LyricsScraperNET-net6.0.zip LyricsScraperNET/bin/Release/net6.0/*
           zip -j LyricsScraperNET-net7.0.zip LyricsScraperNET/bin/Release/net7.0/*
+          zip -j LyricsScraperNET-net8.0.zip LyricsScraperNET/bin/Release/net8.0/*
           gh release upload "$RELEASE_VERSION" \
             "LyricsScraperNET-netstandard2.0.zip" \
             "LyricsScraperNET-netstandard2.1.zip" \
             "LyricsScraperNET-net5.0.zip" \
             "LyricsScraperNET-net6.0.zip" \
             "LyricsScraperNET-net7.0.zip" \
+            "LyricsScraperNET-net8.0.zip" \
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/LyricsScraperNET.Client/LyricsScraperNET.Client.csproj b/LyricsScraperNET.Client/LyricsScraperNET.Client.csproj
index 97bb9af..823c193 100644
--- a/LyricsScraperNET.Client/LyricsScraperNET.Client.csproj
+++ b/LyricsScraperNET.Client/LyricsScraperNET.Client.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-	<TargetFrameworks>net7.0;net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
+	<TargetFrameworks>net8.0;net7.0;net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
diff --git a/LyricsScraperNET.Client/Program.cs b/LyricsScraperNET.Client/Program.cs
index cc64b01..fb277a8 100644
--- a/LyricsScraperNET.Client/Program.cs
+++ b/LyricsScraperNET.Client/Program.cs
@@ -66,6 +66,9 @@ static async Task Main()
         Console.WriteLine($"\r\nThis lyric was found by [{result.ExternalProviderType}]\r\n");
         Console.ResetColor();
 
+        Console.ForegroundColor = ConsoleColor.DarkGray;
+        Console.WriteLine("Press any key to exit..");
+        Console.ResetColor();
         Console.ReadLine();
     }
 
diff --git a/LyricsScraperNET.TestShared/LyricsScraperNET.TestShared.csproj b/LyricsScraperNET.TestShared/LyricsScraperNET.TestShared.csproj
index 298798d..0e0d053 100644
--- a/LyricsScraperNET.TestShared/LyricsScraperNET.TestShared.csproj
+++ b/LyricsScraperNET.TestShared/LyricsScraperNET.TestShared.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net6.0;net5.0;netstandard2.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net7.0;net6.0;net5.0;netstandard2.1;netstandard2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/LyricsScraperNET/LyricsScraperNET.csproj b/LyricsScraperNET/LyricsScraperNET.csproj
index 4e7706d..55f05d7 100644
--- a/LyricsScraperNET/LyricsScraperNET.csproj
+++ b/LyricsScraperNET/LyricsScraperNET.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net6.0;net5.0;netstandard2.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net7.0;net6.0;net5.0;netstandard2.1;netstandard2.0</TargetFrameworks>
 	<LangVersion>9.0</LangVersion>
     <Nullable>enable</Nullable>
     <PackageId>LyricsScraperNET</PackageId>
diff --git a/README.md b/README.md
index d0706a9..8b80da7 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ LyricsScraperNET is a library for .NET that provides an API to search for lyrics
 
 ## Features
 
-* ✅ Supports multiple frameworks `.NET Standard 2.X`, `.NET 5`, `.NET 6`, `.NET 7`
+* ✅ Supports multiple frameworks `.NET Standard 2.X`, `.NET 5`, `.NET 6`, `.NET 7`, `.NET 8`
 * ✅ Logging supported.
 * ✅ Modular structure, for easy testing.
 * ✅ Multiple ways how to configure.
diff --git a/Tests/LyricsScraperNET.IntegrationTest/LyricsScraperNET.IntegrationTest.csproj b/Tests/LyricsScraperNET.IntegrationTest/LyricsScraperNET.IntegrationTest.csproj
index ce0eff4..8a6e5f5 100644
--- a/Tests/LyricsScraperNET.IntegrationTest/LyricsScraperNET.IntegrationTest.csproj
+++ b/Tests/LyricsScraperNET.IntegrationTest/LyricsScraperNET.IntegrationTest.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	<TargetFrameworks>net7.0</TargetFrameworks>
+	<TargetFrameworks>net8.0</TargetFrameworks>
 	<LangVersion>9.0</LangVersion>
 	<IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/Tests/LyricsScraperNET.UnitTest/LyricsScraperNET.UnitTest.csproj b/Tests/LyricsScraperNET.UnitTest/LyricsScraperNET.UnitTest.csproj
index 7c3b142..9f35327 100644
--- a/Tests/LyricsScraperNET.UnitTest/LyricsScraperNET.UnitTest.csproj
+++ b/Tests/LyricsScraperNET.UnitTest/LyricsScraperNET.UnitTest.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	<TargetFrameworks>net7.0;net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
+	<TargetFrameworks>net8.0;net7.0;net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
     <LangVersion>9.0</LangVersion>
     <IsPackable>false</IsPackable>
   </PropertyGroup>