diff --git a/meta-witherspoon/conf/distro/openbmc-witherspoon.conf b/meta-witherspoon/conf/distro/openbmc-witherspoon.conf
index 27bf881..c00930a 100644
--- a/meta-witherspoon/conf/distro/openbmc-witherspoon.conf
+++ b/meta-witherspoon/conf/distro/openbmc-witherspoon.conf
@@ -1,2 +1,3 @@
 require conf/distro/include/phosphor-base.inc
+require conf/distro/include/phosphor-ubi.inc
 require conf/distro/include/openpower-mrw.inc
diff --git a/meta-witherspoon/conf/machine/witherspoon.conf b/meta-witherspoon/conf/machine/witherspoon.conf
index 5d2f25f..13831a7 100644
--- a/meta-witherspoon/conf/machine/witherspoon.conf
+++ b/meta-witherspoon/conf/machine/witherspoon.conf
@@ -3,7 +3,7 @@
 
 UBOOT_MACHINE = "ast_g5_ncsi_config"
 
-OBMC_MACHINE_FEATURES += "obmc-ubi-fs openpower-ubi-fs"
+OBMC_MACHINE_FEATURES += "openpower-ubi-fs"
 
 OBMC_POWER_SUPPLY_INSTANCES = "0 1"