diff --git a/.gitlab-ci/common/generate-env.sh b/.gitlab-ci/common/generate-env.sh
index 9aaa570d7ff..8925fd88791 100755
--- a/.gitlab-ci/common/generate-env.sh
+++ b/.gitlab-ci/common/generate-env.sh
@@ -62,6 +62,7 @@ for var in \
     HWCI_FREQ_MAX \
     HWCI_KERNEL_MODULES \
     HWCI_KVM \
+    HWCI_START_WESTON \
     HWCI_START_XORG \
     HWCI_TEST_SCRIPT \
     IR3_SHADER_DEBUG \
diff --git a/.gitlab-ci/common/init-stage2.sh b/.gitlab-ci/common/init-stage2.sh
index a0718bf37fc..6960a3ab1fa 100755
--- a/.gitlab-ci/common/init-stage2.sh
+++ b/.gitlab-ci/common/init-stage2.sh
@@ -131,6 +131,15 @@ if [ -n "$HWCI_START_XORG" ]; then
   export DISPLAY=:0
 fi
 
+if [ -n "$HWCI_START_WESTON" ]; then
+  export XDG_RUNTIME_DIR=/run/user
+  mkdir -p $XDG_RUNTIME_DIR
+
+  weston -Bheadless-backend.so -Swayland-0 &
+  export WAYLAND_DISPLAY=wayland-0
+  sleep 1
+fi
+
 RESULT=fail
 set +e
 sh -c "$HWCI_TEST_SCRIPT"
diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh
index 71b11ab0750..2c100d5243d 100644
--- a/.gitlab-ci/container/build-deqp.sh
+++ b/.gitlab-ci/container/build-deqp.sh
@@ -40,6 +40,12 @@ cmake -S /VK-GL-CTS -B . -G Ninja \
 ninja modules/egl/deqp-egl
 cp /deqp/modules/egl/deqp-egl /deqp/modules/egl/deqp-egl-x11
 
+cmake -S /VK-GL-CTS -B . -G Ninja \
+      -DDEQP_TARGET=wayland \
+      -DCMAKE_BUILD_TYPE=Release \
+      $EXTRA_CMAKE_ARGS
+ninja modules/egl/deqp-egl
+cp /deqp/modules/egl/deqp-egl /deqp/modules/egl/deqp-egl-wayland
 
 cmake -S /VK-GL-CTS -B . -G Ninja \
       -DDEQP_TARGET=${DEQP_TARGET:-x11_glx} \
diff --git a/.gitlab-ci/container/create-rootfs.sh b/.gitlab-ci/container/create-rootfs.sh
index 8ead0f4c1d9..457643ad337 100644
--- a/.gitlab-ci/container/create-rootfs.sh
+++ b/.gitlab-ci/container/create-rootfs.sh
@@ -102,6 +102,7 @@ apt-get -y install --no-install-recommends \
     sntp \
     strace \
     waffle-utils \
+    weston \
     wget \
     xinit \
     xserver-xorg-core \
diff --git a/.gitlab-ci/container/debian/x86_test-gl.sh b/.gitlab-ci/container/debian/x86_test-gl.sh
index 7a15842bddc..1e52baea783 100644
--- a/.gitlab-ci/container/debian/x86_test-gl.sh
+++ b/.gitlab-ci/container/debian/x86_test-gl.sh
@@ -25,6 +25,7 @@ STABLE_EPHEMERAL=" \
       libudev-dev \
       libvulkan-dev \
       libwaffle-dev \
+      libwayland-dev \
       libx11-xcb-dev \
       libxcb-dri2-0-dev \
       libxkbcommon-dev \
@@ -59,7 +60,8 @@ apt-get install -y --no-remove \
       python3-lxml \
       python3-renderdoc \
       python3-simplejson \
-      spirv-tools
+      spirv-tools \
+      weston
 
 
 . .gitlab-ci/container/container_pre_build.sh
diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh
index 27041dfa6df..80f42d25f39 100755
--- a/.gitlab-ci/container/lava_build.sh
+++ b/.gitlab-ci/container/lava_build.sh
@@ -110,6 +110,7 @@ apt-get install -y --no-remove \
                    libx11-xcb-dev \
                    libxcb-dri2-0-dev \
                    libxkbcommon-dev \
+                   libwayland-dev \
                    ninja-build \
                    patch \
                    protobuf-compiler \
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index ddfb62e3a14..fe3dbe10150 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-08-deqp-runner"
+   DEBIAN_X86_TEST_GL_TAG: "2022-11-17-weston"
    DEBIAN_X86_TEST_VK_TAG: "2022-11-17-test-img-path"
 
    ALPINE_X86_BUILD_TAG: "2022-11-15-alpine-bringup"
    FEDORA_X86_BUILD_TAG: "2022-09-22-python3-ply-2"
-   KERNEL_ROOTFS_TAG: "2022-11-08-deqp-runner"
+   KERNEL_ROOTFS_TAG: "2022-11-17-weston"
 
    WINDOWS_X64_VS_PATH: "windows/x64_vs"
    WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib"