diff --git a/.github/templates/main.yml b/.github/templates/main.yml
index 1b173ea9b8..f47e2f1bed 100644
--- a/.github/templates/main.yml
+++ b/.github/templates/main.yml
@@ -446,7 +446,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ macos-latest, windows-latest, ubuntu-latest ]
+        os: [ macos-latest, windows-latest, ubuntu-latest, win81 ]
         targetFramework: [ netcoreapp3.1, net5.0, net6.0 ]
     steps:
       - name: Cleanup Workspace
@@ -457,7 +457,7 @@ jobs:
       - uses: #@ actionSetupDotnet
         if: matrix.targetFramework == 'net6.0'
         with:
-          dotnet-version: '6.0.100-preview.7.21379.14'
+          dotnet-version: '6.0.x'
           include-prerelease: true
       - #@ template.replace(dotnetPublishAndRunTests("Tests/Realm.Tests", "${{ matrix.targetFramework }}", "Realm.Tests --result=TestResults.xml --labels=After"))
       - #@ publishTestsResults("TestResults.xml", ".NET (${{ matrix.os }}, ${{ matrix.targetFramework }})")
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2949005898..e3fcdedc50 100755
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -592,6 +592,7 @@ jobs:
         - macos-latest
         - windows-latest
         - ubuntu-latest
+        - win81
         targetFramework:
         - netcoreapp3.1
         - net5.0
@@ -622,7 +623,7 @@ jobs:
     - uses: actions/setup-dotnet@v1
       if: matrix.targetFramework == 'net6.0'
       with:
-        dotnet-version: 6.0.100-preview.7.21379.14
+        dotnet-version: 6.0.x
         include-prerelease: true
     - name: Publish Tests/Realm.Tests
       run: dotnet publish Tests/Realm.Tests -c Release -f ${{ matrix.targetFramework }} -r ${{ (runner.os == 'macOS' && 'osx-x64') || (runner.os == 'Windows' && 'win-x64') || (runner.os == 'Linux' && 'linux-x64') || '???' }} -p:AdditionalFrameworks=${{ matrix.targetFramework }} -p:RestoreConfigFile=Tests/Test.NuGet.Config -p:UseRealmNupkgsWithVersion=${{ needs.build-packages.outputs.package_version }} --no-self-contained