diff --git a/debian-docker-images/am62/weston-am62/Dockerfile b/debian-docker-images/am62/weston-am62/Dockerfile
index 08eee21..f839289 100644
--- a/debian-docker-images/am62/weston-am62/Dockerfile
+++ b/debian-docker-images/am62/weston-am62/Dockerfile
@@ -30,6 +30,9 @@ RUN usermod -a -G input torizon
 # See https://github.com/kennylevinsen/seatd/blob/a803ba0502cccf147eec7fbcacd11c5b8643c0e0/man/seatd-launch.1.scd
 RUN chmod u+s /usr/bin/seatd-launch
 
+HEALTHCHECK --interval=1s --timeout=5s --start-period=0s --retries=3 \
+    CMD find /tmp/1000-runtime-dir -maxdepth 1 -type s -name 'wayland-*' -print -quit | grep -q .
+
 WORKDIR /home/torizon
 
 ENTRYPOINT ["/usr/bin/entry.sh"]
diff --git a/debian-docker-images/imx8/weston-imx8/Dockerfile b/debian-docker-images/imx8/weston-imx8/Dockerfile
index 891e393..6abdf2e 100644
--- a/debian-docker-images/imx8/weston-imx8/Dockerfile
+++ b/debian-docker-images/imx8/weston-imx8/Dockerfile
@@ -36,6 +36,9 @@ RUN usermod -a -G input torizon
 # See https://github.com/kennylevinsen/seatd/blob/a803ba0502cccf147eec7fbcacd11c5b8643c0e0/man/seatd-launch.1.scd
 RUN chmod u+s /usr/bin/seatd-launch
 
+HEALTHCHECK --interval=1s --timeout=5s --start-period=0s --retries=3 \
+    CMD find /tmp/1000-runtime-dir -maxdepth 1 -type s -name 'wayland-*' -print -quit | grep -q .
+
 WORKDIR /home/torizon
 
 ENTRYPOINT ["/usr/bin/entry.sh"]
diff --git a/debian-docker-images/upstream/qt5-wayland-examples/Dockerfile b/debian-docker-images/upstream/qt5-wayland-examples/Dockerfile
index 43a4e9a..9916e20 100644
--- a/debian-docker-images/upstream/qt5-wayland-examples/Dockerfile
+++ b/debian-docker-images/upstream/qt5-wayland-examples/Dockerfile
@@ -3,14 +3,14 @@
 
 ARG BASE_NAME=qt5-wayland
 ARG IMAGE_TAG=3
-ARG DOCKER_REGISTRY=torizon
-
+ARG DOCKER_REGISTRY=docker.io
+ARG DOCKER_NAMESPACE=torizon
 ARG QT5_EXAMPLES_DEBIAN
 # Uncomment the line below if building outside of the context of GitLab CI
-# ARG QT5_EXAMPLES_DEBIAN=1
+ARG QT5_EXAMPLES_DEBIAN=1
 ARG QT5_EXAMPLES_DEBIAN_INSTALL=${QT5_EXAMPLES_DEBIAN:+"qtbase5-examples qtdeclarative5-examples"}
 
-FROM $DOCKER_REGISTRY/torizon/$BASE_NAME:$IMAGE_TAG AS base
+FROM $DOCKER_REGISTRY/$DOCKER_NAMESPACE/$BASE_NAME:$IMAGE_TAG AS base
 ARG QT5_EXAMPLES_DEBIAN_INSTALL
 
 RUN apt-get -y update && apt-get install -y --no-install-recommends \
diff --git a/debian-docker-images/upstream/weston/Dockerfile b/debian-docker-images/upstream/weston/Dockerfile
index 08eee21..f839289 100644
--- a/debian-docker-images/upstream/weston/Dockerfile
+++ b/debian-docker-images/upstream/weston/Dockerfile
@@ -30,6 +30,9 @@ RUN usermod -a -G input torizon
 # See https://github.com/kennylevinsen/seatd/blob/a803ba0502cccf147eec7fbcacd11c5b8643c0e0/man/seatd-launch.1.scd
 RUN chmod u+s /usr/bin/seatd-launch
 
+HEALTHCHECK --interval=1s --timeout=5s --start-period=0s --retries=3 \
+    CMD find /tmp/1000-runtime-dir -maxdepth 1 -type s -name 'wayland-*' -print -quit | grep -q .
+
 WORKDIR /home/torizon
 
 ENTRYPOINT ["/usr/bin/entry.sh"]