diff --git a/conf/layer.conf b/conf/layer.conf
index 1710a6c..461120f 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -23,90 +23,90 @@ BBFILES_DYNAMIC += " \
 
 LAYERSERIES_COMPAT_riscv-layer = "hardknott"
 
-INSANE_SKIP_append_pn-eudev_riscv64 = " textrel"
-INSANE_SKIP_append_pn-gdb_riscv64 = " textrel"
-INSANE_SKIP_append_pn-perf_riscv64 = " textrel"
-INSANE_SKIP_append_pn-qtbase_riscv64 = " textrel"
-INSANE_SKIP_append_pn-qtbase-tools_riscv64 = " textrel"
-INSANE_SKIP_append_pn-dracut_riscv64 = " textrel"
-INSANE_SKIP_append_pn-qemu_riscv64 = " textrel"
-INSANE_SKIP_append_pn-qemu-ptest_riscv64 = " textrel"
-INSANE_SKIP_append_pn-rt-tests_riscv64 = " textrel"
-INSANE_SKIP_append_pn-tvheadend_riscv64 = " textrel"
-INSANE_SKIP_append_pn-tipcutils_riscv64 = " textrel"
-INSANE_SKIP_append_pn-zabbix_riscv64 = " textrel"
-INSANE_SKIP_append_pn-xfsdump_riscv64 = " textrel"
-INSANE_SKIP_append_pn-capnproto_riscv64 = " textrel"
-INSANE_SKIP_append_pn-netdata_riscv64 = " textrel"
-INSANE_SKIP_append_pn-ltp_riscv64 = " textrel"
-INSANE_SKIP_append_pn-opensaf_riscv64 = " textrel"
-INSANE_SKIP_append_pn-rdma-core_riscv64 = " textrel"
-INSANE_SKIP_append_pn-doxygen_riscv64 = " textrel"
-INSANE_SKIP_append_pn-poppler_riscv64 = " textrel"
+INSANE_SKIP:append:pn-eudev:riscv64 = " textrel"
+INSANE_SKIP:append:pn-gdb:riscv64 = " textrel"
+INSANE_SKIP:append:pn-perf:riscv64 = " textrel"
+INSANE_SKIP:append:pn-qtbase:riscv64 = " textrel"
+INSANE_SKIP:append:pn-qtbase-tools:riscv64 = " textrel"
+INSANE_SKIP:append:pn-dracut:riscv64 = " textrel"
+INSANE_SKIP:append:pn-qemu:riscv64 = " textrel"
+INSANE_SKIP:append:pn-qemu-ptest:riscv64 = " textrel"
+INSANE_SKIP:append:pn-rt-tests:riscv64 = " textrel"
+INSANE_SKIP:append:pn-tvheadend:riscv64 = " textrel"
+INSANE_SKIP:append:pn-tipcutils:riscv64 = " textrel"
+INSANE_SKIP:append:pn-zabbix:riscv64 = " textrel"
+INSANE_SKIP:append:pn-xfsdump:riscv64 = " textrel"
+INSANE_SKIP:append:pn-capnproto:riscv64 = " textrel"
+INSANE_SKIP:append:pn-netdata:riscv64 = " textrel"
+INSANE_SKIP:append:pn-ltp:riscv64 = " textrel"
+INSANE_SKIP:append:pn-opensaf:riscv64 = " textrel"
+INSANE_SKIP:append:pn-rdma-core:riscv64 = " textrel"
+INSANE_SKIP:append:pn-doxygen:riscv64 = " textrel"
+INSANE_SKIP:append:pn-poppler:riscv64 = " textrel"
 # Only seen when build with gcc
-INSANE_SKIP_append_pn-util-linux_riscv64 = " textrel"
+INSANE_SKIP:append:pn-util-linux:riscv64 = " textrel"
 # Only seen when build with gcc
-INSANE_SKIP_append_pn-cmocka_riscv64 = " textrel"
-INSANE_SKIP_append_pn-rust-hello-world_riscv64 = " textrel"
-INSANE_SKIP_append_pn-fish_riscv64 = " textrel"
+INSANE_SKIP:append:pn-cmocka:riscv64 = " textrel"
+INSANE_SKIP:append:pn-rust-hello-world:riscv64 = " textrel"
+INSANE_SKIP:append:pn-fish:riscv64 = " textrel"
 
-INSANE_SKIP_append_pn-xfsdump_riscv32 = " textrel"
-INSANE_SKIP_append_pn-zabbix_riscv32 = " textrel"
-INSANE_SKIP_append_pn-netdata_riscv32 = " textrel"
-INSANE_SKIP_append_pn-tipcutils_riscv32 = " textrel"
-INSANE_SKIP_append_pn-tvheadend_riscv32 = " textrel"
-INSANE_SKIP_append_pn-eudev_riscv32 = " textrel"
-INSANE_SKIP_append_pn-dracut_riscv32 = " textrel"
-INSANE_SKIP_append_pn-rt-tests_riscv32 = " textrel"
-INSANE_SKIP_append_pn-gdb_riscv32 = " textrel"
-INSANE_SKIP_append_pn-capnproto_riscv32 = " textrel"
-INSANE_SKIP_append_pn-rdma-core_riscv32 = " textrel"
-INSANE_SKIP_append_pn-ltp_riscv32 = " textrel"
-INSANE_SKIP_append_pn-poppler_riscv32 = " textrel"
-INSANE_SKIP_append_pn-qtbase_riscv32 = " textrel"
-INSANE_SKIP_append_pn-opensaf_riscv32 = " textrel"
-INSANE_SKIP_append_pn-doxygen_riscv32 = " textrel"
-INSANE_SKIP_append_pn-opengl-es-cts_riscv32 = " textrel"
-INSANE_SKIP_append_pn-perf_riscv32 = " textrel"
-INSANE_SKIP_append_pn-rust-hello-world_riscv32 = " textrel"
-INSANE_SKIP_append_pn-fish_riscv32 = " textrel"
+INSANE_SKIP:append:pn-xfsdump:riscv32 = " textrel"
+INSANE_SKIP:append:pn-zabbix:riscv32 = " textrel"
+INSANE_SKIP:append:pn-netdata:riscv32 = " textrel"
+INSANE_SKIP:append:pn-tipcutils:riscv32 = " textrel"
+INSANE_SKIP:append:pn-tvheadend:riscv32 = " textrel"
+INSANE_SKIP:append:pn-eudev:riscv32 = " textrel"
+INSANE_SKIP:append:pn-dracut:riscv32 = " textrel"
+INSANE_SKIP:append:pn-rt-tests:riscv32 = " textrel"
+INSANE_SKIP:append:pn-gdb:riscv32 = " textrel"
+INSANE_SKIP:append:pn-capnproto:riscv32 = " textrel"
+INSANE_SKIP:append:pn-rdma-core:riscv32 = " textrel"
+INSANE_SKIP:append:pn-ltp:riscv32 = " textrel"
+INSANE_SKIP:append:pn-poppler:riscv32 = " textrel"
+INSANE_SKIP:append:pn-qtbase:riscv32 = " textrel"
+INSANE_SKIP:append:pn-opensaf:riscv32 = " textrel"
+INSANE_SKIP:append:pn-doxygen:riscv32 = " textrel"
+INSANE_SKIP:append:pn-opengl-es-cts:riscv32 = " textrel"
+INSANE_SKIP:append:pn-perf:riscv32 = " textrel"
+INSANE_SKIP:append:pn-rust-hello-world:riscv32 = " textrel"
+INSANE_SKIP:append:pn-fish:riscv32 = " textrel"
 # Only seen when build with gcc
-INSANE_SKIP_append_pn-cmocka_riscv32 = " textrel"
+INSANE_SKIP:append:pn-cmocka:riscv32 = " textrel"
 # Only seen when build with gcc
-INSANE_SKIP_append_pn-util-linux_riscv32 = " textrel"
+INSANE_SKIP:append:pn-util-linux:riscv32 = " textrel"
 
 # These recipe dont _yet_ build for rv32
-COMPATIBLE_HOST_pn-openh264_riscv32 = "null"
+COMPATIBLE_HOST:pn-openh264:riscv32 = "null"
 # needs SYS_ppoll and SYS_pselect6
-COMPATIBLE_HOST_pn-lttng-tools_riscv32 = "null"
+COMPATIBLE_HOST:pn-lttng-tools:riscv32 = "null"
 # LTTng-modules requires CONFIG_KPROBES on kernels >= 5.7.0
-COMPATIBLE_HOST_pn-lttng-modules_riscv32 = "null"
+COMPATIBLE_HOST:pn-lttng-modules:riscv32 = "null"
 # Needs porting to rv32
-COMPATIBLE_HOST_pn-android-tools_riscv32 = "null"
+COMPATIBLE_HOST:pn-android-tools:riscv32 = "null"
 # Needs porting to rv32
-COMPATIBLE_HOST_pn-strace_riscv32 = "null"
-COMPATIBLE_HOST_pn-ostree_riscv32 = "null"
+COMPATIBLE_HOST:pn-strace:riscv32 = "null"
+COMPATIBLE_HOST:pn-ostree:riscv32 = "null"
 # Klibc needs porting in usr/klibc/arch/riscv32
-COMPATIBLE_HOST_pn-klibc_riscv32 = "null"
-COMPATIBLE_HOST_pn-klibc-static-utils_riscv32 = "null"
-COMPATIBLE_HOST_pn-klibc-utils_riscv32 = "null"
-COMPATIBLE_HOST_pn-klcc-cross_riscv32 = "null"
-COMPATIBLE_HOST_pn-kexecboot-klibc_riscv32 = "null"
-COMPATIBLE_HOST_pn-ubi-utils-klibc_riscv32 = "null"
+COMPATIBLE_HOST:pn-klibc:riscv32 = "null"
+COMPATIBLE_HOST:pn-klibc-static-utils:riscv32 = "null"
+COMPATIBLE_HOST:pn-klibc-utils:riscv32 = "null"
+COMPATIBLE_HOST:pn-klcc-cross:riscv32 = "null"
+COMPATIBLE_HOST:pn-kexecboot-klibc:riscv32 = "null"
+COMPATIBLE_HOST:pn-ubi-utils-klibc:riscv32 = "null"
 
 # needs syscalls addressed for rv32
-COMPATIBLE_HOST_pn-qemu_riscv32 = "null"
+COMPATIBLE_HOST:pn-qemu:riscv32 = "null"
 # |   Unknown CPU 'riscv32'
-COMPATIBLE_HOST_pn-qtwebkit_riscv32 = "null"
+COMPATIBLE_HOST:pn-qtwebkit:riscv32 = "null"
 # Fails to configure
-COMPATIBLE_HOST_pn-samba_riscv32 = "null"
-COMPATIBLE_HOST_pn-smbnetfs_riscv32 = "null"
-COMPATIBLE_HOST_pn-gnome-control-center_riscv32 = "null"
-COMPATIBLE_HOST_pn-thunar-shares-plugin_riscv32 = "null"
+COMPATIBLE_HOST:pn-samba:riscv32 = "null"
+COMPATIBLE_HOST:pn-smbnetfs:riscv32 = "null"
+COMPATIBLE_HOST:pn-gnome-control-center:riscv32 = "null"
+COMPATIBLE_HOST:pn-thunar-shares-plugin:riscv32 = "null"
 
 # sipe-mime.c:129:30: error: cast from 'GTypeInstance *' (aka 'struct _GTypeInstance *') to 'GMimeStreamFilter *' (aka 'struct _GMimeStreamFilter *') increases required al ignment from 4 to 8 [-Werror,-Wcast-align]
-COMPATIBLE_HOST_pn-pidgin-sipe_riscv32 = "null"
+COMPATIBLE_HOST:pn-pidgin-sipe:riscv32 = "null"
 
 # needs swapcontext/makecontext/getcontext which are
 # not yet implemented in linucontext for rv32
-COMPATIBLE_HOST_pn-capnproto_libc-musl_riscv32 = "null"
+COMPATIBLE_HOST:pn-capnproto:libc-musl:riscv32 = "null"
diff --git a/conf/machine/baremetal-riscv32.conf b/conf/machine/baremetal-riscv32.conf
index d8049d3..648f274 100644
--- a/conf/machine/baremetal-riscv32.conf
+++ b/conf/machine/baremetal-riscv32.conf
@@ -17,6 +17,6 @@ QB_ROOTFS_OPT = "-drive file=@ROOTFS@,format=raw,id=hd0 -device virtio-blk-devic
 QB_SLIRP_OPT = "-netdev user,id=net0,hostfwd=tcp::22222-:22"
 
 # Prelink does not yet work
-USER_CLASSES_remove = "image-prelink"
+USER_CLASSES:remove = "image-prelink"
 
 TCLIBC = "baremetal"
diff --git a/conf/machine/baremetal-riscv64.conf b/conf/machine/baremetal-riscv64.conf
index 990b7a3..693cf38 100644
--- a/conf/machine/baremetal-riscv64.conf
+++ b/conf/machine/baremetal-riscv64.conf
@@ -17,6 +17,6 @@ QB_ROOTFS_OPT = "-drive file=@ROOTFS@,format=raw,id=hd0 -device virtio-blk-devic
 QB_SLIRP_OPT = "-netdev user,id=net0,hostfwd=tcp::22222-:22"
 
 # Prelink does not yet work
-USER_CLASSES_remove = "image-prelink"
+USER_CLASSES:remove = "image-prelink"
 
 TCLIBC = "baremetal"
diff --git a/docs/Plasma-Mobile-on-Unleashed.md b/docs/Plasma-Mobile-on-Unleashed.md
index 7e393e6..b208c15 100644
--- a/docs/Plasma-Mobile-on-Unleashed.md
+++ b/docs/Plasma-Mobile-on-Unleashed.md
@@ -49,7 +49,7 @@ EXTRA_USERS_PARAMS = "useradd kde; \
 RISCV_SBI_FDT_freedom-u540      = "HiFiveUnleashed-MicroSemi-Expansion.dtb"
 
 ## Install GPU driver for the GPU being used, in this example it's a Radeon R5 230
-PACKAGECONFIG_append_pn-mesa    = " r600"
+PACKAGECONFIG:append:pn-mesa    = " r600"
 ```
 
 You can then start the build by running:
diff --git a/dynamic-layers/virt-layer/recipes-extended/xvisor/xvisor_%.bbappend b/dynamic-layers/virt-layer/recipes-extended/xvisor/xvisor_%.bbappend
index d7f3909..06c65b3 100644
--- a/dynamic-layers/virt-layer/recipes-extended/xvisor/xvisor_%.bbappend
+++ b/dynamic-layers/virt-layer/recipes-extended/xvisor/xvisor_%.bbappend
@@ -51,39 +51,39 @@ xvisor_image_compile() {
   mcopy -i ${B}/vmm-disk-linux.img ${B}/build/tests/${XVISOR_PLAT}/linux/${XVISOR_PLAT_BASE}.dtb ::images/${XVISOR_PLAT}/${XVISOR_PLAT_BASE}.dtb
 }
 
-do_compile_append_riscv32() {
+do_compile:append:riscv32() {
   xvisor_image_compile
 }
 
-do_compile_append_riscv64() {
+do_compile:append:riscv64() {
   xvisor_image_compile
 }
 
-do_install_append_riscv32() {
+do_install:append:riscv32() {
   install -d ${D}
   install -m 755 ${B}/vmm-disk-basic.img ${D}/
   install -m 755 ${B}/vmm-disk-linux.img ${D}/
 }
 
-do_install_append_riscv64() {
+do_install:append:riscv64() {
   install -d ${D}
   install -m 755 ${B}/vmm-disk-basic.img ${D}/
   install -m 755 ${B}/vmm-disk-linux.img ${D}/
 }
 
-do_deploy_append_riscv32() {
+do_deploy:append:riscv32() {
   install -m 755 ${D}/vmm-disk-basic.img ${DEPLOY_DIR_IMAGE}
   install -m 755 ${D}/vmm-disk-linux.img ${DEPLOY_DIR_IMAGE}
 }
 
-do_deploy_append_riscv64() {
+do_deploy:append:riscv64() {
   install -m 755 ${D}/vmm-disk-basic.img ${DEPLOY_DIR_IMAGE}
   install -m 755 ${D}/vmm-disk-linux.img ${DEPLOY_DIR_IMAGE}
 }
 
-FILES_${PN}_riscv32 += "/vmm.*"
-FILES_${PN}_riscv32 += "/vmm-disk-basic.img"
-FILES_${PN}_riscv32 += "/vmm-disk-linux.img"
-FILES_${PN}_riscv64 += "/vmm.*"
-FILES_${PN}_riscv64 += "/vmm-disk-basic.img"
-FILES_${PN}_riscv64 += "/vmm-disk-linux.img"
+FILES:${PN}:riscv32 += "/vmm.*"
+FILES:${PN}:riscv32 += "/vmm-disk-basic.img"
+FILES:${PN}:riscv32 += "/vmm-disk-linux.img"
+FILES:${PN}:riscv64 += "/vmm.*"
+FILES:${PN}:riscv64 += "/vmm-disk-basic.img"
+FILES:${PN}:riscv64 += "/vmm-disk-linux.img"
diff --git a/recipes-bsp/u-boot/u-boot-starfive_v2021.04.bb b/recipes-bsp/u-boot/u-boot-starfive_v2021.04.bb
index 0979634..2b99471 100644
--- a/recipes-bsp/u-boot/u-boot-starfive_v2021.04.bb
+++ b/recipes-bsp/u-boot/u-boot-starfive_v2021.04.bb
@@ -1,7 +1,7 @@
 require recipes-bsp/u-boot/u-boot-common.inc
 require recipes-bsp/u-boot/u-boot.inc
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 SRC_URI = "git://github.com/starfive-tech/u-boot.git;protocol=git;branch=Fedora_VIC_7100_2021.04 \
            file://tftp-mmc-boot.txt \
@@ -11,12 +11,12 @@ SRC_URI = "git://github.com/starfive-tech/u-boot.git;protocol=git;branch=Fedora_
 
 SRCREV = "7b70e1d44ba9702a519ca936cabf19070309123a"
 
-DEPENDS_append = " u-boot-tools-native"
+DEPENDS:append = " u-boot-tools-native"
 
 # Overwrite this for your server
 TFTP_SERVER_IP ?= "127.0.0.1"
 
-do_configure_prepend() {
+do_configure:prepend() {
     sed -i -e 's,@SERVERIP@,${TFTP_SERVER_IP},g' ${WORKDIR}/tftp-mmc-boot.txt
     mkimage -O linux -T script -C none -n "U-Boot boot script" \
         -d ${WORKDIR}/tftp-mmc-boot.txt ${WORKDIR}/${UBOOT_ENV_BINARY}
diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend
index 698baa3..b524e7b 100644
--- a/recipes-bsp/u-boot/u-boot_%.bbappend
+++ b/recipes-bsp/u-boot/u-boot_%.bbappend
@@ -1,16 +1,16 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-SRC_URI_append_freedom-u540 = " \
+SRC_URI:append_freedom-u540 = " \
             file://tftp-mmc-boot.txt \
            "
-SRC_URI_append_freedom-u540_sota = " file://uEnv.txt"
+SRC_URI:append_freedom-u540_sota = " file://uEnv.txt"
 
-DEPENDS_append_freedom-u540 = " u-boot-tools-native"
+DEPENDS:append_freedom-u540 = " u-boot-tools-native"
 
 # Overwrite this for your server
 TFTP_SERVER_IP ?= "127.0.0.1"
 
-do_configure_prepend_freedom-u540() {
+do_configure:prepend_freedom-u540() {
     sed -i -e 's,@SERVERIP@,${TFTP_SERVER_IP},g' ${WORKDIR}/tftp-mmc-boot.txt
 
     if [ -f "${WORKDIR}/${UBOOT_ENV}.txt" ]; then
@@ -19,7 +19,7 @@ do_configure_prepend_freedom-u540() {
     fi
 }
 
-do_deploy_append_freedom-u540() {
+do_deploy:append_freedom-u540() {
     if [ -f "${WORKDIR}/boot.scr.uimg" ]; then
         install -d ${DEPLOY_DIR_IMAGE}
         install -m 755 ${WORKDIR}/boot.scr.uimg ${DEPLOY_DIR_IMAGE}
@@ -31,4 +31,4 @@ do_deploy_append_freedom-u540() {
     fi
 }
 
-FILES_${PN}_append_freedom-u540 = " /boot/boot.scr.uimg"
+FILES:${PN}:append_freedom-u540 = " /boot/boot.scr.uimg"
diff --git a/recipes-core/busybox/busybox_1.33%.bbappend b/recipes-core/busybox/busybox_1.33%.bbappend
index 7c1cdf2..023a628 100644
--- a/recipes-core/busybox/busybox_1.33%.bbappend
+++ b/recipes-core/busybox/busybox_1.33%.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI_append_riscv32 = " file://0001-hwclock-Check-for-SYS_settimeofday-before-calling-sy.patch"
+SRC_URI:append:riscv32 = " file://0001-hwclock-Check-for-SYS_settimeofday-before-calling-sy.patch"
diff --git a/recipes-core/images/riscv-initramfs-image.bb b/recipes-core/images/riscv-initramfs-image.bb
index f449be9..f7b51de 100644
--- a/recipes-core/images/riscv-initramfs-image.bb
+++ b/recipes-core/images/riscv-initramfs-image.bb
@@ -19,4 +19,4 @@ BAD_RECOMMENDATIONS += "busybox-syslog"
 
 # WIC is not compatible with an initramfs image, also enabling WIC would cause
 # an circular dependency.
-IMAGE_FSTYPES_remove = " wic wic.gz"
+IMAGE_FSTYPES:remove = " wic wic.gz"
diff --git a/recipes-core/musl/musl_%.bbappend b/recipes-core/musl/musl_%.bbappend
index a4b856d..241c3e3 100644
--- a/recipes-core/musl/musl_%.bbappend
+++ b/recipes-core/musl/musl_%.bbappend
@@ -1,6 +1,6 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI_append_riscv32 = "\
+SRC_URI:append:riscv32 = "\
     file://0001-Remove-ARMSUBARCH-relic-from-configure.patch \
     file://0002-time64-Don-t-make-aliases-to-nonexistent-syscalls.patch \
     file://0003-time64-Only-getrlimit-setrlimit-if-they-exist.patch \
diff --git a/recipes-core/packagegroups/packagegroup-core-tools-debug.bbappend b/recipes-core/packagegroups/packagegroup-core-tools-debug.bbappend
index 5f88e50..f4f4923 100644
--- a/recipes-core/packagegroups/packagegroup-core-tools-debug.bbappend
+++ b/recipes-core/packagegroups/packagegroup-core-tools-debug.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-RDEPENDS_${PN}_remove_riscv32 = "strace"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+RDEPENDS:${PN}:remove:riscv32 = "strace"
 
diff --git a/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend b/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
index ed95cee..5f0a813 100644
--- a/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
+++ b/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SYSTEMTAP_riscv32 = ""
-VALGRIND_riscv32 = ""
+SYSTEMTAP:riscv32 = ""
+VALGRIND:riscv32 = ""
diff --git a/recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend b/recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend
index a4bc645..f6344d1 100644
--- a/recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend
+++ b/recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-KEXECTOOLS_riscv32 = ""
-GSTEXAMPLES_riscv32 = ""
+KEXECTOOLS:riscv32 = ""
+GSTEXAMPLES:riscv32 = ""
diff --git a/recipes-core/packagegroups/packagegroup-go-sdk-target.bbappend b/recipes-core/packagegroups/packagegroup-go-sdk-target.bbappend
index 5c78bfd..bebfa50 100644
--- a/recipes-core/packagegroups/packagegroup-go-sdk-target.bbappend
+++ b/recipes-core/packagegroups/packagegroup-go-sdk-target.bbappend
@@ -1,2 +1,2 @@
-COMPATIBLE_HOST_riscv64 = "riscv64*"
-COMPATIBLE_HOST_riscv32 = "null"
+COMPATIBLE_HOST:riscv64 = "riscv64*"
+COMPATIBLE_HOST:riscv32 = "null"
diff --git a/recipes-core/packagegroups/packagegroup-self-hosted.bbappend b/recipes-core/packagegroups/packagegroup-self-hosted.bbappend
index 1478603..c149253 100644
--- a/recipes-core/packagegroups/packagegroup-self-hosted.bbappend
+++ b/recipes-core/packagegroups/packagegroup-self-hosted.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-RDEPENDS_packagegroup-self-hosted-debug_remove_riscv32 = "strace tcf-agent"
+RDEPENDS:packagegroup-self-hosted-debug:remove:riscv32 = "strace tcf-agent"
diff --git a/recipes-core/sysvinit/sysvinit-inittab_%.bbappend b/recipes-core/sysvinit/sysvinit-inittab_%.bbappend
index 47b46dd..dbba8ba 100644
--- a/recipes-core/sysvinit/sysvinit-inittab_%.bbappend
+++ b/recipes-core/sysvinit/sysvinit-inittab_%.bbappend
@@ -1,4 +1,4 @@
-do_install_append_freedom-u540() {
+do_install:append_freedom-u540() {
     sed -i -e 's#/bin/start_getty#/sbin/getty#g' ${D}${sysconfdir}/inittab
     sed -i '/tty1/d' ${D}${sysconfdir}/inittab
 }
diff --git a/recipes-devtools/riscv-tools/riscv-fesvr.bb b/recipes-devtools/riscv-tools/riscv-fesvr.bb
index fdadc1c..bea0914 100644
--- a/recipes-devtools/riscv-tools/riscv-fesvr.bb
+++ b/recipes-devtools/riscv-tools/riscv-fesvr.bb
@@ -14,14 +14,14 @@ BBCLASSEXTEND = "native nativesdk"
 
 S = "${WORKDIR}/git"
 
-do_configure_prepend () {
+do_configure:prepend () {
         if [ ! -e ${S}/acinclude.m4 ]; then
                 cp ${S}/aclocal.m4 ${S}/acinclude.m4
         fi
 }
 
-do_install_append () {
+do_install:append () {
         # Make install doesn't properly install these
         oe_libinstall -so libfesvr ${D}${libdir}
 }
-COMPATIBLE_HOST_class-target = "(riscv64|riscv32).*-linux"
+COMPATIBLE_HOST:class-target = "(riscv64|riscv32).*-linux"
diff --git a/recipes-devtools/riscv-tools/riscv-spike.bb b/recipes-devtools/riscv-tools/riscv-spike.bb
index b86f5f7..737d1c5 100644
--- a/recipes-devtools/riscv-tools/riscv-spike.bb
+++ b/recipes-devtools/riscv-tools/riscv-spike.bb
@@ -9,17 +9,17 @@ SRC_URI = "git://github.com/riscv/riscv-isa-sim.git \
            file://spike-makefile.patch"
 
 DEPENDS = "riscv-fesvr dtc-native"
-RDEPENDS_nativesdk-riscv-spike = "nativesdk-riscv-fesvr"
+RDEPENDS:nativesdk-riscv-spike = "nativesdk-riscv-fesvr"
 
 inherit autotools cross-canadian
 
 S = "${WORKDIR}/git"
 
-do_configure_prepend () {
+do_configure:prepend () {
 	touch ${S}/softfloat/softfloat.ac
         if [ ! -e ${S}/acinclude.m4 ]; then
                 cp ${S}/aclocal.m4 ${S}/acinclude.m4
         fi
 }
 BBCLASSEXTEND = "native nativesdk"
-COMPATIBLE_HOST_class-target = "(riscv64|riscv32).*-linux"
+COMPATIBLE_HOST:class-target = "(riscv64|riscv32).*-linux"
diff --git a/recipes-graphics/xorg-lib/libxshmfence_1.3.bbappend b/recipes-graphics/xorg-lib/libxshmfence_1.3.bbappend
index 40c2726..e84786f 100644
--- a/recipes-graphics/xorg-lib/libxshmfence_1.3.bbappend
+++ b/recipes-graphics/xorg-lib/libxshmfence_1.3.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI_append_riscv32 = " file://rv32_sys_futex.patch"
+SRC_URI:append:riscv32 = " file://rv32_sys_futex.patch"
 
diff --git a/recipes-kernel/firmware/linux-firmware-beaglev-bcm43430.bb b/recipes-kernel/firmware/linux-firmware-beaglev-bcm43430.bb
index e367398..7fc2d16 100644
--- a/recipes-kernel/firmware/linux-firmware-beaglev-bcm43430.bb
+++ b/recipes-kernel/firmware/linux-firmware-beaglev-bcm43430.bb
@@ -7,7 +7,7 @@ LICENSE = "\
     Firmware-broadcom_bcm43xx \
 "
 
-LICENSE_${PN} = "Firmware-broadcom_bcm43xx"
+LICENSE:${PN} = "Firmware-broadcom_bcm43xx"
 LIC_FILES_CHKSUM = "\
     file://LICENCE.broadcom_bcm43xx;md5=3160c14df7228891b868060e1951dfbc \
 "
@@ -46,6 +46,6 @@ do_install () {
     ln -s brcmfmac43430-sdio.AP6212.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.beagle,beaglev-starlight-jh7100.txt
 }
 
-FILES_${PN} = "${nonarch_base_libdir}/firmware/brcm/"
+FILES:${PN} = "${nonarch_base_libdir}/firmware/brcm/"
 
 INSANE_SKIP = "arch"
diff --git a/recipes-kernel/linux/linux-mainline-common.inc b/recipes-kernel/linux/linux-mainline-common.inc
index 762af42..fc417a5 100644
--- a/recipes-kernel/linux/linux-mainline-common.inc
+++ b/recipes-kernel/linux/linux-mainline-common.inc
@@ -12,13 +12,13 @@ PV = "${LINUX_VERSION}+git${SRCPV}"
 
 KCONFIG_MODE="--alldefconfig"
 
-KBUILD_DEFCONFIG_qemuriscv32 = "rv32_defconfig"
-KBUILD_DEFCONFIG_qemuriscv64 = "defconfig"
+KBUILD_DEFCONFIG:qemuriscv32 = "rv32_defconfig"
+KBUILD_DEFCONFIG:qemuriscv64 = "defconfig"
 KBUILD_DEFCONFIG_freedom-u540 = "defconfig"
 
 COMPATIBLE_MACHINE = "(qemuriscv32|qemuriscv64|freedom-u540)"
 
 KERNEL_DEVICETREE_freedom-u540 = "sifive/${RISCV_SBI_FDT}"
 
-KERNEL_FEATURES_remove = "features/debug/printk.scc"
-KERNEL_FEATURES_remove = "features/kernel-sample/kernel-sample.scc"
+KERNEL_FEATURES:remove = "features/debug/printk.scc"
+KERNEL_FEATURES:remove = "features/kernel-sample/kernel-sample.scc"
diff --git a/recipes-kernel/linux/linux-mainline_5.4.bb b/recipes-kernel/linux/linux-mainline_5.4.bb
index b71a33c..746c23f 100644
--- a/recipes-kernel/linux/linux-mainline_5.4.bb
+++ b/recipes-kernel/linux/linux-mainline_5.4.bb
@@ -9,7 +9,7 @@ SRC_URI = " \
     git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git;branch=${BRANCH} \
 "
 
-SRC_URI_append_freedom-u540 = " \
+SRC_URI:append_freedom-u540 = " \
     file://extra.cfg \
     file://0001-PCI-microsemi-Add-host-driver-for-Microsemi-PCIe-con.patch \
     file://0002-Microsemi-PCIe-expansion-board-DT-entry.patch \
diff --git a/recipes-kernel/linux/linux-starfive-dev.bb b/recipes-kernel/linux/linux-starfive-dev.bb
index 83b37f6..ca2813a 100644
--- a/recipes-kernel/linux/linux-starfive-dev.bb
+++ b/recipes-kernel/linux/linux-starfive-dev.bb
@@ -15,7 +15,7 @@ SRC_URI = "git://github.com/${FORK}/linux.git;protocol=git;branch=${BRANCH} \
           "
 
 LINUX_VERSION ?= "5.14.0"
-LINUX_VERSION_EXTENSION_append = "-starlight"
+LINUX_VERSION_EXTENSION:append = "-starlight"
 
 KBUILD_DEFCONFIG_beaglev-starlight-jh7100 = "beaglev_defconfig"
 
diff --git a/recipes-kernel/linux/linux-starfive_5.12.bb b/recipes-kernel/linux/linux-starfive_5.12.bb
index d519819..b61ccc2 100644
--- a/recipes-kernel/linux/linux-starfive_5.12.bb
+++ b/recipes-kernel/linux/linux-starfive_5.12.bb
@@ -10,7 +10,7 @@ SRC_URI = "git://github.com/esmil/linux.git;protocol=git;branch=starlight-5.12.y
           "
 
 LINUX_VERSION ?= "5.12.10"
-LINUX_VERSION_EXTENSION_append = "-starfive"
+LINUX_VERSION_EXTENSION:append = "-starfive"
 
 SRCREV = "52317e6702508987fc67914c9d4270b8777f2a9b"
 
diff --git a/recipes-support/rng-tools/rng-tools_%.bbappend b/recipes-support/rng-tools/rng-tools_%.bbappend
index 6d4804d..1b6c912 100644
--- a/recipes-support/rng-tools/rng-tools_%.bbappend
+++ b/recipes-support/rng-tools/rng-tools_%.bbappend
@@ -1,2 +1,2 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
diff --git a/setup.sh b/setup.sh
index 1ff9465..8917b5d 100644
--- a/setup.sh
+++ b/setup.sh
@@ -56,10 +56,10 @@ MACHINE ?= "${MACHINE}"
 # rootfs for debugging
 #IMAGE_GEN_DEBUGFS = "1"
 #IMAGE_FSTYPES_DEBUGFS = "tar.gz"
-EXTRA_IMAGE_FEATURES_append = " ssh-server-dropbear"
-EXTRA_IMAGE_FEATURES_append = " package-management"
-PACKAGECONFIG_append_pn-qemu-native = " sdl"
-PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl"
+EXTRA_IMAGE_FEATURES:append = " ssh-server-dropbear"
+EXTRA_IMAGE_FEATURES:append = " package-management"
+PACKAGECONFIG:append:pn-qemu-native = " sdl"
+PACKAGECONFIG:append:pn-nativesdk-qemu = " sdl"
 USER_CLASSES ?= "buildstats buildhistory buildstats-summary image-prelink"
 
 require conf/distro/include/no-static-libs.inc
@@ -68,10 +68,10 @@ require conf/distro/include/security_flags.inc
 
 INHERIT += "uninative"
 
-DISTRO_FEATURES_append = " largefile opengl ptest multiarch wayland pam  systemd "
+DISTRO_FEATURES:append = " largefile opengl ptest multiarch wayland pam  systemd "
 DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit"
 VIRTUAL-RUNTIME_init_manager = "systemd"
-HOSTTOOLS_NONFATAL_append = " ssh"
+HOSTTOOLS_NONFATAL:append = " ssh"
 EOF
 
 echo "To build an image run"