diff --git a/meta-facebook/meta-bletchley/recipes-bletchley/plat-svc/plat-svc_0.1.bb b/meta-facebook/meta-bletchley/recipes-bletchley/plat-svc/plat-svc_0.1.bb
index ecf232f..b1508df 100644
--- a/meta-facebook/meta-bletchley/recipes-bletchley/plat-svc/plat-svc_0.1.bb
+++ b/meta-facebook/meta-bletchley/recipes-bletchley/plat-svc/plat-svc_0.1.bb
@@ -27,4 +27,4 @@
     install -m 0755 ${WORKDIR}/bletchley-host-state-monitor ${D}${libexecdir}
 }
 
-SYSTEMD_OVERRIDE:${PN}:bletchley += "bletchley-sys-init.conf:bletchley-sys-init.service.d/bletchley-sys-init.conf"
+SYSTEMD_OVERRIDE:${PN} += "bletchley-sys-init.conf:bletchley-sys-init.service.d/bletchley-sys-init.conf"
diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/chassis/obmc-phosphor-buttons_%.bbappend b/meta-facebook/meta-bletchley/recipes-phosphor/chassis/obmc-phosphor-buttons_%.bbappend
index bf19fe7..91e994e 100644
--- a/meta-facebook/meta-bletchley/recipes-phosphor/chassis/obmc-phosphor-buttons_%.bbappend
+++ b/meta-facebook/meta-bletchley/recipes-phosphor/chassis/obmc-phosphor-buttons_%.bbappend
@@ -1,8 +1,8 @@
-FILESEXTRAPATHS:append:bletchley := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:append := "${THISDIR}/${PN}:"
 
 SRC_URI += "file://gpio_defs.json"
 
-do_install:append:bletchley() {
+do_install:append() {
         install -d ${D}${sysconfdir}/default/obmc/gpio/
         install -m 0644 ${WORKDIR}/gpio_defs.json ${D}/${sysconfdir}/default/obmc/gpio/
 }
diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-facebook/meta-bletchley/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
index 8b63026..0f66bba 100644
--- a/meta-facebook/meta-bletchley/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
+++ b/meta-facebook/meta-bletchley/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
@@ -1,9 +1,9 @@
-FILESEXTRAPATHS:prepend:bletchley := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-FILES:${PN}:append:bletchley = " ${datadir}/swampd"
-FILES:${PN}:append:bletchley = " ${systemd_system_unitdir}/phosphor-pid-control.service.d/*.conf"
+FILES:${PN}:append = " ${datadir}/swampd"
+FILES:${PN}:append = " ${systemd_system_unitdir}/phosphor-pid-control.service.d/*.conf"
 
-do_install:append:bletchley() {
+do_install:append() {
 
     override_dir="${D}${systemd_system_unitdir}/phosphor-pid-control.service.d"
     override_file="${override_dir}/10-bletchley.conf"
diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-facebook/meta-bletchley/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
index c65e729..4ee7437 100644
--- a/meta-facebook/meta-bletchley/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
+++ b/meta-facebook/meta-bletchley/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
@@ -7,15 +7,15 @@
 INSTFMT_PRESENT = "phosphor-gpio-presence@presence-sled{0}.service"
 PRESENT_TGT = "multi-user.target"
 FMT_PRESENT = "../${TMPL_PRESENT}:${PRESENT_TGT}.requires/${INSTFMT_PRESENT}"
-SYSTEMD_LINK:${PN}-presence:append:bletchley = " ${@compose_list(d, 'FMT_PRESENT', 'OBMC_HOST_INSTANCES')}"
+SYSTEMD_LINK:${PN}-presence:append = " ${@compose_list(d, 'FMT_PRESENT', 'OBMC_HOST_INSTANCES')}"
 
 # Add environment file
 SLED_PRESENT_ENV_FMT = "obmc/gpio/presence-sled{0}.conf"
-SYSTEMD_ENVIRONMENT_FILE:${PN}-presence:bletchley = " ${@compose_list(d, 'SLED_PRESENT_ENV_FMT', 'OBMC_HOST_INSTANCES')}"
+SYSTEMD_ENVIRONMENT_FILE:${PN}-presence = " ${@compose_list(d, 'SLED_PRESENT_ENV_FMT', 'OBMC_HOST_INSTANCES')}"
 
 GPIO_PRESENCE_SLED_CONF="/etc/default/obmc/gpio/%i.conf"
 
-do_install:append:bletchley(){
+do_install:append(){
     # modify ConditionPathExists and EnvironmentFile to correct filepath
     sed -i -e "s,ConditionPathExists=.*,ConditionPathExists=${GPIO_PRESENCE_SLED_CONF},g" ${D}${systemd_system_unitdir}/phosphor-gpio-presence@.service
     sed -i -e "s,EnvironmentFile=.*,EnvironmentFile=${GPIO_PRESENCE_SLED_CONF},g" ${D}${systemd_system_unitdir}/phosphor-gpio-presence@.service
diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-facebook/meta-bletchley/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
index 3d795c8..ce94809 100644
--- a/meta-facebook/meta-bletchley/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
+++ b/meta-facebook/meta-bletchley/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
@@ -1,10 +1,10 @@
 inherit obmc-phosphor-systemd
 
-FILESEXTRAPATHS:prepend:bletchley := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-DEPENDS:append:bletchley = " bletchley-yaml-config"
+DEPENDS:append = " bletchley-yaml-config"
 
-IPMI_FRU_YAML:bletchley = "${STAGING_DIR_HOST}${datadir}/bletchley-yaml-config/ipmi-fru-read.yaml"
+IPMI_FRU_YAML = "${STAGING_DIR_HOST}${datadir}/bletchley-yaml-config/ipmi-fru-read.yaml"
 
 EEPROM_NAMES = "bmc"
 
@@ -14,11 +14,11 @@
 EEPROMS_ESCAPED = "${@compose_list(d, 'EEPROM_ESCAPEDFMT', 'EEPROM_NAMES')}"
 
 ENVFMT = "obmc/eeproms/{0}"
-SYSTEMD_ENVIRONMENT_FILE:${PN}:append:bletchley := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}"
+SYSTEMD_ENVIRONMENT_FILE:${PN}:append := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}"
 
 TMPL = "obmc-read-eeprom@.service"
 TGT = "${SYSTEMD_DEFAULT_TARGET}"
 INSTFMT = "obmc-read-eeprom@{0}.service"
 FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}"
 
-SYSTEMD_LINK:${PN}:append:bletchley := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}"
+SYSTEMD_LINK:${PN}:append := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}"
diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-facebook/meta-bletchley/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index 032cdaf..dcab003 100644
--- a/meta-facebook/meta-bletchley/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ b/meta-facebook/meta-bletchley/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
@@ -1,11 +1,11 @@
-DEPENDS:append:bletchley = " bletchley-yaml-config"
+DEPENDS:append = " bletchley-yaml-config"
 
-EXTRA_OEMESON:bletchley = " \
+EXTRA_OEMESON = " \
     -Dfru-yaml-gen=${STAGING_DIR_HOST}${datadir}/bletchley-yaml-config/ipmi-fru-read.yaml \
     "
 
 # host watchdog does not support on bletchley
-RDEPENDS:${PN}:remove:bletchley = "phosphor-watchdog"
+RDEPENDS:${PN}:remove = "phosphor-watchdog"
 
 # bletchley doesn't have IPMI support, skip xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service
 SOFT_SVC = ""
diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend b/meta-facebook/meta-bletchley/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
index ae8a15d..b7f09e9 100644
--- a/meta-facebook/meta-bletchley/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
+++ b/meta-facebook/meta-bletchley/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
@@ -1 +1 @@
-IPMB_CHANNELS:bletchley = "/dev/ipmb-13"
+IPMB_CHANNELS = "/dev/ipmb-13"
diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/sensors/dbus-sensors_%.bbappend b/meta-facebook/meta-bletchley/recipes-phosphor/sensors/dbus-sensors_%.bbappend
index f409fbf..fd5c1ed 100644
--- a/meta-facebook/meta-bletchley/recipes-phosphor/sensors/dbus-sensors_%.bbappend
+++ b/meta-facebook/meta-bletchley/recipes-phosphor/sensors/dbus-sensors_%.bbappend
@@ -1,6 +1,6 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-PACKAGECONFIG:bletchley = " \
+PACKAGECONFIG = " \
     adcsensor \
     fansensor \
     hwmontempsensor \
diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/sensors/phosphor-nvme_%.bbappend b/meta-facebook/meta-bletchley/recipes-phosphor/sensors/phosphor-nvme_%.bbappend
index 84df1a1..c550d59 100644
--- a/meta-facebook/meta-bletchley/recipes-phosphor/sensors/phosphor-nvme_%.bbappend
+++ b/meta-facebook/meta-bletchley/recipes-phosphor/sensors/phosphor-nvme_%.bbappend
@@ -2,15 +2,15 @@
 
 inherit obmc-phosphor-systemd
 
-SRC_URI:append:bletchley = " \
+SRC_URI:append = " \
     file://nvme-json-rewrite \
     file://nvme-json-rewrite.conf \
     file://nvme_config.json \
 "
 
-RDEPENDS:${PN}:bletchley += "bash"
+RDEPENDS:${PN} += "bash"
 
-do_install:append:bletchley() {
+do_install:append() {
         install -d ${D}${libexecdir}/${PN}/
         install -m 0755 ${WORKDIR}/nvme-json-rewrite ${D}${libexecdir}/${PN}/
 
@@ -18,6 +18,6 @@
         install -m 0644 -D ${WORKDIR}/nvme_config.json ${D}${sysconfdir}/nvme
 }
 
-SYSTEMD_OVERRIDE:${PN}:append:bletchley = " \
+SYSTEMD_OVERRIDE:${PN}:append = " \
     nvme-json-rewrite.conf:xyz.openbmc_project.nvme.manager.service.d/nvme-json-rewrite.conf \
 "
diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-facebook/meta-bletchley/recipes-phosphor/state/phosphor-state-manager_%.bbappend
index 1cc021a..dd2711e 100644
--- a/meta-facebook/meta-bletchley/recipes-phosphor/state/phosphor-state-manager_%.bbappend
+++ b/meta-facebook/meta-bletchley/recipes-phosphor/state/phosphor-state-manager_%.bbappend
@@ -1,6 +1,6 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI:append:bletchley = " \
+SRC_URI:append = " \
     file://chassis-powercycle \
     file://chassis-powercycle@.service \
     file://chassis-poweroff@.service \
@@ -9,10 +9,10 @@
     file://host-poweron@.service \
     "
 
-RDEPENDS:${PN}-discover:append:bletchley = " bletchley-common-tool"
-RDEPENDS:${PN}:append:bletchley = " bash motor-ctrl"
+RDEPENDS:${PN}-discover:append = " bletchley-common-tool"
+RDEPENDS:${PN}:append = " bash motor-ctrl"
 
-do_install:append:bletchley() {
+do_install:append() {
     install -d ${D}${systemd_system_unitdir}
     install -m 0644 ${WORKDIR}/*.service ${D}${systemd_system_unitdir}/
 
@@ -20,8 +20,8 @@
     install -m 0755 ${WORKDIR}/chassis-powercycle ${D}${libexecdir}/${PN}/
 }
 
-FILES:${PN}:append:bletchley = " ${systemd_system_unitdir}"
-FILES:${PN}:append:bletchley = " ${libexecdir}/${PN}"
+FILES:${PN}:append= " ${systemd_system_unitdir}"
+FILES:${PN}:append= " ${libexecdir}/${PN}"
 
 # Because Bletchley does not have IPMI between Bmc & Host, the Host init
 # state will set to Off after Bmc booted. We require an extra service to
@@ -29,14 +29,14 @@
 # doing any power action or power policy restore.
 
 BLETCHLEY_SYS_ST_INIT_CONF_FMT = "bletchley-system-state-init.conf:phosphor-discover-system-state@{0}.service.d/bletchley-system-state-init.conf"
-SYSTEMD_OVERRIDE:${PN}-discover:bletchley += "${@compose_list_zip(d, 'BLETCHLEY_SYS_ST_INIT_CONF_FMT', 'OBMC_HOST_INSTANCES')}"
+SYSTEMD_OVERRIDE:${PN}-discover += "${@compose_list_zip(d, 'BLETCHLEY_SYS_ST_INIT_CONF_FMT', 'OBMC_HOST_INSTANCES')}"
 
-PACKAGECONFIG:remove:bletchley = "only-run-apr-on-power-loss"
+PACKAGECONFIG:remove = "only-run-apr-on-power-loss"
 
 #======================
 # Workaround for bletchley
 #======================
-CHASSIS_DEFAULT_TARGETS:remove:bletchley = " \
+CHASSIS_DEFAULT_TARGETS:remove = " \
     obmc-chassis-powerreset@{}.target.requires/phosphor-reset-chassis-on@{}.service \
     obmc-chassis-powerreset@{}.target.requires/phosphor-reset-chassis-running@{}.service \
     obmc-chassis-poweroff@{}.target.requires/obmc-power-stop@{}.service \
@@ -46,4 +46,4 @@
 HOST_DEFAULT_TARGETS:append = " \
     obmc-host-startmin@{}.target.wants/host-poweron@{}.service \
     obmc-host-stop@{}.target.wants/host-poweroff@{}.service \
-"
\ No newline at end of file
+"
diff --git a/meta-facebook/meta-greatlakes/recipes-fb/ipmi/fb-ipmi-oem_%.bbappend b/meta-facebook/meta-greatlakes/recipes-fb/ipmi/fb-ipmi-oem_%.bbappend
index e70f2a1..1a50050 100644
--- a/meta-facebook/meta-greatlakes/recipes-fb/ipmi/fb-ipmi-oem_%.bbappend
+++ b/meta-facebook/meta-greatlakes/recipes-fb/ipmi/fb-ipmi-oem_%.bbappend
@@ -1 +1 @@
-EXTRA_OEMESON:append:greatlakes=" -Dpost-code-bytes=${POST_CODE_BYTES}"
+EXTRA_OEMESON:append =" -Dpost-code-bytes=${POST_CODE_BYTES}"
diff --git a/meta-facebook/meta-greatlakes/recipes-phosphor/console/obmc-console_%.bbappend b/meta-facebook/meta-greatlakes/recipes-phosphor/console/obmc-console_%.bbappend
index 461c2bf..dc06c80 100644
--- a/meta-facebook/meta-greatlakes/recipes-phosphor/console/obmc-console_%.bbappend
+++ b/meta-facebook/meta-greatlakes/recipes-phosphor/console/obmc-console_%.bbappend
@@ -1,7 +1,7 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI:append:greatlakes = " file://select-uart-mux"
+SRC_URI:append = " file://select-uart-mux"
 
-do_install:append:greatlakes() {
+do_install:append() {
         install -m 0744 ${WORKDIR}/select-uart-mux ${D}${bindir}
 }
diff --git a/meta-facebook/meta-greatlakes/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-facebook/meta-greatlakes/recipes-phosphor/fans/phosphor-fan_%.bbappend
index 0099418..4c3928e 100644
--- a/meta-facebook/meta-greatlakes/recipes-phosphor/fans/phosphor-fan_%.bbappend
+++ b/meta-facebook/meta-greatlakes/recipes-phosphor/fans/phosphor-fan_%.bbappend
@@ -1 +1 @@
-EXTRA_OEMESON:greatlakes = "-Duse-host-power-state=enabled -Dsensor-monitor-hard-shutdown-delay=0"
+EXTRA_OEMESON = "-Duse-host-power-state=enabled -Dsensor-monitor-hard-shutdown-delay=0"
diff --git a/meta-facebook/meta-greatlakes/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-facebook/meta-greatlakes/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
index dd6006a..18e5627 100644
--- a/meta-facebook/meta-greatlakes/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
+++ b/meta-facebook/meta-greatlakes/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
@@ -1,10 +1,10 @@
-FILESEXTRAPATHS:prepend:greatlakes := "${THISDIR}/${PN}:"
-SRC_URI:append:greatlakes = " file://config.json \
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+SRC_URI:append = " file://config.json \
                             "
 
-FILES:${PN}:append:greatlakes = " ${datadir}/swampd/config.json"
+FILES:${PN}:append = " ${datadir}/swampd/config.json"
 
-do_install:append:greatlakes() {
+do_install:append() {
     install -d ${D}${datadir}/swampd
     install -m 0644 -D ${WORKDIR}/config.json ${D}${datadir}/swampd/
 }
diff --git a/meta-facebook/meta-greatlakes/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend b/meta-facebook/meta-greatlakes/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
index 93147e4..b4dc133 100644
--- a/meta-facebook/meta-greatlakes/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
+++ b/meta-facebook/meta-greatlakes/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
@@ -1,4 +1,4 @@
-IPMB_CHANNELS:greatlakes = "\
+IPMB_CHANNELS = "\
     /dev/ipmb-0 \
     /dev/ipmb-1 \
     /dev/ipmb-2 \
diff --git a/meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-post-code-manager_%.bbappend b/meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-post-code-manager_%.bbappend
index 4661eec..00e0afb 100644
--- a/meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-post-code-manager_%.bbappend
+++ b/meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-post-code-manager_%.bbappend
@@ -1,5 +1,5 @@
 SYS_POSTCODE_DISPLAY_PATH="/sys/bus/i2c/devices/12-000f/postcode-display-slot"
 
-EXTRA_OEMESON:append:greatlakes = " \
+EXTRA_OEMESON:append = " \
     -Dpostcode-display-path=${SYS_POSTCODE_DISPLAY_PATH} \
 "
diff --git a/meta-facebook/meta-harma/recipes-phosphor/configuration/entity-manager_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/configuration/entity-manager_%.bbappend
index 03f1c63..6e89557 100644
--- a/meta-facebook/meta-harma/recipes-phosphor/configuration/entity-manager_%.bbappend
+++ b/meta-facebook/meta-harma/recipes-phosphor/configuration/entity-manager_%.bbappend
@@ -1,9 +1,9 @@
-FILESEXTRAPATHS:prepend:harma := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI:append:harma = " \
+SRC_URI:append = " \
     file://blacklist.json \
     "
 
-do_install:append:harma () {
+do_install:append() {
     install -m 0644 -D ${WORKDIR}/blacklist.json ${D}${datadir}/${PN}/blacklist.json
 }
diff --git a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
index e13d98d..6a8fe3f 100644
--- a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
+++ b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
@@ -19,7 +19,7 @@
             file://deassert-reset-button \
             "
 
-RDEPENDS:${PN}:append:harma = " bash"
+RDEPENDS:${PN}:append = " bash"
 
 FILES:${PN} += "${systemd_system_unitdir}/*"
 
@@ -56,4 +56,4 @@
     install -m 0755 ${WORKDIR}/deassert-power-good ${D}${libexecdir}/${PN}/
 }
 
-SYSTEMD_OVERRIDE:${PN}-monitor:harma += "phosphor-multi-gpio-monitor.conf:phosphor-multi-gpio-monitor.service.d/phosphor-multi-gpio-monitor.conf"
+SYSTEMD_OVERRIDE:${PN}-monitor += "phosphor-multi-gpio-monitor.conf:phosphor-multi-gpio-monitor.service.d/phosphor-multi-gpio-monitor.conf"
diff --git a/meta-facebook/meta-harma/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
index 01f0304..eb22418 100644
--- a/meta-facebook/meta-harma/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
+++ b/meta-facebook/meta-harma/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
@@ -1,6 +1,6 @@
-IPMB_CHANNELS:harma = "\
+IPMB_CHANNELS = "\
     /dev/ipmb-14 \
     "
-IPMB_REMOTE_ADDR:harma = "\
+IPMB_REMOTE_ADDR = "\
     96 \
     "
diff --git a/meta-facebook/meta-harma/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
index 23710e8..6b12a39 100644
--- a/meta-facebook/meta-harma/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
+++ b/meta-facebook/meta-harma/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
@@ -1,7 +1,7 @@
-FILESEXTRAPATHS:prepend:harma := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI:append:harma = " file://led-group-config.json"
+SRC_URI:append = " file://led-group-config.json"
 
-do_install:append:harma() {
+do_install:append() {
         install -m 0644 ${WORKDIR}/led-group-config.json ${D}${datadir}/phosphor-led-manager/
 }
diff --git a/meta-facebook/meta-harma/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/network/phosphor-network_%.bbappend
index 253b76e..7eeaf22 100644
--- a/meta-facebook/meta-harma/recipes-phosphor/network/phosphor-network_%.bbappend
+++ b/meta-facebook/meta-harma/recipes-phosphor/network/phosphor-network_%.bbappend
@@ -1,10 +1,10 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI:append:harma = " \
+SRC_URI:append = " \
     file://00-bmc-usb0.network \
     "
 
-FILES:${PN}:append:harma = " ${systemd_unitdir}/network/00-bmc-usb0.network"
+FILES:${PN}:append = " ${systemd_unitdir}/network/00-bmc-usb0.network"
 
 do_install:append() {
     install -d ${D}${systemd_unitdir}/network/
diff --git a/meta-facebook/meta-harma/recipes-phosphor/sensors/dbus-sensors_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/sensors/dbus-sensors_%.bbappend
index ed13a10..a7c4a54 100644
--- a/meta-facebook/meta-harma/recipes-phosphor/sensors/dbus-sensors_%.bbappend
+++ b/meta-facebook/meta-harma/recipes-phosphor/sensors/dbus-sensors_%.bbappend
@@ -1,6 +1,6 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-PACKAGECONFIG:harma = " \
+PACKAGECONFIG = " \
     adcsensor \
     hwmontempsensor \
     psusensor \
diff --git a/meta-facebook/meta-harma/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
index bd420f0..5edbc32 100644
--- a/meta-facebook/meta-harma/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
+++ b/meta-facebook/meta-harma/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI:append:harma = " file://virtual_sensor_config.json "
+SRC_URI:append = " file://virtual_sensor_config.json "
diff --git a/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager_%.bbappend
index 954bc39..e75785c 100644
--- a/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager_%.bbappend
+++ b/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager_%.bbappend
@@ -3,28 +3,28 @@
 PACKAGECONFIG:remove = "no-warm-reboot only-run-apr-on-power-loss"
 
 
-CHASSIS_DEFAULT_TARGETS:remove:harma = " \
+CHASSIS_DEFAULT_TARGETS:remove = " \
     obmc-chassis-powerreset@{}.target.requires/phosphor-reset-chassis-on@{}.service \
     obmc-chassis-powerreset@{}.target.requires/phosphor-reset-chassis-running@{}.service \
     obmc-chassis-poweroff@{}.target.requires/obmc-power-stop@{}.service \
     obmc-chassis-poweron@{}.target.requires/obmc-power-start@{}.service \
     "
 
-CHASSIS_DEFAULT_TARGETS:append:harma = " \
+CHASSIS_DEFAULT_TARGETS:append = " \
     obmc-chassis-hard-poweroff@{}.target.wants/host-poweroff@0.service \
     "
 
-HOST_DEFAULT_TARGETS:remove:harma = " \
+HOST_DEFAULT_TARGETS:remove = " \
     obmc-host-start@{}.target.wants/host-poweron@{}.service \
     obmc-host-force-warm-reboot@{}.target.requires/obmc-host-stop@{}.target \
     obmc-host-force-warm-reboot@{}.target.requires/phosphor-reboot-host@{}.service \
 "
 
-HOST_DEFAULT_TARGETS:append:harma = " \
+HOST_DEFAULT_TARGETS:append = " \
     obmc-host-startmin@{}.target.requires/host-poweron@{}.service \
 "
 
-SRC_URI:append:harma = " \
+SRC_URI:append = " \
     file://chassis-powercycle@.service \
     file://host-poweroff@.service \
     file://host-poweron@.service \
@@ -41,9 +41,9 @@
     file://phosphor-state-manager-init.conf \
     "
 
-RDEPENDS:${PN}:append:harma = " bash"
+RDEPENDS:${PN}:append = " bash"
 
-do_install:append:harma() {
+do_install:append() {
     install -d ${D}${systemd_system_unitdir}
     install -m 0644 ${WORKDIR}/*.service ${D}${systemd_system_unitdir}/
 
@@ -56,5 +56,5 @@
     install -m 0755 ${WORKDIR}/power-cmd ${D}${libexecdir}/${PN}/
     install -m 0755 ${WORKDIR}/phosphor-state-manager-init ${D}${libexecdir}/${PN}/
 }
-SYSTEMD_OVERRIDE:${PN}-discover:harma += "discover-sys-init.conf:phosphor-discover-system-state@0.service.d/discover-sys-init.conf"
-SYSTEMD_OVERRIDE:${PN}-systemd-target-monitor:harma += "phosphor-state-manager-init.conf:phosphor-systemd-target-monitor.service.d/phosphor-state-manager-init.conf"
+SYSTEMD_OVERRIDE:${PN}-discover += "discover-sys-init.conf:phosphor-discover-system-state@0.service.d/discover-sys-init.conf"
+SYSTEMD_OVERRIDE:${PN}-systemd-target-monitor += "phosphor-state-manager-init.conf:phosphor-systemd-target-monitor.service.d/phosphor-state-manager-init.conf"
diff --git a/meta-facebook/meta-minerva/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend b/meta-facebook/meta-minerva/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
index b56e0f8..eb22418 100644
--- a/meta-facebook/meta-minerva/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
+++ b/meta-facebook/meta-minerva/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
@@ -1,6 +1,6 @@
-IPMB_CHANNELS:minerva = "\
+IPMB_CHANNELS = "\
     /dev/ipmb-14 \
     "
-IPMB_REMOTE_ADDR:minerva = "\
+IPMB_REMOTE_ADDR = "\
     96 \
     "
diff --git a/meta-facebook/meta-minerva/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-facebook/meta-minerva/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
index f26bb25..6b12a39 100644
--- a/meta-facebook/meta-minerva/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
+++ b/meta-facebook/meta-minerva/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
@@ -1,7 +1,7 @@
-FILESEXTRAPATHS:prepend:minerva := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI:append:minerva = " file://led-group-config.json"
+SRC_URI:append = " file://led-group-config.json"
 
-do_install:append:minerva() {
+do_install:append() {
         install -m 0644 ${WORKDIR}/led-group-config.json ${D}${datadir}/phosphor-led-manager/
 }
diff --git a/meta-facebook/meta-minerva/recipes-phosphor/sensors/dbus-sensors_%.bbappend b/meta-facebook/meta-minerva/recipes-phosphor/sensors/dbus-sensors_%.bbappend
index 3a4788c..fd5c1ed 100644
--- a/meta-facebook/meta-minerva/recipes-phosphor/sensors/dbus-sensors_%.bbappend
+++ b/meta-facebook/meta-minerva/recipes-phosphor/sensors/dbus-sensors_%.bbappend
@@ -1,6 +1,6 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-PACKAGECONFIG:minerva = " \
+PACKAGECONFIG = " \
     adcsensor \
     fansensor \
     hwmontempsensor \
diff --git a/meta-facebook/meta-minerva/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-facebook/meta-minerva/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
index f358ccb..5edbc32 100644
--- a/meta-facebook/meta-minerva/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
+++ b/meta-facebook/meta-minerva/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI:append:minerva = " file://virtual_sensor_config.json "
+SRC_URI:append = " file://virtual_sensor_config.json "
diff --git a/meta-facebook/meta-minerva/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-facebook/meta-minerva/recipes-phosphor/state/phosphor-state-manager_%.bbappend
index d83a29f..ff214fa 100644
--- a/meta-facebook/meta-minerva/recipes-phosphor/state/phosphor-state-manager_%.bbappend
+++ b/meta-facebook/meta-minerva/recipes-phosphor/state/phosphor-state-manager_%.bbappend
@@ -1,6 +1,6 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-CHASSIS_DEFAULT_TARGETS:remove:minerva = " \
+CHASSIS_DEFAULT_TARGETS:remove = " \
     obmc-chassis-powerreset@{}.target.requires/phosphor-reset-chassis-on@{}.service \
     obmc-chassis-powerreset@{}.target.requires/phosphor-reset-chassis-running@{}.service \
     obmc-chassis-poweroff@{}.target.requires/obmc-power-stop@{}.service \
diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend b/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
index 2380c3a..a554e39 100644
--- a/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
+++ b/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
@@ -1,8 +1,8 @@
-IPMB_CHANNELS:tiogapass = "\
+IPMB_CHANNELS = "\
     /dev/ipmb-4 \
     /dev/ipmb-9 \
     "
-IPMB_REMOTE_ADDR:tiogapass = "\
+IPMB_REMOTE_ADDR = "\
     44 \
     96 \
     "
diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/sensors/dbus-sensors_%.bbappend b/meta-facebook/meta-tiogapass/recipes-phosphor/sensors/dbus-sensors_%.bbappend
index 06b9828..18b4b32 100644
--- a/meta-facebook/meta-tiogapass/recipes-phosphor/sensors/dbus-sensors_%.bbappend
+++ b/meta-facebook/meta-tiogapass/recipes-phosphor/sensors/dbus-sensors_%.bbappend
@@ -1,5 +1,5 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-PACKAGECONFIG:append:tiogapass = " \
+PACKAGECONFIG:append = " \
         intelcpusensor \
         "
diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/sensors/phosphor-nvme_%.bbappend b/meta-facebook/meta-tiogapass/recipes-phosphor/sensors/phosphor-nvme_%.bbappend
index 5fe8b97..a9019b0 100644
--- a/meta-facebook/meta-tiogapass/recipes-phosphor/sensors/phosphor-nvme_%.bbappend
+++ b/meta-facebook/meta-tiogapass/recipes-phosphor/sensors/phosphor-nvme_%.bbappend
@@ -1,8 +1,8 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI:append:tiogapass = " file://nvme_config.json"
+SRC_URI:append = " file://nvme_config.json"
 
-do_install:append:tiogapass() {
+do_install:append() {
     install -d ${D}${sysconfdir}/nvme
     install -m 0644 -D ${WORKDIR}/nvme_config.json ${D}/${sysconfdir}/nvme
 }
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-facebook/meta-yosemite4/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
index 2913bf1..56632d8 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
@@ -1,10 +1,10 @@
 FILESEXTRAPATHS:prepend:= "${THISDIR}/${PN}:"
-SRC_URI:append:yosemite4 = " file://config.json \
+SRC_URI:append = " file://config.json \
                            "
 
-FILES:${PN}:append:yosemite4 = " ${datadir}/swampd/config.json"
+FILES:${PN}:append = " ${datadir}/swampd/config.json"
 
-do_install:append:yosemite4() {
+do_install:append() {
     install -d ${D}${datadir}/swampd
     install -m 0644 -D ${WORKDIR}/config.json ${D}${datadir}/swampd/config.json
 }
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
index 4ec5991..135d8e7 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
@@ -11,7 +11,7 @@
             file://slot-hot-plug@.service \
             "
 
-RDEPENDS:${PN}:append:yosemite4 = " bash"
+RDEPENDS:${PN}:append = " bash"
 
 FILES:${PN} += "${systemd_system_unitdir}/*"
 
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/health/phosphor-health-monitor_%.bbappend b/meta-facebook/meta-yosemite4/recipes-phosphor/health/phosphor-health-monitor_%.bbappend
index f8b0e4b..1722319 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/health/phosphor-health-monitor_%.bbappend
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/health/phosphor-health-monitor_%.bbappend
@@ -2,6 +2,6 @@
 SRC_URI:append = " file://bmc_health_config.json \
                  "
 
-do_install:append:yosemite4() {
+do_install:append() {
     install -m 0644 ${WORKDIR}/bmc_health_config.json ${D}${sysconfdir}/healthMon
 }
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager_%.bbappend
index 6ff86de..fe10c35 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager_%.bbappend
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager_%.bbappend
@@ -4,14 +4,14 @@
                          -Dwarm-reboot=enabled \
                        "
 
-PACKAGECONFIG:remove:yosemite4 = "only-run-apr-on-power-loss"
+PACKAGECONFIG:remove = "only-run-apr-on-power-loss"
 
-HOST_DEFAULT_TARGETS:remove:yosemite4 = " \
+HOST_DEFAULT_TARGETS:remove = " \
     obmc-host-reboot@{}.target.requires/obmc-host-shutdown@{}.target \
     obmc-host-reboot@{}.target.requires/phosphor-reboot-host@{}.service \
     "
 
-CHASSIS_DEFAULT_TARGETS:remove:yosemite4 = " \
+CHASSIS_DEFAULT_TARGETS:remove = " \
     obmc-chassis-powerreset@{}.target.requires/phosphor-reset-chassis-on@{}.service \
     obmc-chassis-powerreset@{}.target.requires/phosphor-reset-chassis-running@{}.service \
     obmc-chassis-poweroff@{}.target.requires/obmc-power-stop@{}.service \
@@ -21,11 +21,11 @@
 # When we power off the host, we do not want to do a full chassis power-off
 # because that will turn off power to the compute card standby domain (and
 # we lose communication with the BIC.
-CHASSIS_DEFAULT_TARGETS:remove:yosemite4 = " \
+CHASSIS_DEFAULT_TARGETS:remove = " \
     obmc-host-shutdown@{}.target.requires/obmc-chassis-poweroff@{}.target \
     "
 
-SRC_URI:append:yosemite4 = " \
+SRC_URI:append = " \
     file://chassis-poweroff@.service \
     file://chassis-poweron@.service \
     file://chassis-powercycle@.service \
@@ -44,9 +44,9 @@
     file://wait-until-mctp-connection-done \
     "
 
-RDEPENDS:${PN}:append:yosemite4 = " bash"
+RDEPENDS:${PN}:append = " bash"
 
-do_install:append:yosemite4() {
+do_install:append() {
     install -d ${D}${systemd_system_unitdir}
     install -m 0644 ${WORKDIR}/*.service ${D}${systemd_system_unitdir}/
 
diff --git a/meta-facebook/meta-yosemitev2/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend b/meta-facebook/meta-yosemitev2/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
index efd3aa2..8161a8f 100644
--- a/meta-facebook/meta-yosemitev2/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
+++ b/meta-facebook/meta-yosemitev2/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
@@ -1,4 +1,4 @@
-IPMB_CHANNELS:yosemitev2 = "\
+IPMB_CHANNELS = "\
     /dev/ipmb-1 \
     /dev/ipmb-3 \
     /dev/ipmb-5 \