diff --git a/meta-on5263m5/conf/layer.conf b/meta-on5263m5/conf/layer.conf
index b2ef63d..b49d300 100644
--- a/meta-on5263m5/conf/layer.conf
+++ b/meta-on5263m5/conf/layer.conf
@@ -6,7 +6,5 @@
             ${LAYERDIR}/recipes-*/*/*.bbappend"
 
 BBFILE_COLLECTIONS += "on5263m5-layer"
-BBFILE_PATTERN_on5263m5-layer = ""
-BBFILE_PRIORITY_on5263m5-layer = "5"
+BBFILE_PATTERN_on5263m5-layer = "^${LAYERDIR}/"
 LAYERSERIES_COMPAT_on5263m5-layer = "thud warrior"
-
diff --git a/meta-on5263m5/conf/machine/on5263m5.conf b/meta-on5263m5/conf/machine/on5263m5.conf
index ba8ce10..1c21791 100644
--- a/meta-on5263m5/conf/machine/on5263m5.conf
+++ b/meta-on5263m5/conf/machine/on5263m5.conf
@@ -3,10 +3,14 @@
 
 require conf/machine/include/ast2500.inc
 require conf/machine/include/obmc-bsp-common.inc
-require conf/machine/include/inspur.inc
+
+PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-inspur-apps"
+PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-inspur-apps"
+PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-inspur-apps"
+PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-inspur-apps"
+PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs"
 
 UBOOT_MACHINE = "ast_g5_phy_config"
 
 FLASH_SIZE = "32768"
 
-VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config"