diff --git a/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb b/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb
index d4e8d20..b3783d8 100644
--- a/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb
+++ b/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb
@@ -45,10 +45,15 @@
 SUMMARY_${PN}-flash = "OpenPOWER Flash"
 RDEPENDS_${PN}-flash = " \
         obmc-control-bmc \
-        ${@mf_enabled(d, 'openpower-ubi-fs', \
-            'openpower-software-manager', \
-            'obmc-flash-bios obmc-mgr-download obmc-op-flasher')} \
+        obmc-flash-bios \
+        obmc-mgr-download \
+        obmc-op-flasher \
         "
+RDEPENDS_${PN}-flash_df-openpower-ubi-fs = " \
+        obmc-control-bmc \
+        openpower-software-manager \
+        "
+
 
 SUMMARY_${PN}-system = "OpenPOWER System"
 RDEPENDS_${PN}-system = " \