diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e90001cb27..777baa2b54 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,10 +16,13 @@ jobs:
       matrix:
         config: 
           - { name: Linux, runner-os: ubuntu-latest, ws: gtk, os: linux, native-extension: so }
-          - { name: Windows, runner-os: windows-2019, ws: win32, os: win32, native-extension: dll }
+          - { name: Windows, runner-os: windows-2019, ws: win32, os: win32, native-extension: dll, shell: 'cmd' }
           - { name: MacOS, runner-os: macos-13, ws: cocoa, os: macosx, native-extension: so }
     name: Build ${{ matrix.config.name }}
     runs-on: ${{ matrix.config.runner-os }}
+    defaults:
+      run:
+        shell: ${{ matrix.config.shell }}
     steps:
     - uses: actions/checkout@v4
       with:
@@ -52,12 +55,10 @@ jobs:
         sudo apt-get update -q -y 
         sudo apt-get install -q -y libgtk-3-dev 
     - name: Build
-      uses: coactions/setup-xvfb@v1
       env:
         EQUINOX_BINARIES_LOC: ${{ github.workspace }}/equinox.binaries
-      with:
-       working-directory: equinox
-       run: >- 
+      working-directory: equinox
+      run: >- 
         mvn
         --batch-mode
         -Pbree-libs
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index deedbc4ce7..5e11f57229 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -61,10 +61,8 @@ jobs:
       with:
         maven-version: 3.9.9
     - name: Build
-      uses: coactions/setup-xvfb@6b00cf1889f4e1d5a48635647013c0508128ee1a
-      with:
-       working-directory: equinox
-       run: >- 
+      working-directory: equinox
+      run: >- 
         mvn
         --batch-mode
         -Pbree-libs