diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 305b90136..e03f6c072 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,11 +18,11 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-          - windows-latest
+          - windows-2022
         dotnet:
+          - net6.0
           - net5.0
           - netcoreapp3.1
-          - netcoreapp2.1
           - net461
         exclude:
           - os: ubuntu-latest
diff --git a/.github/workflows/command-test.yml b/.github/workflows/command-test.yml
index d43d6f2f8..2e1f05247 100644
--- a/.github/workflows/command-test.yml
+++ b/.github/workflows/command-test.yml
@@ -27,11 +27,11 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-          - windows-latest
+          - windows-2022
         dotnet:
+          - net6.0
           - net5.0
           - netcoreapp3.1
-          - netcoreapp2.1
           - net461
         exclude:
           - os: ubuntu-latest
@@ -45,7 +45,7 @@ jobs:
 
   sonarcloud:
     name: Analysis
-    runs-on: windows-latest
+    runs-on: windows-2022
     needs: [pre]
     steps:
       - uses: actions/checkout@v2
diff --git a/.github/workflows/publish-version.yml b/.github/workflows/publish-version.yml
index d75b3c9ea..37d84b9b9 100644
--- a/.github/workflows/publish-version.yml
+++ b/.github/workflows/publish-version.yml
@@ -14,10 +14,11 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-          - windows-latest
+          - windows-2022
         dotnet:
+          - net6.0
+          - net5.0
           - netcoreapp3.1
-          - netcoreapp2.1
           - net461
         exclude:
           - os: ubuntu-latest
@@ -29,7 +30,7 @@ jobs:
 
   release:
     name: Release
-    runs-on: windows-latest
+    runs-on: windows-2022
     needs: [test]
     steps:
       - uses: actions/checkout@v2
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b0c1dcf92..847ed9e3c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   nuget:
     name: NuGet
-    runs-on: windows-latest
+    runs-on: windows-2022
     steps:
       - name: Download NuGet packages
         shell: powershell
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
index 97176309b..f17d701c6 100644
--- a/.github/workflows/sonarcloud.yml
+++ b/.github/workflows/sonarcloud.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   sonarcloud:
     name: Analysis
-    runs-on: windows-latest
+    runs-on: windows-2022
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'Archomeda/Gw2Sharp'
     steps:
       - uses: actions/checkout@v2
diff --git a/.github/workflows/update-docs.yml b/.github/workflows/update-docs.yml
index 3efcfa053..9e201e7a6 100644
--- a/.github/workflows/update-docs.yml
+++ b/.github/workflows/update-docs.yml
@@ -10,7 +10,7 @@ on:
 jobs:
   build:
     name: Build
-    runs-on: windows-latest
+    runs-on: windows-2022
     steps:
       - uses: actions/checkout@v2
       - name: Download docfx
diff --git a/Gw2Sharp.Tests/Gw2Sharp.Tests.csproj b/Gw2Sharp.Tests/Gw2Sharp.Tests.csproj
index a0d338227..9ec963920 100644
--- a/Gw2Sharp.Tests/Gw2Sharp.Tests.csproj
+++ b/Gw2Sharp.Tests/Gw2Sharp.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0;netcoreapp3.1;netcoreapp2.1;net461</TargetFrameworks>
+    <TargetFrameworks>net6.0;net5.0;netcoreapp3.1;net461</TargetFrameworks>
     <LangVersion>preview</LangVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Nullable>annotations</Nullable>