diff --git a/meta-fii/conf/layer.conf b/meta-fii/conf/layer.conf
index 4cb55ee..ea180d4 100644
--- a/meta-fii/conf/layer.conf
+++ b/meta-fii/conf/layer.conf
@@ -5,4 +5,4 @@
             ${LAYERDIR}/recipes-*/*/*.bbappend"
 BBFILE_COLLECTIONS += "fii-layer"
 BBFILE_PATTERN_fii-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_fii-layer = "warrior zeus gatesgarth dunfell hardknott"
+LAYERSERIES_COMPAT_fii-layer = "hardknott honister"
diff --git a/meta-fii/meta-kudo/conf/layer.conf b/meta-fii/meta-kudo/conf/layer.conf
index 84c091c..d2b0e57 100644
--- a/meta-fii/meta-kudo/conf/layer.conf
+++ b/meta-fii/meta-kudo/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "kudo-layer"
 BBFILE_PATTERN_kudo-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_kudo-layer = "warrior zeus gatesgarth dunfell hardknott"
+LAYERSERIES_COMPAT_kudo-layer = "hardknott honister"
diff --git a/meta-fii/meta-kudo/conf/local.conf.sample b/meta-fii/meta-kudo/conf/local.conf.sample
index 2bd1c09..ed6eb49 100644
--- a/meta-fii/meta-kudo/conf/local.conf.sample
+++ b/meta-fii/meta-kudo/conf/local.conf.sample
@@ -1,7 +1,7 @@
 MACHINE ??= "kudo"
 DISTRO ?= "openbmc-kudo"
 PACKAGE_CLASSES ?= "package_rpm"
-SANITY_TESTED_DISTROS_append ?= " *"
+SANITY_TESTED_DISTROS:append ?= " *"
 EXTRA_IMAGE_FEATURES = "debug-tweaks"
 USER_CLASSES ?= "buildstats image-prelink"
 PATCHRESOLVE = "noop"
@@ -14,5 +14,5 @@
     ABORT,${DL_DIR},100M,1K \
     ABORT,${SSTATE_DIR},100M,1K \
     ABORT,/tmp,10M,1K"
-CONF_VERSION = "1"
+CONF_VERSION = "2"
 
diff --git a/meta-fii/meta-kudo/conf/machine/kudo.conf b/meta-fii/meta-kudo/conf/machine/kudo.conf
index 768719d..792e63c 100644
--- a/meta-fii/meta-kudo/conf/machine/kudo.conf
+++ b/meta-fii/meta-kudo/conf/machine/kudo.conf
@@ -5,10 +5,10 @@
 require conf/machine/include/obmc-bsp-common.inc
 
 FLASH_SIZE = "65536"
-FLASH_UBOOT_OFFSET_flash-65536 = "0"
-FLASH_KERNEL_OFFSET_flash-65536 = "2048"
-FLASH_ROFS_OFFSET_flash-65536 = "7168"
-FLASH_RWFS_OFFSET_flash-65536 = "62400"
+FLASH_UBOOT_OFFSET:flash-65536 = "0"
+FLASH_KERNEL_OFFSET:flash-65536 = "2048"
+FLASH_ROFS_OFFSET:flash-65536 = "7168"
+FLASH_RWFS_OFFSET:flash-65536 = "62400"
 
 UBOOT_MACHINE = "PolegSVB_config"
 UBOOT_DEVICETREE = "nuvoton-npcm730-kudo"
@@ -34,4 +34,4 @@
 PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-kudo-apps"
 PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-kudo-apps"
 # Remove unneeded binaries from image
-IMAGE_FEATURES_remove = "obmc-health-monitor"
+IMAGE_FEATURES:remove = "obmc-health-monitor"
diff --git a/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend b/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend
index 5c56e17..7f1ede9 100644
--- a/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend
+++ b/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend
@@ -1,7 +1,7 @@
-FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:"
 
-SRC_URI_append_kudo = " file://fw_env.config"
+SRC_URI:append:kudo = " file://fw_env.config"
 
-do_install_append_kudo () {
+do_install:append:kudo () {
   install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config
 }
diff --git a/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-nuvoton_%.bbappend b/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-nuvoton_%.bbappend
index 1c13836..3c0bd73 100644
--- a/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-nuvoton_%.bbappend
+++ b/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-nuvoton_%.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:"
 
-SRC_URI_append_kudo = " file://kudo.cfg"
+SRC_URI:append:kudo = " file://kudo.cfg"
diff --git a/meta-fii/meta-kudo/recipes-extended/rsyslog/rsyslog_%.bbappend b/meta-fii/meta-kudo/recipes-extended/rsyslog/rsyslog_%.bbappend
index 278debb..46862b9 100644
--- a/meta-fii/meta-kudo/recipes-extended/rsyslog/rsyslog_%.bbappend
+++ b/meta-fii/meta-kudo/recipes-extended/rsyslog/rsyslog_%.bbappend
@@ -1,6 +1,6 @@
-FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:"
 
-SRC_URI_append_kudo = " \
+SRC_URI:append:kudo = " \
     file://rsyslog.conf \
     file://rsyslog.logrotate \
     file://rotate-event-logs.service \
@@ -8,11 +8,11 @@
     file://rsyslog-override.conf \
     "
 
-FILES_${PN}_append_kudo = " ${systemd_system_unitdir}/rsyslog.service.d/rsyslog-override.conf"
+FILES:${PN}:append:kudo = " ${systemd_system_unitdir}/rsyslog.service.d/rsyslog-override.conf"
 
-PACKAGECONFIG_append_kudo = " imjournal"
+PACKAGECONFIG:append:kudo = " imjournal"
 
-do_install_append_kudo() {
+do_install:append:kudo() {
     install -m 0644 ${WORKDIR}/rotate-event-logs.service ${D}${systemd_system_unitdir}
     install -d ${D}${systemd_system_unitdir}/rsyslog.service.d
     install -m 0644 ${WORKDIR}/rsyslog-override.conf \
@@ -22,4 +22,4 @@
     rm ${D}${sysconfdir}/rsyslog.d/imjournal.conf
 }
 
-SYSTEMD_SERVICE_${PN}_append_kudo = " rotate-event-logs.service"
+SYSTEMD_SERVICE:${PN}:append:kudo = " rotate-event-logs.service"
diff --git a/meta-fii/meta-kudo/recipes-kernel/linux/linux-nuvoton_%.bbappend b/meta-fii/meta-kudo/recipes-kernel/linux/linux-nuvoton_%.bbappend
index 5276bef..611af32 100644
--- a/meta-fii/meta-kudo/recipes-kernel/linux/linux-nuvoton_%.bbappend
+++ b/meta-fii/meta-kudo/recipes-kernel/linux/linux-nuvoton_%.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/linux-nuvoton:"
+FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/linux-nuvoton:"
 
-SRC_URI_append_kudo = " file://kudo.cfg"
+SRC_URI:append:kudo = " file://kudo.cfg"
diff --git a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb
index affbcf7..461aeb5 100644
--- a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb
@@ -20,10 +20,10 @@
           "
 
 DEPENDS = "systemd"
-RDEPENDS_${PN} = "bash"
+RDEPENDS:${PN} = "bash"
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = " \
+SYSTEMD_SERVICE:${PN} = " \
         ampere-host-shutdown.service \
         ampere-host-reset.service \
         ampere-chassis-poweroff.service \
diff --git a/meta-fii/meta-kudo/recipes-kudo/hotswap-power-cycle/hotswap-power-cycle.bb b/meta-fii/meta-kudo/recipes-kudo/hotswap-power-cycle/hotswap-power-cycle.bb
index d01b898..12098ad 100644
--- a/meta-fii/meta-kudo/recipes-kudo/hotswap-power-cycle/hotswap-power-cycle.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/hotswap-power-cycle/hotswap-power-cycle.bb
@@ -7,10 +7,10 @@
 inherit systemd
 
 DEPENDS += "systemd"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "bash"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-SRC_URI_append_kudo = " file://hotswap-power-cycle.service"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+SRC_URI:append:kudo = " file://hotswap-power-cycle.service"
 
 do_install() {
     install -d ${D}${systemd_unitdir}/system/
@@ -18,4 +18,4 @@
 }
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = " hotswap-power-cycle.service"
+SYSTEMD_SERVICE:${PN} = " hotswap-power-cycle.service"
diff --git a/meta-fii/meta-kudo/recipes-kudo/ipmi/fii-ipmi-oem_git.bb b/meta-fii/meta-kudo/recipes-kudo/ipmi/fii-ipmi-oem_git.bb
index c0793ad..b56ce44 100644
--- a/meta-fii/meta-kudo/recipes-kudo/ipmi/fii-ipmi-oem_git.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/ipmi/fii-ipmi-oem_git.bb
@@ -20,7 +20,7 @@
 HOSTIPMI_PROVIDER_LIBRARY += "${LIBRARY_NAMES}"
 NETIPMI_PROVIDER_LIBRARY += "${LIBRARY_NAMES}"
 
-FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}"
-FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}"
-FILES_${PN}_append = " ${libdir}/net-ipmid/lib*${SOLIBS}"
-FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV}"
+FILES:${PN}:append = " ${libdir}/ipmid-providers/lib*${SOLIBS}"
+FILES:${PN}:append = " ${libdir}/host-ipmid/lib*${SOLIBS}"
+FILES:${PN}:append = " ${libdir}/net-ipmid/lib*${SOLIBS}"
+FILES:${PN}-dev:append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV}"
diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bios-update.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bios-update.bb
index b126bfc..9fb7d24 100644
--- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bios-update.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bios-update.bb
@@ -10,18 +10,18 @@
 
 DEPENDS += "systemd"
 DEPENDS += "phosphor-ipmi-flash"
-RDEPENDS_${PN} += "libsystemd"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "libsystemd"
+RDEPENDS:${PN} += "bash"
 
-FILES_${PN} += "${datadir}/phosphor-ipmi-flash/config-bios.json"
+FILES:${PN} += "${datadir}/phosphor-ipmi-flash/config-bios.json"
 
-SRC_URI_append_kudo = " \ 
+SRC_URI:append:kudo = " \
     file://phosphor-ipmi-flash-bios-update.service \
     file://config-bios.json \
     "
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN}_append_kudo = " \
+SYSTEMD_SERVICE:${PN}:append:kudo = " \
     phosphor-ipmi-flash-bios-update.service \
     "
 
diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bmc-update.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bmc-update.bb
index 184f3ef..71daad3 100644
--- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bmc-update.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bmc-update.bb
@@ -6,11 +6,11 @@
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
 DEPENDS += "phosphor-ipmi-flash"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "bash"
 
-FILES_${PN} += "${datadir}/phosphor-ipmi-flash/config-bmc.json"
+FILES:${PN} += "${datadir}/phosphor-ipmi-flash/config-bmc.json"
 
-SRC_URI_append_kudo = " \
+SRC_URI:append:kudo = " \
     file://config-bmc.json \
     "
 
diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-cpld-update.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-cpld-update.bb
index b2fd820..d32b280 100644
--- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-cpld-update.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-cpld-update.bb
@@ -10,13 +10,13 @@
 
 DEPENDS += "systemd"
 DEPENDS += "phosphor-ipmi-flash"
-RDEPENDS_${PN} += "libsystemd"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "libsystemd"
+RDEPENDS:${PN} += "bash"
 
-FILES_${PN} += "${datadir}/phosphor-ipmi-flash/config-bmccpld.json"
-FILES_${PN} += "${datadir}/phosphor-ipmi-flash/config-mbcpld.json"
+FILES:${PN} += "${datadir}/phosphor-ipmi-flash/config-bmccpld.json"
+FILES:${PN} += "${datadir}/phosphor-ipmi-flash/config-mbcpld.json"
 
-SRC_URI_append_kudo = " \
+SRC_URI:append:kudo = " \
     file://phosphor-ipmi-flash-bmccpld-update.service \
     file://phosphor-ipmi-flash-mbcpld-update.service \
     file://config-bmccpld.json \
@@ -24,7 +24,7 @@
     "
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN}_append_kudo = " \
+SYSTEMD_SERVICE:${PN}:append:kudo = " \
     phosphor-ipmi-flash-bmccpld-update.service \
     phosphor-ipmi-flash-mbcpld-update.service \
     "
@@ -36,4 +36,4 @@
     install -d ${D}${systemd_system_unitdir}
     install -m 0644 ${WORKDIR}/phosphor-ipmi-flash-bmccpld-update.service ${D}${systemd_system_unitdir}
     install -m 0644 ${WORKDIR}/phosphor-ipmi-flash-mbcpld-update.service ${D}${systemd_system_unitdir}
-}
\ No newline at end of file
+}
diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw.bb
index 03ce088..28d276f 100644
--- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw.bb
@@ -10,8 +10,8 @@
 
 DEPENDS += "systemd"
 DEPENDS += "phosphor-ipmi-flash"
-RDEPENDS_${PN} += "libsystemd"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "libsystemd"
+RDEPENDS:${PN} += "bash"
 
 
 SRC_URI = " \
@@ -22,7 +22,7 @@
     "
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = " \
+SYSTEMD_SERVICE:${PN} = " \
     kudo-fw-ver.service \
     "
 
diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-scp-update.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-scp-update.bb
index 2c82ac8..70c40e6 100644
--- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-scp-update.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-scp-update.bb
@@ -10,13 +10,13 @@
 
 DEPENDS += "systemd"
 DEPENDS += "phosphor-ipmi-flash"
-RDEPENDS_${PN} += "libsystemd"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "libsystemd"
+RDEPENDS:${PN} += "bash"
 
-FILES_${PN} += "${datadir}/phosphor-ipmi-flash/config-scp.json"
-FILES_${PN} += "${datadir}/phosphor-ipmi-flash/config-scpback.json"
+FILES:${PN} += "${datadir}/phosphor-ipmi-flash/config-scp.json"
+FILES:${PN} += "${datadir}/phosphor-ipmi-flash/config-scpback.json"
 
-SRC_URI_append_kudo = " \
+SRC_URI:append:kudo = " \
     file://phosphor-ipmi-flash-scp-update.service \
     file://phosphor-ipmi-flash-scpback-update.service \
     file://config-scp.json \
@@ -24,7 +24,7 @@
     "
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN}_append_kudo = " \
+SYSTEMD_SERVICE:${PN}:append:kudo = " \
     phosphor-ipmi-flash-scp-update.service \
     phosphor-ipmi-flash-scpback-update.service \
     "
diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot.bb
index 87e4f74..c800f26 100644
--- a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot.bb
@@ -9,8 +9,8 @@
 inherit obmc-phosphor-systemd
 
 DEPENDS += "systemd"
-RDEPENDS_${PN} += "libsystemd"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "libsystemd"
+RDEPENDS:${PN} += "bash"
 
 SRC_URI = " \
     file://init_once.sh \
@@ -18,7 +18,7 @@
     "
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = " \
+SYSTEMD_SERVICE:${PN} = " \
     host-powerctrl.service \
     "
 
diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-cmd.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-cmd.bb
index f4e0bb0..324bd64 100644
--- a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-cmd.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-cmd.bb
@@ -5,7 +5,7 @@
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "bash"
 
 SRC_URI = " \
     file://kudo.sh \
diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-system/kudo-entity-association-map.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-system/kudo-entity-association-map.bb
index 85006da..0b0ac37 100644
--- a/meta-fii/meta-kudo/recipes-kudo/kudo-system/kudo-entity-association-map.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/kudo-system/kudo-entity-association-map.bb
@@ -5,7 +5,7 @@
 
 SRC_URI += "file://kudo_entity_association_map.json"
 
-FILES_${PN} = " \
+FILES:${PN} = " \
     ${datadir}/ipmi-entity-association/entity_association_map.json \
     "
 
diff --git a/meta-fii/meta-kudo/recipes-kudo/network/usb-network.bb b/meta-fii/meta-kudo/recipes-kudo/network/usb-network.bb
index 249e454..6e7be67 100644
--- a/meta-fii/meta-kudo/recipes-kudo/network/usb-network.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/network/usb-network.bb
@@ -4,18 +4,18 @@
 inherit allarch systemd
 
 DEPENDS += "systemd"
-RDEPENDS_${PN} += "libsystemd"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "libsystemd"
+RDEPENDS:${PN} += "bash"
 
-SRC_URI_append += " \
+SRC_URI:append += " \
     file://usb_network.sh \
     file://usb_network.service \
     file://00-bmc-usb0.network \
     "
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN}_append = " usb_network.service"
-FILES_${PN} += "${sysconfdir_native}/systemd/network/00-bmc-usb0.network"
+SYSTEMD_SERVICE:${PN}:append = " usb_network.service"
+FILES:${PN} += "${sysconfdir_native}/systemd/network/00-bmc-usb0.network"
 
 do_install() {
     install -d ${D}/${sbindir}
diff --git a/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb b/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb
index cc32052..a46e3a0 100644
--- a/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb
@@ -14,20 +14,20 @@
 PROVIDES += "virtual/obmc-system-mgmt"
 PROVIDES += "virtual/obmc-fan-mgmt"
 
-RPROVIDES_${PN}-kudo-system += "virtual-obmc-system-mgmt"
-RPROVIDES_${PN}-kudo-fw += "virtual-obmc-flash-mgmt"
-RPROVIDES_${PN}-fan-mgmt += "virtual-obmc-fan-mgmt"
+RPROVIDES:${PN}-kudo-system += "virtual-obmc-system-mgmt"
+RPROVIDES:${PN}-kudo-fw += "virtual-obmc-flash-mgmt"
+RPROVIDES:${PN}-fan-mgmt += "virtual-obmc-fan-mgmt"
 
-SUMMARY_${PN}-kudo-chassis = "kudo chassis"
-RDEPENDS_${PN}-kudo-chassis = " \
+SUMMARY:${PN}-kudo-chassis = "kudo chassis"
+RDEPENDS:${PN}-kudo-chassis = " \
     phosphor-hostlogger \
     obmc-op-control-power \
     obmc-phosphor-buttons-signals \
     obmc-phosphor-buttons-handler \
     "
 
-SUMMARY_${PN}-kudo-system = "kudo System"
-RDEPENDS_${PN}-kudo-system = " \
+SUMMARY:${PN}-kudo-system = "kudo System"
+RDEPENDS:${PN}-kudo-system = " \
     ipmitool \
     ethtool \
     memtester \
@@ -44,8 +44,8 @@
     phosphor-state-manager \
     "
 
-SUMMARY_${PN}-kudo-fw = "kudo Firmware"
-RDEPENDS_${PN}-kudo-fw = " \
+SUMMARY:${PN}-kudo-fw = "kudo Firmware"
+RDEPENDS:${PN}-kudo-fw = " \
     kudo-fw \
     kudo-bios-update \
     kudo-bmc-update \
@@ -53,8 +53,8 @@
     kudo-scp-update \
     "
 
-SUMMARY_${PN}-fan-mgmt = "kudo fan mgmt"
-RDEPENDS_${PN}-fan-mgmt = " \
+SUMMARY:${PN}-fan-mgmt = "kudo fan mgmt"
+RDEPENDS:${PN}-fan-mgmt = " \
     pwm-init \
     phosphor-pid-control \
     "
diff --git a/meta-fii/meta-kudo/recipes-phosphor/configuration/entity-manager_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/configuration/entity-manager_%.bbappend
index 02b9d7c..ae0d3f5 100644
--- a/meta-fii/meta-kudo/recipes-phosphor/configuration/entity-manager_%.bbappend
+++ b/meta-fii/meta-kudo/recipes-phosphor/configuration/entity-manager_%.bbappend
@@ -1,9 +1,9 @@
-FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:"
 
-SRC_URI_append_kudo = " \
+SRC_URI:append:kudo = " \
     file://blacklist.json \
     "
 
-do_install_append_kudo () {
+do_install:append:kudo () {
     install -m 0644 -D ${WORKDIR}/blacklist.json ${D}${datadir}/${PN}/blacklist.json
 }
diff --git a/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console_%.bbappend
index 9daae7c..b08aab3 100644
--- a/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console_%.bbappend
+++ b/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console_%.bbappend
@@ -1,24 +1,24 @@
-FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:"
-RDEPENDS_${PN}_append_kudo = " bash"
+FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:"
+RDEPENDS:${PN}:append:kudo = " bash"
 
 # Remove what installed by common recipe
 OBMC_CONSOLE_HOST_TTY = ""
-SYSTEMD_SUBSTITUTIONS_remove_kudo = " OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh@.service"
-SYSTEMD_SUBSTITUTIONS_remove_kudo = " OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh.socket"
+SYSTEMD_SUBSTITUTIONS:remove:kudo = " OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh@.service"
+SYSTEMD_SUBSTITUTIONS:remove:kudo = " OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh.socket"
 
 # Declare port spcific conf and service files
 HOST_CONSOLE_TTY = "ttyS1 ttyS3"
 
 CONSOLE_CONF_FMT = "file://server.{0}.conf"
-SRC_URI_append_kudo = " ${@compose_list(d, 'CONSOLE_CONF_FMT', 'HOST_CONSOLE_TTY')}"
-SRC_URI_append_kudo = " file://${BPN}@.service"
-SRC_URI_append_kudo = " file://kudo_uart_mux_ctrl.sh"
+SRC_URI:append:kudo = " ${@compose_list(d, 'CONSOLE_CONF_FMT', 'HOST_CONSOLE_TTY')}"
+SRC_URI:append:kudo = " file://${BPN}@.service"
+SRC_URI:append:kudo = " file://kudo_uart_mux_ctrl.sh"
 
-SYSTEMD_SERVICE_${PN}_append_kudo = " \
+SYSTEMD_SERVICE:${PN}:append:kudo = " \
         ${PN}@.service \
         "
 
-do_install_append() {
+do_install:append() {
     for i in ${HOST_CONSOLE_TTY}
     do
         install -m 0644 ${WORKDIR}/server.${i}.conf ${D}${sysconfdir}/${BPN}/server.${i}.conf
@@ -35,7 +35,7 @@
 
 }
 
-pkg_postinst_${PN}_append () {
+pkg_postinst:${PN}:append () {
     systemctl --root=$D enable obmc-console@ttyS1.service
     systemctl --root=$D enable obmc-console@ttyS3.service
 }
diff --git a/meta-fii/meta-kudo/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
index 03f391c..59b0db2 100644
--- a/meta-fii/meta-kudo/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
+++ b/meta-fii/meta-kudo/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
@@ -1,6 +1,6 @@
-FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:"
-SRC_URI_append_kudo = " file://phosphor-pid-control.service"
+FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:"
+SRC_URI:append:kudo = " file://phosphor-pid-control.service"
 
 inherit systemd
 
-SYSTEMD_SERVICE_${PN}_append_kudo = " phosphor-pid-control.service"
+SYSTEMD_SERVICE:${PN}:append:kudo = " phosphor-pid-control.service"
diff --git a/meta-fii/meta-kudo/recipes-phosphor/fans/pwm-init.bb b/meta-fii/meta-kudo/recipes-phosphor/fans/pwm-init.bb
index c380feb..f4b04e6 100644
--- a/meta-fii/meta-kudo/recipes-phosphor/fans/pwm-init.bb
+++ b/meta-fii/meta-kudo/recipes-phosphor/fans/pwm-init.bb
@@ -6,10 +6,10 @@
 inherit systemd
 
 DEPENDS = "systemd"
-RDEPENDS_${PN} = "bash"
+RDEPENDS:${PN} = "bash"
 
 S = "${WORKDIR}"
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 SRC_URI += " \
     file://pwm_init.service \
     file://bin/pwm_init.sh \
@@ -17,11 +17,11 @@
 
 SYSTEMD_PACKAGES = "${PN}"
 SYSTEMD_AUTO_ENABLE = "enable"
-SYSTEMD_SERVICE_${PN} += "pwm_init.service"
+SYSTEMD_SERVICE:${PN} += "pwm_init.service"
 
-FILES_${PN} += "${bindir}/* ${systemd_system_unitdir}/*"
+FILES:${PN} += "${bindir}/* ${systemd_system_unitdir}/*"
 
-do_install_append() {
+do_install:append() {
     install -d ${D}${bindir}
     install -m 0755 ${S}/bin/* ${D}${bindir}/
     install -d ${D}${systemd_system_unitdir}
diff --git a/meta-fii/meta-kudo/recipes-phosphor/image/obmc-phosphor-image.bbappend b/meta-fii/meta-kudo/recipes-phosphor/image/obmc-phosphor-image.bbappend
index 87dc228..682932a 100644
--- a/meta-fii/meta-kudo/recipes-phosphor/image/obmc-phosphor-image.bbappend
+++ b/meta-fii/meta-kudo/recipes-phosphor/image/obmc-phosphor-image.bbappend
@@ -1,12 +1,12 @@
-OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-ipmi-blobs"
-OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-ipmi-blobs-binarystore"
-OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-ipmi-ethstats"
-OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-ipmi-flash"
-OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-ipmi-net"
-OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-ipmi-host"
-OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-host-postd"
-OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-logging"
-OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-sel-logger"
-OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " entity-manager"
-OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " dbus-sensors"
-OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-virtual-sensor"
+OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " phosphor-ipmi-blobs"
+OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " phosphor-ipmi-blobs-binarystore"
+OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " phosphor-ipmi-ethstats"
+OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " phosphor-ipmi-flash"
+OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " phosphor-ipmi-net"
+OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " phosphor-ipmi-host"
+OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " phosphor-host-postd"
+OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " phosphor-logging"
+OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " phosphor-sel-logger"
+OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " entity-manager"
+OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " dbus-sensors"
+OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " phosphor-virtual-sensor"
diff --git a/meta-fii/meta-kudo/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/interfaces/bmcweb_%.bbappend
index af0bc3b..4dd9dc1 100644
--- a/meta-fii/meta-kudo/recipes-phosphor/interfaces/bmcweb_%.bbappend
+++ b/meta-fii/meta-kudo/recipes-phosphor/interfaces/bmcweb_%.bbappend
@@ -1,5 +1,4 @@
-EXTRA_OEMESON_append_kudo = " \
+EXTRA_OEMESON:append:kudo = " \
     -Dredfish-dump-log=enabled \
     -Dredfish-bmc-journal=enabled \
-    -Dredfish-allow-deprecated-hostname-patch=enabled \
 "
diff --git a/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_%.bbappend
index f87ac04..a1ed746 100644
--- a/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_%.bbappend
+++ b/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_%.bbappend
@@ -1,8 +1,8 @@
-FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:"
-SRC_URI_append_kudo = " file://config.json"
-FILES_${PN}_append_kudo = " ${datadir}/binaryblob/config.json"
+FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:"
+SRC_URI:append:kudo = " file://config.json"
+FILES:${PN}:append:kudo = " ${datadir}/binaryblob/config.json"
 
-do_install_append_kudo() {
+do_install:append:kudo() {
     install -d ${D}${datadir}/binaryblob/
     install ${WORKDIR}/config.json ${D}${datadir}/binaryblob/config.json
 }
diff --git a/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend
index fa9468a..e00d74d 100644
--- a/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend
+++ b/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend
@@ -1,3 +1,3 @@
-PACKAGECONFIG_append_kudo = " nuvoton-p2a-mbox net-bridge"
+PACKAGECONFIG:append:kudo = " nuvoton-p2a-mbox net-bridge"
 
-IPMI_FLASH_BMC_ADDRESS_kudo = "0xF0848000"
+IPMI_FLASH_BMC_ADDRESS:kudo = "0xF0848000"
diff --git a/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index 5e0eddc..da7f376 100644
--- a/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ b/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
@@ -1,7 +1,7 @@
-FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:"
 
 #Add sensorhandler.hpp and selutilty.hpp since intel-ipmi-oem requires these libs
-do_install_append_kudo(){
+do_install:append:kudo(){
     install -d ${D}${includedir}/phosphor-ipmi-host
     install -m 0644 -D ${S}/sensorhandler.hpp ${D}${includedir}/phosphor-ipmi-host
     install -m 0644 -D ${S}/selutility.hpp ${D}${includedir}/phosphor-ipmi-host
diff --git a/meta-fii/meta-kudo/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend
index 133159c..844a25b 100644
--- a/meta-fii/meta-kudo/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend
+++ b/meta-fii/meta-kudo/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend
@@ -1,2 +1,2 @@
 # Enable threshold, pulse, and watchdog monitoring
-PACKAGECONFIG_append_kudo = " log-threshold log-pulse log-watchdog"
+PACKAGECONFIG:append:kudo = " log-threshold log-pulse log-watchdog"
diff --git a/meta-fii/meta-kudo/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
index 43f5f56..f89f5d9 100644
--- a/meta-fii/meta-kudo/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
+++ b/meta-fii/meta-kudo/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
@@ -1,17 +1,17 @@
-FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:"
 
 inherit systemd
-RDEPENDS_${PN} += "bash"
-SYSTEMD_SERVICE_${PN}_append_kudo = " tla2024-enable.service"
+RDEPENDS:${PN} += "bash"
+SYSTEMD_SERVICE:${PN}:append:kudo = " tla2024-enable.service"
 
-SRC_URI_append_kudo = " \
+SRC_URI:append:kudo = " \
     file://virtual_sensor_config.json \
     file://tla2024-enable.service \
     file://tla2024-enable.sh \
     "
-FILES_${PN}_append_kudo = " ${bindir}/tla2024-enable.sh"
+FILES:${PN}:append:kudo = " ${bindir}/tla2024-enable.sh"
 
-do_install_append_kudo() {
+do_install:append:kudo() {
     install -d ${D}${datadir}/${PN}
     install -m 0644 ${WORKDIR}/virtual_sensor_config.json ${D}${datadir}/${PN}/virtual_sensor_config.json
     install -m 0755 ${WORKDIR}/tla2024-enable.sh ${D}${bindir}/tla2024-enable.sh
diff --git a/meta-fii/meta-kudo/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
index 79d7ac0..1f559ef 100644
--- a/meta-fii/meta-kudo/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
+++ b/meta-fii/meta-kudo/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
@@ -1,2 +1,2 @@
-FILESEXTRAPATHS_append_kudo := ":${THISDIR}/${PN}"
-SRC_URI_append_kudo = " file://chassis_capabilities.override.yml"
+FILESEXTRAPATHS:append:kudo := ":${THISDIR}/${PN}"
+SRC_URI:append:kudo = " file://chassis_capabilities.override.yml"
diff --git a/meta-fii/meta-kudo/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend
index 533a69a..889b910 100644
--- a/meta-fii/meta-kudo/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend
+++ b/meta-fii/meta-kudo/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_append_kudo := ":${THISDIR}/${PN}"
-SRC_URI_append_kudo = " file://gpio_defs.json"
+FILESEXTRAPATHS:append:kudo := ":${THISDIR}/${PN}"
+SRC_URI:append:kudo = " file://gpio_defs.json"
 
diff --git a/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend
index e795905..787ddab 100644
--- a/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend
+++ b/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend
@@ -1,8 +1,8 @@
-FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:"
 
 # Remove the override to keep service running after DC cycle
-SYSTEMD_OVERRIDE_${PN}_remove_kudo = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf"
-SYSTEMD_SERVICE_${PN}_kudo = "  phosphor-watchdog.service \
+SYSTEMD_OVERRIDE_${PN}:remove:kudo = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf"
+SYSTEMD_SERVICE:${PN}:kudo = "  phosphor-watchdog.service \
                                 phosphor-watchdog-host-poweroff.service \
                                 phosphor-watchdog-host-cycle.service\
                                 phosphor-watchdog-host-reset.service\