diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 9970268cb6..1a57ec1ed9 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -90,13 +90,21 @@ jobs:
           restore-keys: ${{ runner.os }}-nuget-
 
       - name: DotNet Setup
+        if: ${{ matrix.options.sdk-preview != true }}
         uses: actions/setup-dotnet@v2
         with:
           include-prerelease: true
           dotnet-version: |
-            7.0.x
             6.0.x
 
+      - name: DotNet Setup Preview
+        if: ${{ matrix.options.sdk-preview == true }}
+        uses: actions/setup-dotnet@v2
+        with:
+          include-prerelease: true
+          dotnet-version: |
+            7.0.x
+
       - name: DotNet Build
         if: ${{ matrix.options.sdk-preview != true }}
         shell: pwsh