diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml
index bbfee0d3..32adcbf2 100644
--- a/.github/workflows/msbuild.yml
+++ b/.github/workflows/msbuild.yml
@@ -42,6 +42,8 @@ jobs:
 
       - name: Add MSBuild to PATH
         uses: microsoft/setup-msbuild@30375c66a4eea26614e0d39710365f22f8b0af57 # v3.0.0
+        with:
+          msbuild-architecture: x64
 
       - if: matrix.platform != 'ARM64'
         name: Build
@@ -93,9 +95,40 @@ jobs:
 
       - name: Add MSBuild to PATH
         uses: microsoft/setup-msbuild@30375c66a4eea26614e0d39710365f22f8b0af57 # v3.0.0
+        with:
+          msbuild-architecture: x64
 
       - name: 'Build'
         working-directory: ${{ github.workspace }}
         run: >
           msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }}
           DirectXTex_Desktop_2026.slnx
+
+  build2022_arm64:
+    runs-on: windows-11-arm
+
+    strategy:
+      fail-fast: false
+
+      matrix:
+        build_type: [Debug, Release]
+
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+
+      - name: Add MSBuild to PATH
+        uses: microsoft/setup-msbuild@30375c66a4eea26614e0d39710365f22f8b0af57 # v3.0.0
+        with:
+          msbuild-architecture: arm64
+
+      - name: 'Build (Windows 10)'
+        working-directory: ${{ github.workspace }}
+        run: >
+          msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=ARM64
+          DirectXTex_Desktop_2022_Win10.sln
+
+      - name: 'Build (UWP)'
+        working-directory: ${{ github.workspace }}
+        run: >
+          msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=ARM64
+          DirectXTex_Windows10_2022.sln
diff --git a/DirectXTex/Shaders/CompileShaders.cmd b/DirectXTex/Shaders/CompileShaders.cmd
index 43144065..36406814 100644
--- a/DirectXTex/Shaders/CompileShaders.cmd
+++ b/DirectXTex/Shaders/CompileShaders.cmd
@@ -5,7 +5,7 @@ rem Licensed under the MIT License.
 setlocal
 set error=0
 
-if %PROCESSOR_ARCHITECTURE%.==ARM64. (set FXCARCH=arm64) else (if %PROCESSOR_ARCHITECTURE%.==AMD64. (set FXCARCH=x64) else (set FXCARCH=x86))
+if %PROCESSOR_ARCHITECTURE%.==ARM64. (set FXCARCH=arm64) else (set FXCARCH=x64)
 
 set FXCOPTS=/nologo /WX /Ges /Zi /Zpc /Qstrip_reflect /Qstrip_debug