diff --git a/.gitlab-ci/container/build-vkd3d-proton.sh b/.gitlab-ci/container/build-vkd3d-proton.sh
index 5ee6c0fc945..d932f35b4fc 100644
--- a/.gitlab-ci/container/build-vkd3d-proton.sh
+++ b/.gitlab-ci/container/build-vkd3d-proton.sh
@@ -15,7 +15,7 @@ VKD3D_PROTON_BUILD_DIR="/vkd3d-proton-build"
 function build_arch {
   local arch="$1"
 
-  meson                                    \
+  meson setup                              \
         -Denable_tests=true                \
         --buildtype release                \
         --prefix "$VKD3D_PROTON_DST_DIR"   \
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index cfcc5dce263..9be4a1f5b86 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -29,8 +29,8 @@ variables:
 
    DEBIAN_TEST_ANDROID_TAG: "20241106-wlproto2"
    DEBIAN_TEST_GL_TAG: "20241106-wlproto2"
-   DEBIAN_TEST_VK_TAG: "20241106-wlproto2"
-   KERNEL_ROOTFS_TAG: "20241106-wlproto2"
+   DEBIAN_TEST_VK_TAG: "20241107-setup"
+   KERNEL_ROOTFS_TAG: "20241107-setup"
 
    DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils"
    DEBIAN_PYUTILS_TAG: "20241002-pyutils"
@@ -46,7 +46,7 @@ variables:
    WINDOWS_X64_MSVC_TAG: "20240827-v143"
 
    WINDOWS_X64_BUILD_PATH: "windows/x86_64_build"
-   WINDOWS_X64_BUILD_TAG: "20240910-SDK614"
+   WINDOWS_X64_BUILD_TAG: "20241107-setup"
 
    WINDOWS_X64_TEST_PATH: "windows/x86_64_test"
-   WINDOWS_X64_TEST_TAG: "20240910-SDK614"
+   WINDOWS_X64_TEST_TAG: "20241107-setup"
diff --git a/.gitlab-ci/windows/mesa_deps_build.ps1 b/.gitlab-ci/windows/mesa_deps_build.ps1
index 7fed0208ea3..c50299f9a9f 100644
--- a/.gitlab-ci/windows/mesa_deps_build.ps1
+++ b/.gitlab-ci/windows/mesa_deps_build.ps1
@@ -20,7 +20,7 @@ if (!$?) {
 Write-Host "Building DirectX-Headers"
 $dxheaders_build = New-Item -ItemType Directory -Path ".\deps\DirectX-Headers" -Name "build"
 Push-Location -Path $dxheaders_build.FullName
-meson .. --backend=ninja -Dprefix="$depsInstallPath" --buildtype=release -Db_vscrt=mt && `
+meson setup .. --backend=ninja -Dprefix="$depsInstallPath" --buildtype=release -Db_vscrt=mt && `
 ninja -j32 install
 $buildstatus = $?
 Pop-Location
@@ -45,7 +45,7 @@ robocopy deps/zlib/zlib-1.3.1 deps/zlib /E
 Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path deps/zlib/zlib-1.3.1
 $zlib_build = New-Item -ItemType Directory -Path ".\deps\zlib" -Name "build"
 Push-Location -Path $zlib_build.FullName
-meson .. --backend=ninja -Dprefix="$depsInstallPath" --default-library=static --buildtype=release -Db_vscrt=mt && `
+meson setup .. --backend=ninja -Dprefix="$depsInstallPath" --default-library=static --buildtype=release -Db_vscrt=mt && `
 ninja -j32 install
 $buildstatus = $?
 Pop-Location
diff --git a/.gitlab-ci/windows/mesa_deps_libva.ps1 b/.gitlab-ci/windows/mesa_deps_libva.ps1
index e6b9fb696a1..8c4628897ed 100644
--- a/.gitlab-ci/windows/mesa_deps_libva.ps1
+++ b/.gitlab-ci/windows/mesa_deps_libva.ps1
@@ -29,7 +29,7 @@ Pop-Location
 # libva already has a build dir in their repo, use builddir instead
 $libva_build = New-Item -ItemType Directory -Path ".\deps\libva" -Name "builddir"
 Push-Location -Path $libva_build.FullName
-meson .. -Dprefix="$depsInstallPath"
+meson setup .. -Dprefix="$depsInstallPath"
 ninja -j32 install
 $buildstatus = $?
 Pop-Location
@@ -65,7 +65,7 @@ Write-Host "Building libva-utils"
 # libva-utils already has a build dir in their repo, use builddir instead
 $libva_utils_build = New-Item -ItemType Directory -Path ".\deps\libva-utils" -Name "builddir"
 Push-Location -Path $libva_utils_build.FullName
-meson .. -Dprefix="$depsInstallPath" --pkg-config-path="$depsInstallPath\lib\pkgconfig;$depsInstallPath\share\pkgconfig"
+meson setup .. -Dprefix="$depsInstallPath" --pkg-config-path="$depsInstallPath\lib\pkgconfig;$depsInstallPath\share\pkgconfig"
 ninja -j32 install
 $buildstatus = $?
 Pop-Location