diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 571a800608..e66f0c5e30 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -25,15 +25,16 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install Vulkan SDK
-        uses: humbletim/install-vulkan-sdk@v1.2
+        uses: jakoch/install-vulkan-sdk-action@v1
         with:
-          version: 1.4.309.0
+          vulkan_version: 1.4.309.0
+          install_runtime: true
           cache: true
-      - if: ${{ runner.os == 'Windows' }}
-        name: Install Vulkan Runtime with SwiftShader (Windows)
-        uses: NcStudios/VulkanCI@v1.2
-        with:
-          sdkVersion: 1.4.309.0
+          stripdown: true
+
+          # FIXME(eddyb) consider using lavapipe instead, or even trying both.
+          install_swiftshader: true
+          # install_lavapipe: true
       - if: ${{ runner.os == 'Linux' }}
         name: Linux - Install native dependencies
         run: sudo apt install libwayland-cursor0 libxkbcommon-dev libwayland-dev
@@ -89,15 +90,16 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install Vulkan SDK
-        uses: humbletim/install-vulkan-sdk@v1.2
+        uses: jakoch/install-vulkan-sdk-action@v1
         with:
-          version: 1.4.309.0
+          vulkan_version: 1.4.309.0
+          install_runtime: true
           cache: true
-      - if: ${{ runner.os == 'Windows' }}
-        name: Install Vulkan Runtime with SwiftShader (Windows)
-        uses: NcStudios/VulkanCI@v1.2
-        with:
-          sdkVersion: 1.4.309.0
+          stripdown: true
+
+          # FIXME(eddyb) consider using lavapipe instead, or even trying both.
+          install_swiftshader: true
+          # install_lavapipe: true
       - name: install rust-toolchain
         run: cargo version
       - name: cargo fetch --locked
@@ -135,15 +137,16 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install Vulkan SDK
-        uses: humbletim/install-vulkan-sdk@v1.2
+        uses: jakoch/install-vulkan-sdk-action@v1
         with:
-          version: 1.4.309.0
+          vulkan_version: 1.4.309.0
+          install_runtime: true
           cache: true
-      - if: ${{ runner.os == 'Windows' }}
-        name: Install Vulkan Runtime with SwiftShader (Windows)
-        uses: NcStudios/VulkanCI@v1.2
-        with:
-          sdkVersion: 1.4.309.0
+          stripdown: true
+
+          # FIXME(eddyb) consider using lavapipe instead, or even trying both.
+          install_swiftshader: true
+          # install_lavapipe: true
       - name: install rust-toolchain
         run: echo "TARGET=$(rustc --print host-tuple)" >> "$GITHUB_ENV"
       - name: cargo fetch --locked
@@ -160,15 +163,22 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install Vulkan SDK
-        uses: humbletim/install-vulkan-sdk@v1.2
+        uses: jakoch/install-vulkan-sdk-action@v1
         with:
-          version: 1.4.309.0
+          vulkan_version: 1.4.309.0
+          install_runtime: true
           cache: true
+          stripdown: true
+
+          # FIXME(eddyb) consider using lavapipe instead, or even trying both.
+          install_swiftshader: true
+          # install_lavapipe: true
       - if: ${{ runner.os == 'Windows' }}
-        name: Install Vulkan Runtime with SwiftShader (Windows)
-        uses: NcStudios/VulkanCI@v1.2
-        with:
-          sdkVersion: 1.4.309.0
+        name: Windows - Use SwiftShader as Vulkan driver
+        # FIXME(eddyb) ideally `jakoch/install-vulkan-sdk-action` should do this.
+        run: |
+          echo "C:/Swiftshader/" >> "$GITHUB_PATH"
+          echo "VK_DRIVER_FILES=C:/Swiftshader/vk_swiftshader_icd.json" >> "$GITHUB_ENV"
       - if: ${{ runner.os == 'Linux' }}
         name: Linux - Install native dependencies
         run: sudo apt install libwayland-cursor0 libxkbcommon-dev libwayland-dev
@@ -219,10 +229,16 @@ jobs:
       - name: Install native dependencies
         run: sudo apt install libwayland-cursor0 libxkbcommon-dev libwayland-dev
       - name: Install Vulkan SDK
-        uses: humbletim/install-vulkan-sdk@v1.2
+        uses: jakoch/install-vulkan-sdk-action@v1
         with:
-          version: 1.4.309.0
+          vulkan_version: 1.4.309.0
+          install_runtime: true
           cache: true
+          stripdown: true
+
+          # FIXME(eddyb) consider using lavapipe instead, or even trying both.
+          install_swiftshader: true
+          # install_lavapipe: true
       - name: Install rustup components
         run: rustup component add rustfmt clippy
       # cargo version is a random command that forces the installation of rust-toolchain