diff --git a/meta-ingrasys/conf/layer.conf b/meta-ingrasys/conf/layer.conf
index 18a1bfa..fc07b59 100644
--- a/meta-ingrasys/conf/layer.conf
+++ b/meta-ingrasys/conf/layer.conf
@@ -3,4 +3,4 @@
 
 BBFILE_COLLECTIONS += "ingrasys"
 BBFILE_PATTERN_ingrasys := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_ingrasys = "gatesgarth hardknott"
+LAYERSERIES_COMPAT_ingrasys = "gatesgarth hardknott honister"
diff --git a/meta-ingrasys/meta-zaius/conf/layer.conf b/meta-ingrasys/meta-zaius/conf/layer.conf
index d63eb76..0f930d8 100644
--- a/meta-ingrasys/meta-zaius/conf/layer.conf
+++ b/meta-ingrasys/meta-zaius/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "zaius"
 BBFILE_PATTERN_zaius := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_zaius = "gatesgarth hardknott"
+LAYERSERIES_COMPAT_zaius = "gatesgarth hardknott honister"
diff --git a/meta-ingrasys/meta-zaius/conf/local.conf.sample b/meta-ingrasys/meta-zaius/conf/local.conf.sample
index 2d4aecd..31c3f91 100644
--- a/meta-ingrasys/meta-zaius/conf/local.conf.sample
+++ b/meta-ingrasys/meta-zaius/conf/local.conf.sample
@@ -1,11 +1,11 @@
 MACHINE ??= "zaius"
 DISTRO ?= "openbmc-openpower"
 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 \
@@ -14,4 +14,4 @@
     ABORT,${DL_DIR},100M,1K \
     ABORT,${SSTATE_DIR},100M,1K \
     ABORT,/tmp,10M,1K"
-CONF_VERSION = "1"
+CONF_VERSION = "2"
diff --git a/meta-ingrasys/meta-zaius/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend b/meta-ingrasys/meta-zaius/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend
index ddd2ff8..426e25e 100644
--- a/meta-ingrasys/meta-zaius/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend
+++ b/meta-ingrasys/meta-zaius/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend
@@ -1,2 +1,2 @@
-FILESEXTRAPATHS_prepend_zaius := "${THISDIR}/${PN}:"
-SRC_URI_append_zaius = " file://0001-board-aspeed-Add-reset_phy-for-Zaius.patch"
+FILESEXTRAPATHS:prepend:zaius := "${THISDIR}/${PN}:"
+SRC_URI:append:zaius = " file://0001-board-aspeed-Add-reset_phy-for-Zaius.patch"
diff --git a/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-aspeed_%.bbappend
index f3a8399..be411f1 100644
--- a/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-aspeed_%.bbappend
+++ b/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-aspeed_%.bbappend
@@ -1,2 +1,2 @@
-FILESEXTRAPATHS_prepend_zaius := "${THISDIR}/${PN}:"
-SRC_URI_append_zaius = " file://zaius.cfg"
+FILESEXTRAPATHS:prepend:zaius := "${THISDIR}/${PN}:"
+SRC_URI:append:zaius = " file://zaius.cfg"
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb
index dd6d6ee..4aebf6f 100644
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb
+++ b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb
@@ -15,13 +15,13 @@
 FMT_OFF = "../${TMPL_OFF}:${TGTFMT_OFF}.wants/${INSTFMT_OFF}"
 FMT_ON = "../${TMPL_ON}:${TGTFMT_ON}.requires/${INSTFMT_ON}"
 
-SYSTEMD_SERVICE_${PN} += "${TMPL_OFF}"
+SYSTEMD_SERVICE:${PN} += "${TMPL_OFF}"
 SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_OFF', 'OBMC_CHASSIS_INSTANCES')}"
-SYSTEMD_SERVICE_${PN} += "${TMPL_ON}"
+SYSTEMD_SERVICE:${PN} += "${TMPL_ON}"
 SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_ON', 'OBMC_CHASSIS_INSTANCES')}"
 
 SRC_URI += "file://zaius_avsbus.sh"
-RDEPENDS_${PN} += "i2c-tools"
+RDEPENDS:${PN} += "i2c-tools"
 
 do_install() {
         install -d ${D}${bindir}
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb
index 3ab36b1..3c7b92e 100644
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb
+++ b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb
@@ -15,13 +15,13 @@
 FMT_OFF = "../${TMPL_OFF}:${TGTFMT_OFF}.wants/${INSTFMT_OFF}"
 FMT_ON = "../${TMPL_ON}:${TGTFMT_ON}.requires/${INSTFMT_ON}"
 
-SYSTEMD_SERVICE_${PN} += "${TMPL_OFF}"
+SYSTEMD_SERVICE:${PN} += "${TMPL_OFF}"
 SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_OFF', 'OBMC_CHASSIS_INSTANCES')}"
-SYSTEMD_SERVICE_${PN} += "${TMPL_ON}"
+SYSTEMD_SERVICE:${PN} += "${TMPL_ON}"
 SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_ON', 'OBMC_CHASSIS_INSTANCES')}"
 
 SRC_URI += "file://zaius_vcs.sh"
-RDEPENDS_${PN} += "i2c-tools"
+RDEPENDS:${PN} += "i2c-tools"
 
 do_install() {
         install -d ${D}${bindir}
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/configuration/zaius-yaml-config.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/configuration/zaius-yaml-config.bb
index 129938f..f1698ca 100644
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/configuration/zaius-yaml-config.bb
+++ b/meta-ingrasys/meta-zaius/recipes-phosphor/configuration/zaius-yaml-config.bb
@@ -22,10 +22,10 @@
         ${D}${datadir}/${BPN}/ipmi-sensors.yaml
 }
 
-FILES_${PN}-dev = " \
+FILES:${PN}-dev = " \
     ${datadir}/${BPN}/ipmi-extra-properties.yaml \
     ${datadir}/${BPN}/ipmi-fru-read.yaml \
     ${datadir}/${BPN}/ipmi-sensors.yaml \
     "
 
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/console/obmc-console_%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/console/obmc-console_%.bbappend
index 2072afd..3180f28 100644
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/console/obmc-console_%.bbappend
+++ b/meta-ingrasys/meta-zaius/recipes-phosphor/console/obmc-console_%.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend_zaius := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:zaius := "${THISDIR}/${PN}:"
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
index 8e05153..005a1e4 100644
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
+++ b/meta-ingrasys/meta-zaius/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_append_zaius := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:append:zaius := "${THISDIR}/${PN}:"
 
 PCIE_CARD_E2B_INSTANCE = "pcie-card-e2b"
 
@@ -7,5 +7,5 @@
 TGT = "multi-user.target"
 FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}"
 
-SYSTEMD_LINK_${PN}-presence_append_zaius += "${@compose_list(d, 'FMT', 'PCIE_CARD_E2B_INSTANCE')}"
-SYSTEMD_ENVIRONMENT_FILE_${PN}-presence_append_zaius += "obmc/gpio/phosphor-pcie-card-e2b.conf"
+SYSTEMD_LINK_${PN}-presence:append:zaius += "${@compose_list(d, 'FMT', 'PCIE_CARD_E2B_INSTANCE')}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}-presence:append:zaius += "obmc/gpio/phosphor-pcie-card-e2b.conf"
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/host/checkstop-monitor.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/host/checkstop-monitor.bbappend
index 2072afd..3180f28 100644
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/host/checkstop-monitor.bbappend
+++ b/meta-ingrasys/meta-zaius/recipes-phosphor/host/checkstop-monitor.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend_zaius := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:zaius := "${THISDIR}/${PN}:"
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/host/p9-host-start.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/host/p9-host-start.bbappend
index 42f7117..42f7526 100644
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/host/p9-host-start.bbappend
+++ b/meta-ingrasys/meta-zaius/recipes-phosphor/host/p9-host-start.bbappend
@@ -1 +1 @@
-RDEPENDS_${PN}_append_zaius = ' avsbus-control vcs-control'
+RDEPENDS:${PN}:append:zaius = ' avsbus-control vcs-control'
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/host/phosphor-host-postd_%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/host/phosphor-host-postd_%.bbappend
index a42aa2b..1f12d4d 100644
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/host/phosphor-host-postd_%.bbappend
+++ b/meta-ingrasys/meta-zaius/recipes-phosphor/host/phosphor-host-postd_%.bbappend
@@ -1 +1 @@
-PACKAGECONFIG_append_zaius = " 7seg"
+PACKAGECONFIG:append:zaius = " 7seg"
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/image/obmc-phosphor-image.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/image/obmc-phosphor-image.bbappend
index 7cff3bb..9d13b12 100644
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/image/obmc-phosphor-image.bbappend
+++ b/meta-ingrasys/meta-zaius/recipes-phosphor/image/obmc-phosphor-image.bbappend
@@ -1 +1 @@
-OBMC_IMAGE_EXTRA_INSTALL_append_zaius = " mboxd"
+OBMC_IMAGE_EXTRA_INSTALL:append:zaius = " mboxd"
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
index fce2140..f1ba783 100644
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
+++ b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
@@ -1,6 +1,6 @@
-DEPENDS_append_zaius = " zaius-yaml-config"
+DEPENDS:append:zaius = " zaius-yaml-config"
 
-EXTRA_OECONF_zaius = " \
+EXTRA_OECONF:zaius = " \
     YAML_GEN=${STAGING_DIR_HOST}${datadir}/zaius-yaml-config/ipmi-fru-read.yaml \
     PROP_YAML=${STAGING_DIR_HOST}${datadir}/zaius-yaml-config/ipmi-extra-properties.yaml \
     "
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index 468e2e1..d592f9b 100644
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
@@ -1,6 +1,6 @@
-DEPENDS_append_zaius = " zaius-yaml-config"
+DEPENDS:append:zaius = " zaius-yaml-config"
 
-EXTRA_OECONF_zaius = " \
+EXTRA_OECONF:zaius = " \
     SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/zaius-yaml-config/ipmi-sensors.yaml \
     FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/zaius-yaml-config/ipmi-fru-read.yaml \
     "
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index f80bdb6..b6c2a0a 100644
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-ingrasys/meta-zaius/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -1,3 +1,3 @@
 # Support OCC pass through and general occ control
 # Support for GPIO presence service
-RDEPENDS_${PN}-inventory_append_zaius = " openpower-occ-control virtual/obmc-gpio-presence"
+RDEPENDS:${PN}-inventory:append:zaius = " openpower-occ-control virtual/obmc-gpio-presence"
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index b5b0fbc..1ce3815 100644
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend_zaius := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:zaius := "${THISDIR}/${PN}:"
 
 ZAIUS_CHIPS = "bus@1e78a000/i2c-bus@40/ucd90160@64"
 ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@300/pca9541a@70/i2c-arb/hotswap@54"
@@ -33,5 +33,5 @@
 
 ENVS = "obmc/hwmon/{0}"
 # compose_list is not defined immediately so don't use :=
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_zaius = " ${@compose_list(d, 'ENVS', 'ZAIUS_ITEMS')}"
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_zaius = " ${@compose_list(d, 'ENVS', 'ZAIUS_OCCITEMS')}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}:append:zaius = " ${@compose_list(d, 'ENVS', 'ZAIUS_ITEMS')}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}:append:zaius = " ${@compose_list(d, 'ENVS', 'ZAIUS_OCCITEMS')}"
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
index 813a09d..656528a 100644
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
+++ b/meta-ingrasys/meta-zaius/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_append_zaius := ":${THISDIR}/${PN}"
-SRC_URI_append_zaius = " file://powerpolicy-default-ALWAYS_POWER_ON.override.yml"
-SRC_URI_append_zaius = " file://timeowner-host-no-ntp.override.yml"
+FILESEXTRAPATHS:append:zaius := ":${THISDIR}/${PN}"
+SRC_URI:append:zaius = " file://powerpolicy-default-ALWAYS_POWER_ON.override.yml"
+SRC_URI:append:zaius = " file://timeowner-host-no-ntp.override.yml"
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend
index 2072afd..3180f28 100644
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend
+++ b/meta-ingrasys/meta-zaius/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend_zaius := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:zaius := "${THISDIR}/${PN}:"