diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 59c380de29..72e79360b0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -56,11 +56,19 @@ jobs:
          path: ~/.m2/repository
          key: ${{ runner.os }}-m2-repository-${{ hashFiles('**/pom.xml') }}
          restore-keys: ${{ runner.os }}-m2-repository
+    - name: Setup MSVC Developer Command Prompt (x86)
+      if: runner.os == 'Windows'
+      uses: ilammy/msvc-dev-cmd@v1
+      env:
+        # Opt in to Node.js 24 for this action, which still ships on Node.js 20.
+        # See https://github.com/ilammy/msvc-dev-cmd/issues/99
+        FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
+      with:
+        arch: x86
     - name: Build Windows native executables
       if: runner.os == 'Windows'
       shell: cmd
       run: |
-        call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86
         cd opendj-server-legacy\src\build-tools\windows
         nmake all
         xcopy /Y *.exe ..\..\..\lib\