diff --git a/.gitlab-ci/container/build-wayland.sh b/.gitlab-ci/container/build-wayland.sh
index c691116e311..4ebabfafdf2 100644
--- a/.gitlab-ci/container/build-wayland.sh
+++ b/.gitlab-ci/container/build-wayland.sh
@@ -15,13 +15,20 @@ uncollapsed_section_start wayland "Building Wayland"
 # DEBIAN_TEST_VK_TAG
 # FEDORA_X86_64_BUILD_TAG
 
-export LIBWAYLAND_VERSION="1.21.0"
+export LIBWAYLAND_VERSION="1.24.0"
 export WAYLAND_PROTOCOLS_VERSION="1.41"
 
 git clone https://gitlab.freedesktop.org/wayland/wayland
 cd wayland
 git checkout "$LIBWAYLAND_VERSION"
-meson setup -Ddocumentation=false -Ddtd_validation=false -Dlibraries=true _build ${EXTRA_MESON_ARGS:-}
+
+# 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:-}
 meson install -C _build
 cd ..
 rm -rf wayland
diff --git a/.gitlab-ci/container/cross_build.sh b/.gitlab-ci/container/cross_build.sh
index 986807c3265..9e97fe83052 100644
--- a/.gitlab-ci/container/cross_build.sh
+++ b/.gitlab-ci/container/cross_build.sh
@@ -39,7 +39,6 @@ DEPS=(
     "libxrandr-dev:$arch"
     "libxshmfence-dev:$arch"
     "libxxf86vm-dev:$arch"
-    "libwayland-dev:$arch"
 )
 
 dpkg --add-architecture $arch
diff --git a/.gitlab-ci/container/debian/test-base.sh b/.gitlab-ci/container/debian/test-base.sh
index 66525572dc3..9c4e142f0fd 100644
--- a/.gitlab-ci/container/debian/test-base.sh
+++ b/.gitlab-ci/container/debian/test-base.sh
@@ -56,7 +56,6 @@ EPHEMERAL=(
     libvulkan-dev
     libudev-dev
     libwaffle-dev
-    libwayland-dev
     libx11-xcb-dev
     libxcb-dri2-0-dev
     libxcb-dri3-dev
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 806ee26ec2c..0583e45456d 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: "20250618-crosvmvirgl"
+  DEBIAN_BASE_TAG: "20250709-libwayland"
 
-  DEBIAN_BUILD_TAG: "20250611-rust"
+  DEBIAN_BUILD_TAG: "20250710-libwayland"
 
-  DEBIAN_TEST_ANDROID_TAG: "20250701-cuttlefish"
-  DEBIAN_TEST_GL_TAG: "20250616-vkcts-main"
+  DEBIAN_TEST_ANDROID_TAG: "20250709-libwayland"
+  DEBIAN_TEST_GL_TAG: "20250709-libwayland"
   DEBIAN_TEST_VIDEO_TAG: "20250609-helper"
-  DEBIAN_TEST_VK_TAG: "20250619-vkd3d"
+  DEBIAN_TEST_VK_TAG: "20250709-libwayland"
 
-  ALPINE_X86_64_BUILD_TAG: "20250611-rust"
+  ALPINE_X86_64_BUILD_TAG: "20250709-libwayland"
   ALPINE_X86_64_LAVA_SSH_TAG: "20250423-rootfs"
   ALPINE_X86_64_LAVA_TRIGGER_TAG: "20250619-cts-ovl"
 
-  FEDORA_X86_64_BUILD_TAG: "20250611-rust"
+  FEDORA_X86_64_BUILD_TAG: "20250709-libwayland"
 
   KERNEL_TAG: "v6.14-mesa-4277"
   KERNEL_REPO: "gfx-ci/linux"