diff --git a/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend b/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend
index f0a1c7b..2666140 100644
--- a/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend
+++ b/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend
@@ -1,8 +1,8 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}/${MACHINE}:"
 OBMC_CONSOLE_HOST_TTY = "ttyS2"
 
-SRC_URI_append_tiogapass = " file://server.ttyS2.conf"
-SRC_URI_append_yosemitev2 = " file://server.ttyS0.conf \
+SRC_URI:append:tiogapass = " file://server.ttyS2.conf"
+SRC_URI:append:yosemitev2 = " file://server.ttyS0.conf \
                               file://server.ttyS1.conf \
                               file://server.ttyS2.conf \
                               file://server.ttyS3.conf \
@@ -11,12 +11,12 @@
                               file://client.2202.conf \
                               file://client.2203.conf"
 
-SRC_URI_remove = "file://${BPN}.conf"
+SRC_URI:remove = "file://${BPN}.conf"
 
-SYSTEMD_SERVICE_${PN}_remove_yosemitev2 = "obmc-console-ssh.socket"
-EXTRA_OECONF_append_yosemitev2 = " --enable-concurrent-servers"
+SYSTEMD_SERVICE:${PN}:remove:yosemitev2 = "obmc-console-ssh.socket"
+EXTRA_OECONF:append:yosemitev2 = " --enable-concurrent-servers"
 
-do_install_append() {
+do_install:append() {
         # Install the server configuration
         install -m 0755 -d ${D}${sysconfdir}/${BPN}
         install -m 0644 ${WORKDIR}/*.conf ${D}${sysconfdir}/${BPN}/
diff --git a/meta-facebook/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-facebook/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
index 83567e9..4cdfe5a 100644
--- a/meta-facebook/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
+++ b/meta-facebook/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-EXTRA_OECONF_append = " --enable-configure-dbus=yes"
+EXTRA_OECONF:append = " --enable-configure-dbus=yes"
diff --git a/meta-facebook/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-facebook/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
index 2d03632..047f019 100644
--- a/meta-facebook/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
+++ b/meta-facebook/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
@@ -1,10 +1,10 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 SRC_URI += "file://bios-update.sh"
 
-PACKAGECONFIG_append = " flash_bios"
-RDEPENDS_${PN} += "bash"
+PACKAGECONFIG:append = " flash_bios"
+RDEPENDS:${PN} += "bash"
 
-do_install_append() {
+do_install:append() {
     install -d ${D}/${sbindir}
     install -m 0755 ${WORKDIR}/bios-update.sh ${D}/${sbindir}/
 }
diff --git a/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger_%.bbappend b/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger_%.bbappend
index 3c280ce..8ae2e60 100644
--- a/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger_%.bbappend
+++ b/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger_%.bbappend
@@ -1,12 +1,12 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += "file://ttyS2.conf"
 
-SRC_URI_append_yosemitev2 += "file://ttyS0.conf"
-SRC_URI_append_yosemitev2 += "file://ttyS1.conf"
-SRC_URI_append_yosemitev2 += "file://ttyS3.conf"
+SRC_URI:append:yosemitev2 += "file://ttyS0.conf"
+SRC_URI:append:yosemitev2 += "file://ttyS1.conf"
+SRC_URI:append:yosemitev2 += "file://ttyS3.conf"
 
-do_install_append() {
+do_install:append() {
 
           # Install the configurations
           install -m 0755 -d ${D}${sysconfdir}/${BPN}
diff --git a/meta-facebook/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-facebook/recipes-phosphor/images/obmc-phosphor-image.bbappend
index ad9c87a..f62ffdb 100644
--- a/meta-facebook/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ b/meta-facebook/recipes-phosphor/images/obmc-phosphor-image.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-IMAGE_FEATURES_remove_fb-nohost = "obmc-console"
+IMAGE_FEATURES:remove:fb-nohost = "obmc-console"
diff --git a/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
index 72d991c..4fc41d0 100644
--- a/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
+++ b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
diff --git a/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
index 1a9d9e0..9557c26 100644
--- a/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
+++ b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
@@ -1,8 +1,8 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}/${MACHINE}:"
 
-SRC_URI_append = " file://ipmb-channels.json"
+SRC_URI:append = " file://ipmb-channels.json"
 
-do_install_append() {
+do_install:append() {
     install -m 0644 -D ${WORKDIR}/ipmb-channels.json \
                    ${D}/usr/share/ipmbbridge
 }
diff --git a/meta-facebook/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-facebook/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index dbcc895..d7953e1 100644
--- a/meta-facebook/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-facebook/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -1,5 +1,5 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-PACKAGES_remove_fb-nohost = "\
+PACKAGES:remove:fb-nohost = "\
         ${PN}-console \
         "
diff --git a/meta-facebook/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend b/meta-facebook/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend
index ac98c7c..ca35bcb 100644
--- a/meta-facebook/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend
+++ b/meta-facebook/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend
@@ -1 +1 @@
-PACKAGECONFIG_append = " log-threshold log-pulse"
+PACKAGECONFIG:append = " log-threshold log-pulse"
diff --git a/meta-facebook/recipes-phosphor/sensors/phosphor-nvme_%.bbappend b/meta-facebook/recipes-phosphor/sensors/phosphor-nvme_%.bbappend
index 95a5907..94db23f 100644
--- a/meta-facebook/recipes-phosphor/sensors/phosphor-nvme_%.bbappend
+++ b/meta-facebook/recipes-phosphor/sensors/phosphor-nvme_%.bbappend
@@ -1,8 +1,8 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}/${MACHINE}:"
 
-SRC_URI_append = " file://nvme_config.json"
+SRC_URI:append = " file://nvme_config.json"
 
-do_install_append() {
+do_install:append() {
     install -m 0644 -D ${WORKDIR}/nvme_config.json \
                    ${D}/etc/nvme
 }
diff --git a/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
index 94650ba..4487aa2 100644
--- a/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
+++ b/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
@@ -1,8 +1,8 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}/${MACHINE}:"
 
-SRC_URI_append = " file://${MACHINE}_sensor_config.json"
+SRC_URI:append = " file://${MACHINE}_sensor_config.json"
 
-do_install_append() {
+do_install:append() {
 
     install -d ${D}/usr/share/phosphor-virtual-sensor
 
diff --git a/meta-facebook/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-facebook/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
index 2b4c4c0..56f43c7 100644
--- a/meta-facebook/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
+++ b/meta-facebook/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
@@ -1,2 +1,2 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI_append_yosemitev2 = " file://settings-manager.override.yml"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+SRC_URI:append:yosemitev2 = " file://settings-manager.override.yml"
diff --git a/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend b/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend
index b0dcd09..1401549 100644
--- a/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend
+++ b/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend
@@ -1,5 +1,5 @@
-FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
+FILESEXTRAPATHS:append := ":${THISDIR}/${PN}"
 
 # Remove the override to keep service running after DC cycle
-SYSTEMD_OVERRIDE_${PN}_remove = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf"
-SYSTEMD_SERVICE_${PN} = "phosphor-watchdog.service phosphor-watchdog-host-poweroff.service phosphor-watchdog-host-reset.service phosphor-watchdog-host-cycle.service"
+SYSTEMD_OVERRIDE_${PN}:remove = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf"
+SYSTEMD_SERVICE:${PN} = "phosphor-watchdog.service phosphor-watchdog-host-poweroff.service phosphor-watchdog-host-reset.service phosphor-watchdog-host-cycle.service"