diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9665f32b9..7c48dfcb0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -607,9 +607,20 @@ jobs:
           # NASM is required by aws-lc-rs (used as rustls crypto backend)
           choco install nasm
 
+          # Install Visual Studio Developer PowerShell Module for cmdlets such as Enter-VsDevShell
+          Install-Module VsDevShell -Force
+
           # We need to add the NASM binary folder to the PATH manually.
           Write-Output "$Env:ProgramFiles\NASM" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
 
+      - name: Find mc.exe
+        id: find_mc
+        if: matrix.os == 'windows'
+        run: |
+          Enter-VsDevShell
+          $path = (Get-Command -Type Application mc).Source | Split-Path -Parent
+          Write-Output "windows_sdk_ver_bin_path=$path" | Out-File -FilePath $env:GITHUB_OUTPUT -Append -Encoding utf8
+
       - name: Build
         shell: pwsh
         env:
@@ -625,6 +636,11 @@ jobs:
             . "$HOME/.cargo/cbake/${RustTarget}-enter.ps1"
             $Env:AWS_LC_SYS_CMAKE_BUILDER="true"
           }
+
+          if ($Env:RUNNER_OS -eq "Windows") {
+            $Env:WindowsSdkVerBinPath = '${{ steps.find_mc.outputs.windows_sdk_ver_bin_path }}'
+          }
+
           ./ci/tlk.ps1 build -Product gateway -Platform ${{ matrix.os }} -Architecture ${{ matrix.arch }} -CargoProfile ${{ needs.preflight.outputs.rust-profile }}
 
       - name: Add msbuild to PATH