diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 70a3bbd2..4af6ae5a 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   build:
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - uses: actions/checkout@master
 
@@ -18,6 +18,7 @@ jobs:
           dotnet-version: | 
             2.1.x
             6.0.x
+            8.0.x
 
       - name: Add msbuild to PATH
         uses: microsoft/setup-msbuild@v1.0.2
diff --git a/.github/workflows/nightly_release.yml b/.github/workflows/nightly_release.yml
index f193a518..0fb13d3b 100644
--- a/.github/workflows/nightly_release.yml
+++ b/.github/workflows/nightly_release.yml
@@ -26,7 +26,7 @@ jobs:
   build_and_publish_nightly:
     needs: [check_date, tests]
     if: ${{ needs.check_date.outputs.should_run != 'false' }}
-    runs-on: windows-2019
+    runs-on: windows-2022
     name: build_and_publish_nightly
     steps:
       - uses: actions/checkout@master
@@ -37,6 +37,7 @@ jobs:
           dotnet-version: |
             2.1.x
             6.0.x
+            8.0.x
 
       - name: Add msbuild to PATH
         uses: microsoft/setup-msbuild@v1.0.2