diff --git a/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb b/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb
index b722a76..3d4f912 100755
--- a/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb
+++ b/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb
@@ -14,9 +14,16 @@
 
 inherit meson pkgconfig obmc-phosphor-ipmiprovider-symlink
 
-EXTRA_OEMESON="-Dtests=disabled -Dbic=enabled -Dhost-instances='${OBMC_HOST_INSTANCES}'"
-EXTRA_OEMESON:remove:yosemitev2 = "-Dbic=enabled"
-EXTRA_OEMESON="-Dmachine='${MACHINE}'"
+PACKAGECONFIG ??= ""
+PACKAGECONFIG:fb-compute-multihost ??= "bic"
+
+PACKAGECONFIG[bic] = "-Dbic=enabled,-Dbic=disabled"
+
+EXTRA_OEMESON="\
+    -Dtests=disabled \
+    -Dmachine='${MACHINE}' \
+    -Dhost-instances='${OBMC_HOST_INSTANCES}' \
+    "
 
 LIBRARY_NAMES = "libzfboemcmds.so"