diff --git a/.gitlab-ci/common/weston.ini b/.gitlab-ci/common/weston.ini
index 338faf2180f..b35357703b9 100644
--- a/.gitlab-ci/common/weston.ini
+++ b/.gitlab-ci/common/weston.ini
@@ -2,3 +2,6 @@
 backend=headless-backend.so
 xwayland=true
 idle-time=0
+
+[xwayland]
+path=/usr/local/bin/Xwayland
diff --git a/.gitlab-ci/container/build-xwayland.sh b/.gitlab-ci/container/build-xwayland.sh
new file mode 100644
index 00000000000..04072794727
--- /dev/null
+++ b/.gitlab-ci/container/build-xwayland.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC2086 # we want word splitting
+
+set -uex
+
+uncollapsed_section_start xwayland "Building XWayland"
+
+# When changing this file, you need to bump the following
+# .gitlab-ci/image-tags.yml tags:
+# DEBIAN_BASE_TAG
+#
+export XORGPROTO_VERSION="xorgproto-2024.1"
+export XWAYLAND_VERSION="xwayland-24.1.8"
+
+git clone https://gitlab.freedesktop.org/xorg/proto/xorgproto
+cd xorgproto
+git checkout "$XORGPROTO_VERSION"
+meson setup _build ${EXTRA_MESON_ARGS:-}
+meson install -C _build
+cd ..
+rm -rf xorgproto
+
+git clone https://gitlab.freedesktop.org/xorg/xserver
+cd xserver
+git checkout "$XWAYLAND_VERSION"
+meson setup _build ${EXTRA_MESON_ARGS:-}
+meson install -C _build
+cd ..
+rm -rf xserver
+
+section_end xwayland
diff --git a/.gitlab-ci/container/debian/test-base.sh b/.gitlab-ci/container/debian/test-base.sh
index 1d2d8b07eef..2fcc71a862c 100644
--- a/.gitlab-ci/container/debian/test-base.sh
+++ b/.gitlab-ci/container/debian/test-base.sh
@@ -54,7 +54,9 @@ EPHEMERAL=(
     libgles2-mesa-dev
     liblz4-dev
     libpciaccess-dev
+    libpixman-1-dev
     libssl-dev
+    libtirpc-dev
     libvulkan-dev
     libudev-dev
     libwaffle-dev
@@ -66,14 +68,19 @@ EPHEMERAL=(
     libxfixes-dev
     libxcb-ewmh-dev
     libxcursor-dev
+    libxcvt-dev
     libxext-dev
+    libxfont-dev
     libxkbcommon-dev
+    libxkbfile-dev
     libxrandr-dev
     libxrender-dev
+    libxshmfence-dev
     libzstd-dev
     "llvm-${LLVM_VERSION}-dev"
     make
     meson
+    mesa-common-dev
     patch
     pkgconf
     protobuf-compiler
@@ -110,9 +117,11 @@ DEPS=(
     "libclang-cpp${LLVM_VERSION}"
     "libllvm${LLVM_VERSION}"
     liblz4-1
+    libpixman-1-0
     libpng16-16
     libproc2-0
     libpython3.11
+    libtirpc3
     libubsan1
     libvulkan1
     libwayland-client0
@@ -123,9 +132,12 @@ DEPS=(
     libxcb-shm0
     libxcb-xfixes0
     libxcursor1
+    libxcvt0
+    libxfont2
     libxkbcommon0
     libxrandr2
     libxrender1
+    libxshmfence1
     ocl-icd-libopencl1
     pciutils
     python3-lxml
@@ -144,8 +156,8 @@ DEPS=(
     sysvinit-core
     vulkan-tools
     waffle-utils
-    xwayland
     xinit
+    xserver-common
     xserver-xorg-video-amdgpu
     xserver-xorg-video-ati
     xauth
@@ -206,6 +218,10 @@ section_end debian_setup
 
 . .gitlab-ci/container/build-weston.sh
 
+############### Build XWayland
+
+. .gitlab-ci/container/build-xwayland.sh
+
 ############### Install Rust toolchain
 
 . .gitlab-ci/container/build-rust.sh
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index afa651ba96e..3234530e9fc 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -19,7 +19,7 @@ include:
   - .gitlab-ci/conditional-build-image-tags.yml
 
 variables:
-  DEBIAN_BASE_TAG: "20250709-weston14"
+  DEBIAN_BASE_TAG: "20250709-xwayland24"
 
   DEBIAN_BUILD_TAG: "20250710-libwayland"