diff --git a/.github/actions/setup-rust/action.yml b/.github/actions/setup-rust/action.yml
index a3fe3e2510a..9e2ebc15f4d 100644
--- a/.github/actions/setup-rust/action.yml
+++ b/.github/actions/setup-rust/action.yml
@@ -22,6 +22,10 @@ inputs:
   timestamp:
     description: "Timestamp cache with cargo sweep"
     default: "false"
+  enable-sccache:
+    description: "Should sccache be installed and configured, enabled by default"
+    required: false
+    default: "true"
 
 runs:
   using: "composite"
@@ -58,6 +62,7 @@ runs:
         env-vars: "RUSTFLAGS"
 
     - name: Rust Compile Cache
+      if: inputs.enable-sccache == 'true'
       uses: mozilla-actions/sccache-action@v0.0.9
 
     - name: Install Protoc (for lance-encoding build step)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6af51468c97..c68157e4e83 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -542,7 +542,7 @@ jobs:
       matrix:
         include:
           - os: windows-x64
-            runner: runs-on=${{ github.run_id }}/pool=windows-x64/extras=s3-cache
+            runner: runs-on=${{ github.run_id }}/family=m7i/image=windows22-full-x64/cpu=8/extras=s3-cache
           - os: linux-arm64
             runner:
               - runs-on=${{ github.run_id }}
@@ -560,6 +560,15 @@ jobs:
       - name: Install Visual Studio Build Tools (Windows)
         if: matrix.os == 'windows-x64'
         run: |
+          Get-ChildItem -Path "C:\Program Files (x86)\Microsoft Visual Studio\"
+
+          $path = "$(${env:CommonProgramFiles(x86)})\Microsoft Visual Studio\Installer\vswhere.exe" 
+          $args = "-latest", "-requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64", "-property installationPath"
+
+          if ($path) {
+            Start-Process $path -ArgumentList $args
+          }
+
           choco install visualstudio2022buildtools --package-parameters `
             "--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --add Microsoft.VisualStudio.Component.Windows11SDK.26100 --passive" -y
       - name: Setup Python (Windows)