diff --git a/meta-digi-dey/conf/distro/dey-gui.conf b/meta-digi-dey/conf/distro/dey-gui.conf
index 6874715a1..4ad19d5ee 100644
--- a/meta-digi-dey/conf/distro/dey-gui.conf
+++ b/meta-digi-dey/conf/distro/dey-gui.conf
@@ -1,3 +1,3 @@
 include dey.conf
 
-DISTRO_FEATURES += "wayland x11"
+DISTRO_FEATURES += "x11"
diff --git a/meta-digi-dey/recipes-core/images/dey-image-graphical.bb b/meta-digi-dey/recipes-core/images/dey-image-graphical.bb
index 65a5e00e5..9029516c4 100644
--- a/meta-digi-dey/recipes-core/images/dey-image-graphical.bb
+++ b/meta-digi-dey/recipes-core/images/dey-image-graphical.bb
@@ -11,6 +11,8 @@ LICENSE = "MIT"
 
 include dey-image-minimal.bb
 
+REQUIRED_DISTRO_FEATURES = "x11"
+
 WEB = "web-webkit"
 
 SOC_IMAGE_INSTALL = ""
diff --git a/meta-digi-dey/recipes-core/images/dey-image-minimal.bb b/meta-digi-dey/recipes-core/images/dey-image-minimal.bb
index 16f217401..48d8be56d 100644
--- a/meta-digi-dey/recipes-core/images/dey-image-minimal.bb
+++ b/meta-digi-dey/recipes-core/images/dey-image-minimal.bb
@@ -17,6 +17,9 @@ LICENSE = "MIT"
 
 inherit core-image
 inherit dey-image
+inherit distro_features_check
+
+CONFLICT_DISTRO_FEATURES = "directfb wayland"
 
 # Only common features to remain here.
 VIRTUAL_RUNTIME_ssh_server ?= "ssh-server-dropbear"