diff --git a/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb b/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb
index 9b48cf1..2741ef7 100644
--- a/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb
+++ b/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/conf/machine/include/openpower.inc b/conf/machine/include/openpower.inc
index 74b3268..984a377 100644
--- a/conf/machine/include/openpower.inc
+++ b/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 \