diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb
index 9b48cf1..2741ef7 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb
@@ -47,7 +47,7 @@
         obmc-flash-bios \
         obmc-flash-bmc \
         obmc-mgr-download \
-        obmc-op-flasher \
+        ${@mf_enabled(d, 'openpower-ubi-fs', '', 'obmc-op-flasher')} \
         obmc-control-bmc \
         openpower-software-manager \
         "
diff --git a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc
index 74b3268..984a377 100644
--- a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc
+++ b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc
@@ -4,7 +4,6 @@
         obmc-phosphor-flash-mgmt \
         obmc-host-ipmi \
         obmc-host-ctl \
-        openpower-pflash \
         obmc-host-state-mgmt \
         obmc-chassis-state-mgmt \
         obmc-bmc-state-mgmt \
diff --git a/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf b/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf
index 9f2b25e..91bde4e 100644
--- a/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf
+++ b/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf
@@ -17,7 +17,6 @@
 #        obmc-phosphor-flash-mgmt \
 #        obmc-host-ipmi \
 #        obmc-host-ctl \
-#        openpower-pflash \
 #        obmc-host-state-mgmt \
 #        obmc-chassis-state-mgmt \
 #        obmc-bmc-state-mgmt \
diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-op-flasher.bb b/meta-phosphor/common/recipes-phosphor/flash/obmc-op-flasher.bb
index 9908500..d3d1290 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/obmc-op-flasher.bb
+++ b/meta-phosphor/common/recipes-phosphor/flash/obmc-op-flasher.bb
@@ -4,8 +4,7 @@
 
 inherit skeleton-gdbus
 
-# DEPEND,RDEPEND on pflash if the openpower-pflash machine feature is set.
-PACKAGECONFIG ??= "${@bb.utils.contains('MACHINE_FEATURES', 'openpower-pflash', 'openpower-pflash', '', d)}"
-PACKAGECONFIG[openpower-pflash] = ",,pflash,pflash"
+DEPENDS += "pflash"
+RDEPENDS_${PN} += "pflash"
 
 SKELETON_DIR = "op-flasher"