diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 197925f374..bca1721577 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -88,14 +88,16 @@ jobs:
     - name: Build on POSIX
       working-directory: features/org.eclipse.equinox.executable.feature/library/${{ matrix.config.ws }}
       env:
-        BINARIES_LOC: ${{ github.workspace }}/equinox.binaries
+        BINARIES_DIR: ${{ github.workspace }}/equinox.binaries
       run: ./build.sh -ws ${{ matrix.config.ws }} -os ${{ matrix.config.os }} -arch x86_64 install
       if: ${{ matrix.config.ws != 'win32'}}
     - name: Build on Windows
       working-directory: features/org.eclipse.equinox.executable.feature/library/win32
       env:
-        BINARIES_LOC: ${{ github.workspace }}/equinox.binaries
-      run: .\build.bat -ws win32 -os win32 -arch x86_64 install
+        BINARIES_DIR: ${{ github.workspace }}/equinox.binaries
+      run: |
+        mkdir ${{ github.workspace }}\equinox.binaries\org.eclipse.equinox.executable\bin\win32\win32\x86_64'
+        .\build.bat -ws win32 -os win32 -arch x86_64 install
       if: ${{ matrix.config.ws == 'win32'}}
 
     - name: Test native launcher and executable
@@ -109,9 +111,8 @@ jobs:
       with:
         name: ${{ matrix.config.name }} launcher artifacts
         path: |
-          features/org.eclipse.equinox.executable.feature/library/${{ matrix.config.ws }}/eclipse
-          features/org.eclipse.equinox.executable.feature/library/${{ matrix.config.ws }}/eclipse*.exe
-          features/org.eclipse.equinox.executable.feature/library/${{ matrix.config.ws }}/eclipse*.${{ matrix.config.native-extension }}
+          equinox.binaries/org.eclipse.equinox.executable/bin/${{ matrix.config.ws }}/${{ matrix.config.os }}/x86_64/**/eclipse*
+          equinox.binaries/org.eclipse.equinox.launcher.${{ matrix.config.ws }}.${{ matrix.config.os }}.x86_64/eclipse_*.${{ matrix.config.native-extension }}
         if-no-files-found: error
     - name: Upload ${{ matrix.config.name }} Test Results
       uses: actions/upload-artifact@v4