diff --git a/conf/layer.conf b/conf/layer.conf
index e028938..a5de6e1 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -17,8 +17,8 @@ INHERIT += "rm_work"
 
 EXTRA_IMAGE_FEATURES ?= " ssh-server-dropbear read-only-rootfs "
 # ssh-server-dropbear
-DISTRO_FEATURES:append := " vc4-gfx opengl "
-DISTRO_FEATURES:remove = " x11 wayland vulkan "
+DISTRO_FEATURES:append := " vc4-gfx opengl wayland "
+DISTRO_FEATURES:remove = " x11 vulkan "
 TOOLCHAIN_TARGET_TASK:append = " libgles3-mesa-dev "
 # DISTRO_FEATURES:append := " vc4-gfx opengl directfb "
 MACHINE ?= "raspberrypi0-2w-64"
diff --git a/recipes-core/images/core-image-minimal.bbappend b/recipes-core/images/core-image-minimal.bbappend
index 615f133..325d129 100644
--- a/recipes-core/images/core-image-minimal.bbappend
+++ b/recipes-core/images/core-image-minimal.bbappend
@@ -44,12 +44,14 @@ IMAGE_INSTALL:append = "libcurl \
                         raspi-gpio \
                         rsync \
                         coreutils \
+                        wayland weston \
                         qtbase \
                         qtdeclarative \
                         qtquickcontrols2 \
                         qtquickcontrols \
                         qtvirtualkeyboard \
                         qtgraphicaleffects \
+                        qtwayland \
                         qt5-opengles2-test \
                         gdbserver \
                         "