diff --git a/meta-amd/conf/machine/include/amd.inc b/meta-amd/conf/machine/include/amd.inc
index 78ca8f2..c29336c 100644
--- a/meta-amd/conf/machine/include/amd.inc
+++ b/meta-amd/conf/machine/include/amd.inc
@@ -8,16 +8,16 @@
         obmc-phosphor-flash-mgmt \
         "
 
-VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config"
 VIRTUAL-RUNTIME_obmc-host-state-manager ?= "x86-power-control"
 VIRTUAL-RUNTIME_obmc-chassis-state-manager ?= "x86-power-control"
 VIRTUAL-RUNTIME_obmc-sensors-hwmon ?= "dbus-sensors"
+VIRTUAL-RUNTIME_obmc-inventory-manager = "entity-manager"
 
+PREFERRED_PROVIDER_virtual/obmc-inventory-data = "entity-manager"
 PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-amd-apps"
 PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-amd-apps"
 PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-amd-apps"
 PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs"
-PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}"
 PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-amd-apps"
 
 OVERRIDES .= ":amd"