diff --git a/meta-digi-arm/conf/machine/include/ccimx8x.inc b/meta-digi-arm/conf/machine/include/ccimx8x.inc
index 21338e7d7..1ea798c6a 100644
--- a/meta-digi-arm/conf/machine/include/ccimx8x.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx8x.inc
@@ -42,3 +42,7 @@ MACHINE_FEATURES += "accel-graphics accel-video wifi bluetooth cryptochip"
 
 # AARCH64 doesn't support self-extracting zImage
 KERNEL_IMAGETYPE = "Image.gz"
+
+# Adding 'wayland' along with 'x11' enables the xwayland backend
+# Vulkan is necessary for wayland to build
+DISTRO_FEATURES_append = " wayland vulkan"
diff --git a/meta-digi-dey/conf/distro/dey.conf b/meta-digi-dey/conf/distro/dey.conf
index c5dfe8f01..bdbe90f5e 100644
--- a/meta-digi-dey/conf/distro/dey.conf
+++ b/meta-digi-dey/conf/distro/dey.conf
@@ -22,12 +22,13 @@ POKY_DEFAULT_EXTRA_RRECOMMENDS = ""
 DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC} ${POKY_DEFAULT_DISTRO_FEATURES}"
 
 # Removed DISTRO_FEATURES
-#   'wayland' -> not supported at the moment
+#   'wayland' -> only supported on the i.MX8 QXP
 #   'ptest'   -> fails to build QT5 toolchain
 DISTRO_FEATURES_DEFAULT_remove = "3g nfc nfs zeroconf"
 POKY_DEFAULT_DISTRO_FEATURES_remove = "ptest wayland"
 
-GRAPHICAL_BACKEND = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'fb', d)}"
+GRAPHICAL_BACKEND = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', \
+                        bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'fb', d), d)}"
 
 # Recovery initramfs image name.
 RECOVERY_INITRAMFS_IMAGE ?= "dey-image-recovery-initramfs"
diff --git a/meta-digi-dey/recipes-core/images/dey-image-qt.bb b/meta-digi-dey/recipes-core/images/dey-image-qt.bb
index a6ffcef3d..2461bbe03 100644
--- a/meta-digi-dey/recipes-core/images/dey-image-qt.bb
+++ b/meta-digi-dey/recipes-core/images/dey-image-qt.bb
@@ -19,7 +19,9 @@ IMAGE_FEATURES += " \
     eclipse-debug \
     package-management \
     ssh-server-dropbear \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11-base x11-sato', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \
+       bb.utils.contains('DISTRO_FEATURES',     'x11', 'x11-base x11-sato', \
+                                                       '', d), d)} \
     ${@bb.utils.contains('MACHINE_FEATURES', 'accel-video', 'dey-gstreamer', '', d)} \
     ${@bb.utils.contains('MACHINE_FEATURES', 'alsa', 'dey-audio', '', d)} \
     ${@bb.utils.contains('MACHINE_FEATURES', 'bluetooth', 'dey-bluetooth', '', d)} \
@@ -43,7 +45,7 @@ inherit core-image
 inherit dey-image
 inherit distro_features_check
 
-CONFLICT_DISTRO_FEATURES = "directfb wayland"
+CONFLICT_DISTRO_FEATURES = "directfb"
 
 IMAGE_ROOTFS_SIZE = "8192"
 
@@ -52,3 +54,8 @@ BAD_RECOMMENDATIONS += "udev-cache"
 BAD_RECOMMENDATIONS += "eudev-hwdb"
 
 export IMAGE_BASENAME = "dey-image-qt-${GRAPHICAL_BACKEND}"
+
+CORE_IMAGE_EXTRA_INSTALL += " \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'weston-init weston-examples gtk+3-demo clutter-1.0-examples', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'weston-xwayland xterm', '', d)} \
+"