diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf
index b119179e..f3feb8b5 100644
--- a/meta-arago-distro/conf/distro/arago.conf
+++ b/meta-arago-distro/conf/distro/arago.conf
@@ -39,12 +39,8 @@ IMAGE_BOOT_FILES += "uEnv.txt"
 TCMODEAPPEND ?= "-${TCMODE}"
 TMPDIR .= "${TCMODEAPPEND}"
 
-# Start with default set of distro features
-DISTRO_FEATURES = "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC}"
-
 # Add additional distro features
 DISTRO_FEATURES:append = " pam opencl"
-DISTRO_FEATURES:remove = "x11"
 
 # Normally target distro features will not be applied to native builds:
 # Native distro features on this list will use the target feature value
@@ -52,7 +48,7 @@ DISTRO_FEATURES_FILTER_NATIVE:append = " opencl"
 DISTRO_FEATURES_FILTER_NATIVESDK:append = " opencl"
 
 # Do not include these default DISTRO_FEATURES from oe-core
-DISTRO_FEATURES_OPTED_OUT = "ptest"
+DISTRO_FEATURES_OPTED_OUT = "ptest x11"
 
 # Set global runtime providers for major components
 ARAGO_SYSVINIT ??= "0"