diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 1a57ec1ed9..cd59dca803 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -21,18 +21,19 @@ jobs:
             runtime: -x64
             codecov: false
           # Temp disabled due to runtime preview issues.
+          # https://github.com/SixLabors/ImageSharp/issues/2117
           #- os: macos-latest
           #  framework: net7.0
           #  sdk: 7.0.x
           #  sdk-preview: true
           #  runtime: -x64
           #  codecov: false
-          - os: windows-latest
-            framework: net7.0
-            sdk: 7.0.x
-            sdk-preview: true
-            runtime: -x64
-            codecov: false
+          #- os: windows-latest
+          #  framework: net7.0
+          #  sdk: 7.0.x
+          #  sdk-preview: true
+          #  runtime: -x64
+          #  codecov: false
           - os: ubuntu-latest
             framework: net6.0
             sdk: 6.0.x