diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4cad105..fe6542c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,11 +14,13 @@ jobs:
       fail-fast: true
       matrix:
         include: [
-          { config: Debug, platform: x64, bindir: 'win64_vs2022' },
-          { config: Release, platform: x64, bindir: 'win64_vs2022' },
+          { config: Debug,   platform: x64, bindir: 'win64_vs2022', genie-action: 'vs2022', solution-ext: 'sln' },
+          { config: Release, platform: x64, bindir: 'win64_vs2022', genie-action: 'vs2022', solution-ext: 'sln' },
+#          { config: Debug,   platform: x64, bindir: 'win64_vs2026', genie-action: 'vs2026', solution-ext: 'slnx' },
+#          { config: Release, platform: x64, bindir: 'win64_vs2026', genie-action: 'vs2026', solution-ext: 'slnx' },
         ]
     name: msvc-${{ matrix.config }}-${{ matrix.platform }}
-    runs-on: windows-2022
+    runs-on: windows-latest
     steps:
       - name: Checkout bx
         uses: actions/checkout@v4
@@ -31,8 +33,8 @@ jobs:
         shell: cmd
         run: |
           cd bx
-          tools\bin\windows\genie.exe vs2022
-          msbuild ".build/projects/vs2022/bx.sln" /m /v:minimal /p:Configuration=${{ matrix.config }} /p:Platform=${{ matrix.platform }}
+          tools\bin\windows\genie.exe ${{ matrix.genie-action }}
+          msbuild ".build/projects/${{ matrix.genie-action }}/bx.${{ matrix.solution-ext }}" /m /v:minimal /p:Configuration=${{ matrix.config }} /p:Platform=${{ matrix.platform }}
       - name: Check
         shell: cmd
         run: |
diff --git a/tools/bin/darwin/genie b/tools/bin/darwin/genie
index 8930a75..88aba0b 100755
Binary files a/tools/bin/darwin/genie and b/tools/bin/darwin/genie differ
diff --git a/tools/bin/linux/genie b/tools/bin/linux/genie
index f70beb7..08345cd 100755
Binary files a/tools/bin/linux/genie and b/tools/bin/linux/genie differ
diff --git a/tools/bin/windows/genie.exe b/tools/bin/windows/genie.exe
index dfcc42b..d02b7fa 100644
Binary files a/tools/bin/windows/genie.exe and b/tools/bin/windows/genie.exe differ