diff --git a/meta-quanta/conf/layer.conf b/meta-quanta/conf/layer.conf
index 5ab3e26..39655f5 100644
--- a/meta-quanta/conf/layer.conf
+++ b/meta-quanta/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "quanta-layer"
 BBFILE_PATTERN_quanta-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_quanta-layer = "gatesgarth hardknott"
+LAYERSERIES_COMPAT_quanta-layer = "gatesgarth hardknott honister"
diff --git a/meta-quanta/meta-gsj/conf/distro/openbmc-gsj.conf b/meta-quanta/meta-gsj/conf/distro/openbmc-gsj.conf
index f643373..34b1dac 100644
--- a/meta-quanta/meta-gsj/conf/distro/openbmc-gsj.conf
+++ b/meta-quanta/meta-gsj/conf/distro/openbmc-gsj.conf
@@ -1,4 +1,4 @@
 require conf/distro/openbmc-phosphor.conf
 
-DISTRO_FEATURES_remove = "avahi"
-DISTRO_FEATURES_remove = "slp"
+DISTRO_FEATURES:remove = "avahi"
+DISTRO_FEATURES:remove = "slp"
diff --git a/meta-quanta/meta-gsj/conf/layer.conf b/meta-quanta/meta-gsj/conf/layer.conf
index 9bb6718..a429102 100644
--- a/meta-quanta/meta-gsj/conf/layer.conf
+++ b/meta-quanta/meta-gsj/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "gsj-layer"
 BBFILE_PATTERN_gsj-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_gsj-layer = "gatesgarth hardknott"
+LAYERSERIES_COMPAT_gsj-layer = "gatesgarth hardknott honister"
diff --git a/meta-quanta/meta-gsj/conf/local.conf.sample b/meta-quanta/meta-gsj/conf/local.conf.sample
index eacba35..18e729c 100644
--- a/meta-quanta/meta-gsj/conf/local.conf.sample
+++ b/meta-quanta/meta-gsj/conf/local.conf.sample
@@ -1,11 +1,11 @@
 MACHINE ??= "gsj"
 DISTRO ?= "openbmc-gsj"
 PACKAGE_CLASSES ?= "package_rpm"
-SANITY_TESTED_DISTROS_append ?= " *"
-EXTRA_IMAGE_FEATURES = "debug-tweaks"
-USER_CLASSES ?= "buildstats image-prelink"
+SANITY_TESTED_DISTROS:append ?= " *"
+EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
+USER_CLASSES ?= "buildstats"
 PATCHRESOLVE = "noop"
-BB_DISKMON_DIRS = "\
+BB_DISKMON_DIRS ??= "\
     STOPTASKS,${TMPDIR},1G,100K \
     STOPTASKS,${DL_DIR},1G,100K \
     STOPTASKS,${SSTATE_DIR},1G,100K \
diff --git a/meta-quanta/meta-gsj/conf/machine/gsj.conf b/meta-quanta/meta-gsj/conf/machine/gsj.conf
index b0d508e..cef4e89 100644
--- a/meta-quanta/meta-gsj/conf/machine/gsj.conf
+++ b/meta-quanta/meta-gsj/conf/machine/gsj.conf
@@ -20,7 +20,7 @@
         obmc-bmc-state-mgmt \
         "
 # Remove unneeded binaries from image
-IMAGE_FEATURES_remove = "obmc-debug-collector"
+IMAGE_FEATURES:remove = "obmc-debug-collector"
 
 PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-gsj-apps"
 PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-gsj-apps"
diff --git a/meta-quanta/meta-gsj/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend b/meta-quanta/meta-gsj/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend
index c5aea40..4ab1be3 100644
--- a/meta-quanta/meta-gsj/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend
+++ b/meta-quanta/meta-gsj/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend
@@ -1,7 +1,7 @@
-FILESEXTRAPATHS_prepend_gsj := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:gsj := "${THISDIR}/${PN}:"
 
-SRC_URI_append_gsj = " file://fw_env.config"
+SRC_URI:append:gsj = " file://fw_env.config"
 
-do_install_append_gsj () {
+do_install:append:gsj () {
 	install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config
 }
diff --git a/meta-quanta/meta-gsj/recipes-google/ipmi/google-ipmi-sys_%.bbappend b/meta-quanta/meta-gsj/recipes-google/ipmi/google-ipmi-sys_%.bbappend
index eff0845..c59d0d5 100644
--- a/meta-quanta/meta-gsj/recipes-google/ipmi/google-ipmi-sys_%.bbappend
+++ b/meta-quanta/meta-gsj/recipes-google/ipmi/google-ipmi-sys_%.bbappend
@@ -1,8 +1,8 @@
-SYSTEMD_SERVICE_${PN}_remove_gsj = " \
+SYSTEMD_SERVICE:${PN}:remove:gsj = " \
   gbmc-host-poweroff.target \
   gbmc-psu-hardreset.target \
   "
 
-do_install_append_gsj() {
+do_install:append:gsj() {
    rm -r ${D}/lib
 }
diff --git a/meta-quanta/meta-gsj/recipes-gsj/detect-fan-fail/detect-fan-fail.bb b/meta-quanta/meta-gsj/recipes-gsj/detect-fan-fail/detect-fan-fail.bb
index 24ca38d..17f1fc8 100644
--- a/meta-quanta/meta-gsj/recipes-gsj/detect-fan-fail/detect-fan-fail.bb
+++ b/meta-quanta/meta-gsj/recipes-gsj/detect-fan-fail/detect-fan-fail.bb
@@ -7,14 +7,14 @@
 inherit systemd
 
 DEPENDS += "systemd"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "bash"
 
-FILESEXTRAPATHS_append_gsj := "${THISDIR}/files:"
-SRC_URI_append_gsj =  " file://detect-fan-fail.sh \
+FILESEXTRAPATHS:append:gsj := "${THISDIR}/files:"
+SRC_URI:append:gsj =  " file://detect-fan-fail.sh \
                         file://detect-fan-fail.service \
                       "
 
-do_install_append_gsj() {
+do_install:append:gsj() {
     install -d ${D}${bindir}
     install -m 0755 ${WORKDIR}/detect-fan-fail.sh ${D}${bindir}/
 
@@ -23,4 +23,4 @@
 }
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "detect-fan-fail.service"
+SYSTEMD_SERVICE:${PN} = "detect-fan-fail.service"
diff --git a/meta-quanta/meta-gsj/recipes-gsj/gsj-hotswap-change-setting/gsj-hotswap-change-setting.bb b/meta-quanta/meta-gsj/recipes-gsj/gsj-hotswap-change-setting/gsj-hotswap-change-setting.bb
index f9d9a9e..d88b9a2 100644
--- a/meta-quanta/meta-gsj/recipes-gsj/gsj-hotswap-change-setting/gsj-hotswap-change-setting.bb
+++ b/meta-quanta/meta-gsj/recipes-gsj/gsj-hotswap-change-setting/gsj-hotswap-change-setting.bb
@@ -7,10 +7,10 @@
 inherit systemd
 
 DEPENDS += "systemd"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "bash"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-SRC_URI_append =  " file://gsj-hotswap-change-setting.sh \
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+SRC_URI:append =  " file://gsj-hotswap-change-setting.sh \
                     file://gsj-hotswap-change-setting.service \
                   "
 
@@ -23,4 +23,4 @@
 }
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "gsj-hotswap-change-setting.service"
+SYSTEMD_SERVICE:${PN} = "gsj-hotswap-change-setting.service"
diff --git a/meta-quanta/meta-gsj/recipes-gsj/packagegroups/packagegroup-gsj-apps.bb b/meta-quanta/meta-gsj/recipes-gsj/packagegroups/packagegroup-gsj-apps.bb
index c1a7c1c..1d416c4 100644
--- a/meta-quanta/meta-gsj/recipes-gsj/packagegroups/packagegroup-gsj-apps.bb
+++ b/meta-quanta/meta-gsj/recipes-gsj/packagegroups/packagegroup-gsj-apps.bb
@@ -14,17 +14,17 @@
 PROVIDES += "virtual/obmc-fan-mgmt"
 PROVIDES += "virtual/obmc-flash-mgmt"
 
-RPROVIDES_${PN}-chassis += "virtual-obmc-chassis-mgmt"
-RPROVIDES_${PN}-fans += "virtual-obmc-fan-mgmt"
-RPROVIDES_${PN}-flash += "virtual-obmc-flash-mgmt"
+RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt"
+RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt"
+RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt"
 
-SUMMARY_${PN}-chassis = "GSJ Chassis"
-RDEPENDS_${PN}-chassis = ""
+SUMMARY:${PN}-chassis = "GSJ Chassis"
+RDEPENDS:${PN}-chassis = ""
 
-SUMMARY_${PN}-fans = "GSJ Fans"
-RDEPENDS_${PN}-fans = ""
+SUMMARY:${PN}-fans = "GSJ Fans"
+RDEPENDS:${PN}-fans = ""
 
-SUMMARY_${PN}-flash = "GSJ Flash"
-RDEPENDS_${PN}-flash = " \
+SUMMARY:${PN}-flash = "GSJ Flash"
+RDEPENDS:${PN}-flash = " \
         phosphor-ipmi-flash \
         "
diff --git a/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/quanta-nvme-powerctrl.bb b/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/quanta-nvme-powerctrl.bb
index 887b503..a5f5084 100644
--- a/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/quanta-nvme-powerctrl.bb
+++ b/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/quanta-nvme-powerctrl.bb
@@ -4,13 +4,13 @@
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
-FILESEXTRAPATHS_append := "${THISDIR}/files:"
+FILESEXTRAPATHS:append := "${THISDIR}/files:"
 
 inherit systemd
 
 DEPENDS += "systemd"
-RDEPENDS_${PN} += "libsystemd"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "libsystemd"
+RDEPENDS:${PN} += "bash"
 
 SRC_URI +=  "file://init_once.sh \
              file://nvme_powermanager.sh \
@@ -33,4 +33,4 @@
 }
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "nvme_gpio.service nvme_powermanager.service"
+SYSTEMD_SERVICE:${PN} = "nvme_gpio.service nvme_powermanager.service"
diff --git a/meta-quanta/meta-gsj/recipes-gsj/usb-network/usb-network.bb b/meta-quanta/meta-gsj/recipes-gsj/usb-network/usb-network.bb
index ad46c0b..63e6d5d 100644
--- a/meta-quanta/meta-gsj/recipes-gsj/usb-network/usb-network.bb
+++ b/meta-quanta/meta-gsj/recipes-gsj/usb-network/usb-network.bb
@@ -1,10 +1,10 @@
-FILESEXTRAPATHS_append := "${THISDIR}/files:"
+FILESEXTRAPATHS:append := "${THISDIR}/files:"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
 DEPENDS += "systemd"
-RDEPENDS_${PN} += "libsystemd"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "libsystemd"
+RDEPENDS:${PN} += "bash"
 
 SRC_URI += "file://usb_network.sh \
            file://usb_network.service \
@@ -23,7 +23,7 @@
 
 NATIVE_SYSTEMD_SUPPORT = "1"
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "usb_network.service"
-FILES_${PN} += "${sysconfdir_native}/systemd/network/00-bmc-usb0.network"
+SYSTEMD_SERVICE:${PN} = "usb_network.service"
+FILES:${PN} += "${sysconfdir_native}/systemd/network/00-bmc-usb0.network"
 
 inherit allarch systemd
\ No newline at end of file
diff --git a/meta-quanta/meta-gsj/recipes-kernel/linux/linux-nuvoton_%.bbappend b/meta-quanta/meta-gsj/recipes-kernel/linux/linux-nuvoton_%.bbappend
index a0f6c73..74da321 100644
--- a/meta-quanta/meta-gsj/recipes-kernel/linux/linux-nuvoton_%.bbappend
+++ b/meta-quanta/meta-gsj/recipes-kernel/linux/linux-nuvoton_%.bbappend
@@ -1,2 +1,2 @@
-FILESEXTRAPATHS_prepend_gsj := "${THISDIR}/linux-nuvoton:"
-SRC_URI_append_gsj = " file://gsj.cfg"
+FILESEXTRAPATHS:prepend:gsj := "${THISDIR}/linux-nuvoton:"
+SRC_URI:append:gsj = " file://gsj.cfg"
diff --git a/meta-quanta/meta-gsj/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
index 13d037e..1160fcf 100644
--- a/meta-quanta/meta-gsj/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
+++ b/meta-quanta/meta-gsj/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
@@ -1,25 +1,25 @@
-FILESEXTRAPATHS_prepend_gsj := "${THISDIR}/${PN}:"
-SRC_URI_append_gsj = " file://config-8ssd.json"
-SRC_URI_append_gsj = " file://config-2ssd.json"
-SRC_URI_append_gsj = " file://fan-control.sh"
-SRC_URI_append_gsj = " file://fan-default-speed.sh"
-SRC_URI_append_gsj = " file://phosphor-pid-control.service"
-SRC_URI_append_gsj = " file://fan-reboot-control.service"
-SRC_URI_append_gsj = " file://fan-boot-control.service"
+FILESEXTRAPATHS:prepend:gsj := "${THISDIR}/${PN}:"
+SRC_URI:append:gsj = " file://config-8ssd.json"
+SRC_URI:append:gsj = " file://config-2ssd.json"
+SRC_URI:append:gsj = " file://fan-control.sh"
+SRC_URI:append:gsj = " file://fan-default-speed.sh"
+SRC_URI:append:gsj = " file://phosphor-pid-control.service"
+SRC_URI:append:gsj = " file://fan-reboot-control.service"
+SRC_URI:append:gsj = " file://fan-boot-control.service"
 
-FILES_${PN}_append_gsj = " ${datadir}/swampd/config-8ssd.json"
-FILES_${PN}_append_gsj = " ${datadir}/swampd/config-2ssd.json"
-FILES_${PN}_append_gsj = " ${bindir}/fan-control.sh"
-FILES_${PN}_append_gsj = " ${bindir}/fan-default-speed.sh"
+FILES:${PN}:append:gsj = " ${datadir}/swampd/config-8ssd.json"
+FILES:${PN}:append:gsj = " ${datadir}/swampd/config-2ssd.json"
+FILES:${PN}:append:gsj = " ${bindir}/fan-control.sh"
+FILES:${PN}:append:gsj = " ${bindir}/fan-default-speed.sh"
 
 inherit systemd
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "bash"
 
-SYSTEMD_SERVICE_${PN}_append_gsj = " phosphor-pid-control.service"
-SYSTEMD_SERVICE_${PN}_append_gsj = " fan-reboot-control.service"
-SYSTEMD_SERVICE_${PN}_append_gsj = " fan-boot-control.service"
+SYSTEMD_SERVICE:${PN}:append:gsj = " phosphor-pid-control.service"
+SYSTEMD_SERVICE:${PN}:append:gsj = " fan-reboot-control.service"
+SYSTEMD_SERVICE:${PN}:append:gsj = " fan-boot-control.service"
 
-do_install_append_gsj() {
+do_install:append:gsj() {
     install -d ${D}/${bindir}
     install -m 0755 ${WORKDIR}/fan-control.sh ${D}/${bindir}
     install -m 0755 ${WORKDIR}/fan-default-speed.sh ${D}/${bindir}
diff --git a/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend
index 7d217b7..dc75f60 100644
--- a/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ b/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend
@@ -1,8 +1,8 @@
-OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " quanta-nvme-powerctrl"
-OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " phosphor-nvme"
-OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " phosphor-pid-control"
-OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " detect-fan-fail"
-OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " google-ipmi-sys"
-OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " gsj-hotswap-change-setting"
-OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " iperf3"
-IMAGE_FEATURES_remove_gsj = "obmc-user-mgmt-ldap"
+OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " quanta-nvme-powerctrl"
+OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " phosphor-nvme"
+OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " phosphor-pid-control"
+OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " detect-fan-fail"
+OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " google-ipmi-sys"
+OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " gsj-hotswap-change-setting"
+OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " iperf3"
+IMAGE_FEATURES:remove:gsj = "obmc-user-mgmt-ldap"
diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
index 5723801..45c2ab2 100644
--- a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
+++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend_gsj := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:gsj := "${THISDIR}/${PN}:"
diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend
index a51d07e..10b1d29 100644
--- a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend
+++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend
@@ -1 +1 @@
-PACKAGECONFIG_append_gsj = " net-bridge reboot-update static-bmc"
+PACKAGECONFIG:append:gsj = " net-bridge reboot-update static-bmc"
diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
index 32989f2..2fb5443 100644
--- a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
+++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
@@ -1,6 +1,6 @@
 inherit obmc-phosphor-systemd
 
-FILESEXTRAPATHS_prepend_gsj := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:gsj := "${THISDIR}/${PN}:"
 
 EEPROM_NAMES = "hsbp bmc"
 
@@ -10,11 +10,11 @@
 EEPROMS_ESCAPED = "${@compose_list(d, 'EEPROM_ESCAPEDFMT', 'EEPROM_NAMES')}"
 
 ENVFMT = "obmc/eeproms/{0}"
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gsj := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gsj := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}"
 
 TMPL = "obmc-read-eeprom@.service"
 TGT = "multi-user.target"
 INSTFMT = "obmc-read-eeprom@{0}.service"
 FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}"
 
-SYSTEMD_LINK_${PN}_append_gsj := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}"
+SYSTEMD_LINK_${PN}:append:gsj := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}"
diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index f695261..70b2b63 100644
--- a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
@@ -1,7 +1,7 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 # Replace the default whitelist for GSJ board.
-SRC_URI_append_gsj = " file://gsj-ipmid-whitelist.conf"
+SRC_URI:append:gsj = " file://gsj-ipmid-whitelist.conf"
 
-WHITELIST_CONF_remove_gsj = " ${S}/host-ipmid-whitelist.conf"
-WHITELIST_CONF_append_gsj = " ${WORKDIR}/gsj-ipmid-whitelist.conf"
+WHITELIST_CONF:remove:gsj = " ${S}/host-ipmid-whitelist.conf"
+WHITELIST_CONF:append:gsj = " ${WORKDIR}/gsj-ipmid-whitelist.conf"
diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend
index ac2c0ba..aee769c 100644
--- a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend
+++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend
@@ -1,3 +1,3 @@
 # In gsj, usb0 is the interface.
-RMCPP_IFACE_gsj = "usb0"
+RMCPP_IFACE:gsj = "usb0"
 
diff --git a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index e2d7530..4363aa3 100644
--- a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 
 NAMES = " \
@@ -15,9 +15,9 @@
 ITEMS += "${@compose_list(d, 'ITEMSFMT', 'NAMES')}"
 
 ENVS = "obmc/hwmon/{0}"
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gsj = " ${@compose_list(d, 'ENVS', 'ITEMS')}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gsj = " ${@compose_list(d, 'ENVS', 'ITEMS')}"
 
 # Fan sensors
 FITEMS = "pwm-fan-controller@103000.conf"
 FENVS = "obmc/hwmon/ahb/apb/{0}"
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gsj = " ${@compose_list(d, 'FENVS', 'FITEMS')}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gsj = " ${@compose_list(d, 'FENVS', 'FITEMS')}"
diff --git a/meta-quanta/meta-gsj/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
index 53db04d..bbc797a 100644
--- a/meta-quanta/meta-gsj/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
+++ b/meta-quanta/meta-gsj/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend_gsj := "${THISDIR}/${BPN}:"
-SRC_URI_append_gsj = " file://time-default.override.yml"
-SRC_URI_append_gsj = " file://restrictionmode-default-whitelist.override.yml"
+FILESEXTRAPATHS:prepend:gsj := "${THISDIR}/${BPN}:"
+SRC_URI:append:gsj = " file://time-default.override.yml"
+SRC_URI:append:gsj = " file://restrictionmode-default-whitelist.override.yml"
diff --git a/meta-quanta/meta-gsj/recipes-quanta/network/mac-address_%.bbappend b/meta-quanta/meta-gsj/recipes-quanta/network/mac-address_%.bbappend
index a90150b..3b1ee17 100644
--- a/meta-quanta/meta-gsj/recipes-quanta/network/mac-address_%.bbappend
+++ b/meta-quanta/meta-gsj/recipes-quanta/network/mac-address_%.bbappend
@@ -1,9 +1,9 @@
-FILESEXTRAPATHS_prepend_gsj := "${THISDIR}/${PN}:"
-SRC_URI_append_gsj = " file://config.txt"
+FILESEXTRAPATHS:prepend:gsj := "${THISDIR}/${PN}:"
+SRC_URI:append:gsj = " file://config.txt"
 
-FILES_${PN}_append_gsj = " ${datadir}/mac-address/config.txt"
+FILES:${PN}:append:gsj = " ${datadir}/mac-address/config.txt"
 
-do_install_append_gsj() {
+do_install:append:gsj() {
     install -d ${D}${datadir}/mac-address
     install -m 0644 -D ${WORKDIR}/config.txt \
         ${D}${datadir}/mac-address/config.txt