diff --git a/meta-facebook/conf/layer.conf b/meta-facebook/conf/layer.conf
index c0ca08f..a22a085 100644
--- a/meta-facebook/conf/layer.conf
+++ b/meta-facebook/conf/layer.conf
@@ -6,5 +6,5 @@
             ${LAYERDIR}/recipes-*/*/*.bbappend"
 
 BBFILE_COLLECTIONS += "facebook-layer"
-BBFILE_PATTERN_facebook-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_facebook-layer := "gatesgarth hardknott"
+BBFILE_PATTERN:facebook-layer := "^${LAYERDIR}/"
+LAYERSERIES_COMPAT:facebook-layer := "gatesgarth hardknott"
diff --git a/meta-facebook/conf/machine/include/facebook-withhost.inc b/meta-facebook/conf/machine/include/facebook-withhost.inc
index ebe79d1..dba7444 100644
--- a/meta-facebook/conf/machine/include/facebook-withhost.inc
+++ b/meta-facebook/conf/machine/include/facebook-withhost.inc
@@ -10,6 +10,6 @@
 VIRTUAL-RUNTIME_obmc-host-state-manager ?= "x86-power-control"
 VIRTUAL-RUNTIME_obmc-chassis-state-manager ?= "x86-power-control"
 
-PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs"
+PREFERRED_PROVIDER:virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs"
 
 OVERRIDES .= ":fb-withhost"
diff --git a/meta-facebook/conf/machine/include/facebook.inc b/meta-facebook/conf/machine/include/facebook.inc
index 2993dc4..33e95af 100644
--- a/meta-facebook/conf/machine/include/facebook.inc
+++ b/meta-facebook/conf/machine/include/facebook.inc
@@ -6,12 +6,12 @@
 
 VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config"
 
-PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-fb-apps"
-PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-fb-apps"
-PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-fb-apps"
-PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}"
-PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-fb-apps"
+PREFERRED_PROVIDER:virtual/obmc-chassis-mgmt = "packagegroup-fb-apps"
+PREFERRED_PROVIDER:virtual/obmc-fan-mgmt = "packagegroup-fb-apps"
+PREFERRED_PROVIDER:virtual/obmc-flash-mgmt = "packagegroup-fb-apps"
+PREFERRED_PROVIDER:virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}"
+PREFERRED_PROVIDER:virtual/obmc-system-mgmt = "packagegroup-fb-apps"
 
-IMAGE_FEATURES_remove = "obmc-ikvm"
+IMAGE_FEATURES:remove = "obmc-ikvm"
 
 OVERRIDES .= ":facebook"