diff --git a/meta-ibm/conf/machine/p10bmc.conf b/meta-ibm/conf/machine/p10bmc.conf
index 2046de2..4f23ec6 100644
--- a/meta-ibm/conf/machine/p10bmc.conf
+++ b/meta-ibm/conf/machine/p10bmc.conf
@@ -15,7 +15,7 @@
 require conf/machine/include/ast2600.inc
 require conf/machine/include/obmc-bsp-common.inc
 require conf/machine/include/openpower.inc
-include conf/machine/include/ibm-power10-cpu.inc
+require conf/machine/include/p10.inc
 require conf/distro/include/openpower-virtual-pnor.inc
 require conf/distro/include/openpower-hostfw-over-pldm.inc
 require conf/distro/include/ibm-mpreboot.inc
diff --git a/meta-openpower/conf/machine/include/p10.inc b/meta-openpower/conf/machine/include/p10.inc
new file mode 100644
index 0000000..64f089d
--- /dev/null
+++ b/meta-openpower/conf/machine/include/p10.inc
@@ -0,0 +1,3 @@
+include conf/machine/include/ibm-power10-cpu.inc
+MACHINE_FEATURES += 'op-fsi'
+PREFERRED_PROVIDER_virtual/obmc-host-ctl = "p9-host-start"