diff --git a/.github/workflows/qt-msvc-build-and-release.yml b/.github/workflows/qt-msvc-build-and-release.yml
index 8009263..bca2cb9 100644
--- a/.github/workflows/qt-msvc-build-and-release.yml
+++ b/.github/workflows/qt-msvc-build-and-release.yml
@@ -13,16 +13,15 @@ jobs:
         with:
           submodules: true
 
-      - name: Set up Visual Studio shell
-        uses: egor-tensin/vs-shell@v2
-        with:
-          arch: x64
-
       - uses: res2k/setup-winsdk@support-sdk-26100 # TEMPORARY until upstream fbactions/setup-winsdk works w/ 26100
         with:
           winsdk-build-version: 26100
         name: Install Windows 11 SDK 26100
-        
+
+      - uses: ilammy/msvc-dev-cmd@v1
+        with:
+          sdk: 10.0.26100.0
+
       - name: Install Qt
         uses: jurplel/install-qt-action@v4
         with:
diff --git a/.github/workflows/qt-msvc-build.yml b/.github/workflows/qt-msvc-build.yml
index 093bb30..515ebe3 100644
--- a/.github/workflows/qt-msvc-build.yml
+++ b/.github/workflows/qt-msvc-build.yml
@@ -15,16 +15,15 @@ jobs:
         with:
           submodules: true
 
-      - name: Set up Visual Studio shell
-        uses: egor-tensin/vs-shell@v2
-        with:
-          arch: x64
-
       - uses: res2k/setup-winsdk@support-sdk-26100 # TEMPORARY until upstream fbactions/setup-winsdk works w/ 26100
         with:
           winsdk-build-version: 26100
         name: Install Windows 11 SDK 26100
-        
+
+      - uses: ilammy/msvc-dev-cmd@v1
+        with:
+          sdk: 10.0.26100.0
+
       - name: Install Qt
         uses: jurplel/install-qt-action@v4
         with:
@@ -57,12 +56,14 @@ jobs:
             exit 1
           }
 
-      - name: Build with qmake and jom
+      - name: Set up Visual Studio and build with qmake and jom
         shell: pwsh
         run: |
+          # Build with qmake and jom
           mkdir build
           cd build
           qmake ..\BigPictureTV.pro CONFIG+=release
+
           # Use the JOM path variable
           $jomPath = "${{ steps.jom-setup.outputs.jom_path }}"
           & "$jomPath\jom.exe"