diff --git a/meta-witherspoon/conf/distro/openbmc-witherspoon.conf b/meta-witherspoon/conf/distro/openbmc-witherspoon.conf
index c00930a..543e7f9 100644
--- a/meta-witherspoon/conf/distro/openbmc-witherspoon.conf
+++ b/meta-witherspoon/conf/distro/openbmc-witherspoon.conf
@@ -1,3 +1,4 @@
 require conf/distro/include/phosphor-base.inc
 require conf/distro/include/phosphor-ubi.inc
 require conf/distro/include/openpower-mrw.inc
+require conf/distro/include/openpower-ubi.inc
diff --git a/meta-witherspoon/conf/machine/witherspoon.conf b/meta-witherspoon/conf/machine/witherspoon.conf
index 13831a7..75ef287 100644
--- a/meta-witherspoon/conf/machine/witherspoon.conf
+++ b/meta-witherspoon/conf/machine/witherspoon.conf
@@ -3,8 +3,6 @@
 
 UBOOT_MACHINE = "ast_g5_ncsi_config"
 
-OBMC_MACHINE_FEATURES += "openpower-ubi-fs"
-
 OBMC_POWER_SUPPLY_INSTANCES = "0 1"
 
 PREFERRED_PROVIDER_virtual/p9-vcs-workaround = ''