diff --git a/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-core-x11-base.bbappend b/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-core-x11-base.bbappend
new file mode 100644
index 000000000..cab188f6b
--- /dev/null
+++ b/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-core-x11-base.bbappend
@@ -0,0 +1,3 @@
+# Copyright (C) 2021 Digi International
+
+RDEPENDS_${PN}_remove_ccimx6ul = "matchbox-terminal"
diff --git a/meta-digi-dey/recipes-sato/packagegroups/packagegroup-core-x11-sato.bbappend b/meta-digi-dey/recipes-sato/packagegroups/packagegroup-core-x11-sato.bbappend
index 3d50e5763..b045dcec1 100644
--- a/meta-digi-dey/recipes-sato/packagegroups/packagegroup-core-x11-sato.bbappend
+++ b/meta-digi-dey/recipes-sato/packagegroups/packagegroup-core-x11-sato.bbappend
@@ -1,4 +1,4 @@
-# Copyright (C) 2014 Digi International
+# Copyright (C) 2014-2021 Digi International
 
 # Disable network manager
 NETWORK_MANAGER = ""
@@ -7,7 +7,7 @@ RDEPENDS_${PN}-apps_remove_ccimx6ul = "gst-player"
 
 matchbox-base = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', ' \
                                          matchbox-desktop matchbox-session-sato  matchbox-keyboard matchbox-keyboard-applet matchbox-keyboard-im matchbox-config-gtk', '', d)}"
-matchbox-apps = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'matchbox-terminal', '', d)}"
+matchbox-apps = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'matchbox-terminal', '', d)}"
 
 RDEPENDS_${PN}-base_remove = "${matchbox-base}"
 RDEPENDS_${PN}-apps_remove = "${matchbox-apps} \