diff --git a/.gitlab-ci/common/init-stage2.sh b/.gitlab-ci/common/init-stage2.sh
index 8e518c5b1a5..0fada428ed2 100755
--- a/.gitlab-ci/common/init-stage2.sh
+++ b/.gitlab-ci/common/init-stage2.sh
@@ -146,9 +146,13 @@ if [ -n "$HWCI_START_WESTON" ]; then
   export XDG_RUNTIME_DIR=/run/user
   mkdir -p $XDG_RUNTIME_DIR
 
+  # Xwayland to be used when HWCI_START_XORG is not set
+  export DISPLAY=:0
+  mkdir -p /tmp/.X11-unix
+
   env \
     VK_ICD_FILENAMES=/install/share/vulkan/icd.d/${VK_DRIVER}_icd.`uname -m`.json \
-    weston -Bheadless-backend.so --use-gl -Swayland-0 &
+    weston -Bheadless-backend.so --use-gl -Swayland-0 --xwayland &
   export WAYLAND_DISPLAY=wayland-0
   sleep 1
 fi
diff --git a/.gitlab-ci/container/create-rootfs.sh b/.gitlab-ci/container/create-rootfs.sh
index 457643ad337..5d698f9ca2d 100644
--- a/.gitlab-ci/container/create-rootfs.sh
+++ b/.gitlab-ci/container/create-rootfs.sh
@@ -106,6 +106,7 @@ apt-get -y install --no-install-recommends \
     wget \
     xinit \
     xserver-xorg-core \
+    xwayland \
     zstd
 
 
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 6491f5f078a..859cab63909 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -14,12 +14,12 @@ variables:
    DEBIAN_X86_TEST_IMAGE_VK_PATH: "debian/x86_test-vk"
    DEBIAN_X86_TEST_IMAGE_PATH: ${DEBIAN_X86_TEST_IMAGE_GL_PATH}
 
-   DEBIAN_X86_TEST_GL_TAG: "2022-11-17-weston"
+   DEBIAN_X86_TEST_GL_TAG: "2023-01-08-weston-xwayland"
    DEBIAN_X86_TEST_VK_TAG: "2022-12-12-vkd3d-proton-uprev"
 
    ALPINE_X86_BUILD_TAG: "2022-11-15-alpine-bringup"
    FEDORA_X86_BUILD_TAG: "2022-09-22-python3-ply-2"
-   KERNEL_ROOTFS_TAG: "2023-01-06-virglrenderer"
+   KERNEL_ROOTFS_TAG: "2023-01-08-weston-xwayland"
 
    WINDOWS_X64_VS_PATH: "windows/x64_vs"
    WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib"