diff --git a/meta-oniro-core/conf/distro/oniro-linux.conf b/meta-oniro-core/conf/distro/oniro-linux.conf
index 19e37821e9bb001f726a43fc9d61c2ffca5609d1..e46e3a16268aa2ee2516aaa297854df180d715b3 100644
--- a/meta-oniro-core/conf/distro/oniro-linux.conf
+++ b/meta-oniro-core/conf/distro/oniro-linux.conf
@@ -23,6 +23,10 @@ ONIRO_DEFAULT_DISTRO_FEATURES = "largefile opengl ptest multiarch pam rauc secur
 ONIRO_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot"
 ONIRO_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet"
 
+# Remove some of the default Poky DISTRO_FEATURES_DEFAULT we inherited, but do not use.
+# Removing this here allows us to readd them, if the end user requires them.
+DISTRO_FEATURES_DEFAULT:remove = " nfs nfc 3g pcmcia x11"
+
 DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${ONIRO_DEFAULT_DISTRO_FEATURES}"
 
 SDK_NAME = "${DISTRO}-${TCLIBC}-${SDKMACHINE}-${IMAGE_BASENAME}-${TUNE_PKGARCH}-${MACHINE}"
@@ -63,12 +67,6 @@ TCLIBC = "musl"
 
 INIT_MANAGER = "systemd"
 
-# Remove some of the default Poky DISTRO_FEATURES we inherited, but do not use.
-DISTRO_FEATURES:remove = " nfs nfc 3g pcmcia x11"
-
-# Remove some of the default Poky IMAGE_FEATURES we inherited, but do not need.
-IMAGE_FEATURES:remove = " nfs-server nfs-client nfs-utils"
-
 PREFERRED_VERSION_linux-yocto = "5.10%"
 PREFERRED_PROVIDER_virtual/kernel:qemuarm = "linux-oniro"
 PREFERRED_PROVIDER_virtual/kernel:qemuarm64 = "linux-oniro"
diff --git a/meta-oniro-core/recipes-core/images/oniro-image-common.inc b/meta-oniro-core/recipes-core/images/oniro-image-common.inc
index c22c16d3b82c756b20c20de0f3ff3bbdce1820ca..0ac0ab13f23416c5bedbcb94490dfde43bbea081 100644
--- a/meta-oniro-core/recipes-core/images/oniro-image-common.inc
+++ b/meta-oniro-core/recipes-core/images/oniro-image-common.inc
@@ -6,6 +6,10 @@
 
 inherit oniro-image
 
+# Remove some of the default Poky IMAGE_FEATURES we inherited, but do not need.
+# Best practices here are IMAGE_FEATURES should be used within image recipes.
+IMAGE_FEATURES:remove = " nfs-server nfs-client nfs-utils"
+
 IMAGE_INSTALL:append = "\
 			packagegroup-oniro-core \
 			packagegroup-net-essentials \