diff --git a/.gitlab-ci/container/build-wayland.sh b/.gitlab-ci/container/build-wayland.sh
index 4ebabfafdf2..5d7aca5b3bc 100644
--- a/.gitlab-ci/container/build-wayland.sh
+++ b/.gitlab-ci/container/build-wayland.sh
@@ -22,14 +22,14 @@ git clone https://gitlab.freedesktop.org/wayland/wayland
 cd wayland
 git checkout "$LIBWAYLAND_VERSION"
 
-# Build the scanner first in case we're a cross build
-# Note the lack of EXTRA_MESON_ARGS here.  This is always a native build
-meson setup -Dtests=false -Ddocumentation=false -Ddtd_validation=false -Dlibraries=false -Dscanner=true _scanner
-meson install -C _scanner
-
-# Now build libwayland using the given scanner
-meson setup -Ddocumentation=false -Ddtd_validation=false -Dlibraries=true -Dscanner=false _build ${EXTRA_MESON_ARGS:-}
+# Build the native library and scanner first in case we're a cross build.
+# Note the lack of EXTRA_MESON_ARGS here.
+meson setup -Dtests=false -Ddocumentation=false -Ddtd_validation=false -Dlibraries=true -Dscanner=true _build
 meson install -C _build
+
+# Now build cross libwayland using the native scanner
+meson setup -Dtests=false -Ddocumentation=false -Ddtd_validation=false -Dlibraries=true -Dscanner=false _cross ${EXTRA_MESON_ARGS:-}
+meson install -C _cross
 cd ..
 rm -rf wayland
 
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index d8f6c25e189..d0d30a07566 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -19,20 +19,20 @@ include:
   - .gitlab-ci/conditional-build-image-tags.yml
 
 variables:
-  DEBIAN_BASE_TAG: "20250715-apitrace"
+  DEBIAN_BASE_TAG: "20250722-libwayland"
 
-  DEBIAN_BUILD_TAG: "20250710-libwayland"
+  DEBIAN_BUILD_TAG: "20250722-libwayland"
 
-  DEBIAN_TEST_ANDROID_TAG: "20250718-angle-6a"
-  DEBIAN_TEST_GL_TAG: "20250718-piglit-09"
+  DEBIAN_TEST_ANDROID_TAG: "20250722-libwayland"
+  DEBIAN_TEST_GL_TAG: "20250722-libwayland"
   DEBIAN_TEST_VIDEO_TAG: "20250609-helper"
-  DEBIAN_TEST_VK_TAG: "20250718-piglit-09"
+  DEBIAN_TEST_VK_TAG: "20250722-libwayland"
 
-  ALPINE_X86_64_BUILD_TAG: "20250709-libwayland"
+  ALPINE_X86_64_BUILD_TAG: "20250722-libwayland"
   ALPINE_X86_64_LAVA_SSH_TAG: "20250423-rootfs"
   ALPINE_X86_64_LAVA_TRIGGER_TAG: "20250717-lava"
 
-  FEDORA_X86_64_BUILD_TAG: "20250709-libwayland"
+  FEDORA_X86_64_BUILD_TAG: "20250722-libwayland"
 
   KERNEL_TAG: "v6.14-mesa-4277"
   KERNEL_REPO: "gfx-ci/linux"