diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e9fbd86b3..82c884049 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
@@ -25,12 +25,7 @@ jobs:
           3.1.x
           6.0.x
           7.0.x
-
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: '8.0.x'
-        dotnet-quality: 'preview'
+          8.0.x
 
     - name: Restore dependencies
       run: dotnet restore
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index e25d5d3ee..927189234 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -21,10 +21,10 @@ on:
 jobs:
   docs:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
@@ -33,6 +33,7 @@ jobs:
           3.1.x
           6.0.x
           7.0.x
+          8.0.x
 
     - name: Restore dependencies
       run: dotnet restore
@@ -40,7 +41,7 @@ jobs:
       run: dotnet build -c Release --no-restore
 
     - name: Build documentation
-      run: dotnet run -f net7.0 -c Release --no-build
+      run: dotnet run -f net8.0 -c Release --no-build
       working-directory: Docs/SuperLinq.Docs
 
     - name: Setup Pages
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a065a9c3f..8b4bd28d9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
@@ -24,12 +24,7 @@ jobs:
           3.1.x
           6.0.x
           7.0.x
-
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: '8.0.x'
-        dotnet-quality: 'preview'
+          8.0.x
 
     - name: Restore dependencies
       run: dotnet restore
diff --git a/Docs/SuperLinq.Docs/SuperLinq.Docs.csproj b/Docs/SuperLinq.Docs/SuperLinq.Docs.csproj
index a63eeea1f..980049fef 100644
--- a/Docs/SuperLinq.Docs/SuperLinq.Docs.csproj
+++ b/Docs/SuperLinq.Docs/SuperLinq.Docs.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
 		<NoWarn>$(NoWarn);CA1852;NU1701</NoWarn>
 		<IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/Docs/SuperLinq.Docs/docfx.json b/Docs/SuperLinq.Docs/docfx.json
index c2c515fb8..dc5082521 100644
--- a/Docs/SuperLinq.Docs/docfx.json
+++ b/Docs/SuperLinq.Docs/docfx.json
@@ -4,8 +4,8 @@
 			"src": [
 				{
 					"files": [
-						"SuperLinq/bin/Release/net7.0/SuperLinq.dll",
-						"SuperLinq.Async/bin/Release/net7.0/SuperLinq.Async.dll"
+						"SuperLinq/bin/Release/net8.0/SuperLinq.dll",
+						"SuperLinq.Async/bin/Release/net8.0/SuperLinq.Async.dll"
 					],
 					"src": "../../Source"
 				}
diff --git a/TargetFrameworks.props b/TargetFrameworks.props
index 38179392b..e53f6c1ec 100644
--- a/TargetFrameworks.props
+++ b/TargetFrameworks.props
@@ -4,6 +4,7 @@
 		<TargetFrameworks>netcoreapp3.1;net6.0;</TargetFrameworks>
 		<TargetFrameworks Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '7.0'))">$(TargetFrameworks);net7.0</TargetFrameworks>
 		<TargetFrameworks Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '8.0'))">$(TargetFrameworks);net8.0</TargetFrameworks>
+		<TargetFrameworks Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '9.0'))">$(TargetFrameworks);net9.0</TargetFrameworks>
 	</PropertyGroup>
 
 </Project>