diff --git a/classes/st-image-license-summary.bbclass b/classes/st-image-license-summary.bbclass
index 9a944fc..a0103e3 100644
--- a/classes/st-image-license-summary.bbclass
+++ b/classes/st-image-license-summary.bbclass
@@ -51,7 +51,7 @@ def license_create_summary(d):
             mount_list.append(img_mount)
         for fi in os.listdir(target_deploydir):
             if fi.startswith(img_name) and fi.endswith(".ext4"):
-                r = re.compile("(.*)-(\d\d\d\d+)")
+                r = re.compile(r"(.*)-(\d\d\d\d+)")
                 mi = r.match(os.path.basename(fi))
                 if mi:
                     image_list_arrray.append([mi.group(1), mi.group(2), img_name, img_mount, filter])
@@ -63,7 +63,7 @@ def license_create_summary(d):
         filter = False
         for fi in os.listdir(deploy_image_dir):
             if fi.startswith(img_name) and fi.endswith(img_ext):
-                r = re.compile("(.*)-(\d\d\d\d+)")
+                r = re.compile(r"(.*)-(\d\d\d\d+)")
                 mi = r.match(os.path.basename(fi))
                 if mi:
                     image_list_arrray.append([mi.group(1), mi.group(2), img_name, img_mount, filter])
@@ -506,7 +506,7 @@ def license_create_summary(d):
         html.addColumnHeaderContent("License", html.bold)
         html.stopRow()
 
-        r = re.compile("([^:]+):\s*(.*)")
+        r = re.compile(r"(^.+?):\s+(.*)")
         new_boot = 0
         boot_recipe = None
         boot_license = None
@@ -591,7 +591,7 @@ def license_create_summary(d):
                 package_file = pkgdata_dir + "/runtime-reverse/" + package_name
                 package_file_content = private_open(package_file)
                 file_info = None
-                r = re.compile("([^:]+):\s*(.*)")
+                r = re.compile(r"(^.+?):\s+(.*)")
                 for line in package_file_content:
                     m = r.match(line)
                     if m:
diff --git a/classes/st-sdk-license-summary.bbclass b/classes/st-sdk-license-summary.bbclass
index 78d9f22..c745afe 100644
--- a/classes/st-sdk-license-summary.bbclass
+++ b/classes/st-sdk-license-summary.bbclass
@@ -452,7 +452,7 @@ def license_sdk_create_summary(d):
                 if len(package_file_content) == 0:
                     package_file = pkgdata_dir + "/runtime-reverse/" + package_name
                     package_file_content = private_open(package_file)
-                r = re.compile("([^:]+):\s*(.*)")
+                r = re.compile(r"(^.+?):\s+(.*)")
                 for line in package_file_content:
                     m = r.match(line)
                     if m:
@@ -528,4 +528,4 @@ def license_sdk_create_summary(d):
     html.endHtml()
     html.closefile()
 
-SDK_POSTPROCESS_COMMAND_append = "do_write_sdk_license_create_summary;"
+SDK_POSTPROCESS_COMMAND:append = "do_write_sdk_license_create_summary;"
diff --git a/conf/distro/include/exception-gplv3.inc b/conf/distro/include/exception-gplv3.inc
index 5a82b09..7c6b419 100644
--- a/conf/distro/include/exception-gplv3.inc
+++ b/conf/distro/include/exception-gplv3.inc
@@ -6,22 +6,22 @@
 # We dont want (L)GPL-3.0+
 INCOMPATIBLE_LICENSE = "GPLv3.0 GPLv3 GPL-3.0 GPLv3+ LGPLv3.0 LGPLv3 LGPL-3.0 LGPLv3+"
 
-OPENSTLINUX_WHITELIST_GPLv3 = "gettext"
+OPENSTLINUX_ALLOW_GPLv3 = "gettext"
 # for alsa-utils:
-OPENSTLINUX_WHITELIST_GPLv3 =+ " gettext bash "
+OPENSTLINUX_ALLOW_GPLv3 =+ " gettext bash "
 # for systemd
-OPENSTLINUX_WHITELIST_GPLv3 =+ " bash readline "
+OPENSTLINUX_ALLOW_GPLv3 =+ " bash readline "
 # for udev:
-OPENSTLINUX_WHITELIST_GPLv3 =+ " gawk coreutils gdbm m4 "
+OPENSTLINUX_ALLOW_GPLv3 =+ " gawk coreutils gdbm m4 "
 # for bluez
-OPENSTLINUX_WHITELIST_GPLv3 =+ " python3-pycairo "
+OPENSTLINUX_ALLOW_GPLv3 =+ " python3-pycairo "
 # for framework-tools-ui
-OPENSTLINUX_WHITELIST_GPLv3 =+ " grep dosfstools elfutils cpio gzip which "
+OPENSTLINUX_ALLOW_GPLv3 =+ " grep dosfstools elfutils cpio gzip which "
 
-OPENSTLINUX_WHITELIST_GPLv3 += "${@bb.utils.contains('DISTRO_FEATURES', 'tpm', 'nano msmtp', '', d)}"
+OPENSTLINUX_ALLOW_GPLv3 += "${@bb.utils.contains('DISTRO_FEATURES', 'tpm', 'nano msmtp', '', d)}"
 
-WHITELIST_GPLv3.0+ = "${OPENSTLINUX_WHITELIST_GPLv3}"
-WHITELIST_LGPLv3.0 = "${OPENSTLINUX_WHITELIST_GPLv3}"
-WHITELIST_GPL-3.0 = "${OPENSTLINUX_WHITELIST_GPLv3}"
-WHITELIST_GPL-3.0+ = "${OPENSTLINUX_WHITELIST_GPLv3}"
+INCOMPATIBLE_LICENSE_EXCEPTIONS:LGPL-3.0-or-later = "${OPENSTLINUX_ALLOW_GPLv3}"
+INCOMPATIBLE_LICENSE_EXCEPTIONS:LGPL-3.0-only = "${OPENSTLINUX_ALLOW_GPLv3}"
+INCOMPATIBLE_LICENSE_EXCEPTIONS:GPL-3.0-only = "${OPENSTLINUX_ALLOW_GPLv3}"
+INCOMPATIBLE_LICENSE_EXCEPTIONS:GPL-3.0-or-later = "${OPENSTLINUX_ALLOW_GPLv3}"
 
diff --git a/conf/distro/include/openstlinux-default-naming.inc b/conf/distro/include/openstlinux-default-naming.inc
index 53d3c08..4188154 100644
--- a/conf/distro/include/openstlinux-default-naming.inc
+++ b/conf/distro/include/openstlinux-default-naming.inc
@@ -22,7 +22,7 @@ MAINTAINER = "Christophe Priouzeau <christophe.priouzeau@st.com>"
 TARGET_VENDOR = "-ostl"
 
 # Append distro name to each image name
-IMAGE_BASENAME_append = "-${DISTRO}"
+IMAGE_BASENAME:append = "-${DISTRO}"
 
 # Add image name for generated SDK and set default SDK install folder
 SDK_NAME = "${IMAGE_LINK_NAME}-${SDK_ARCH}"
diff --git a/conf/distro/include/openstlinux.inc b/conf/distro/include/openstlinux.inc
index e4fff03..69a2c90 100644
--- a/conf/distro/include/openstlinux.inc
+++ b/conf/distro/include/openstlinux.inc
@@ -46,41 +46,41 @@ DISTRO_FEATURES += "bluetooth"
 DISTRO_FEATURES += "bluez5"
 
 # add support of gstreamer
-DISTRO_FEATURES_append = " gstreamer "
+DISTRO_FEATURES:append = " gstreamer "
 
 # add support of optee
-DISTRO_FEATURES_append = " optee "
+DISTRO_FEATURES:append = " optee "
 
 # add support of splashscreen
-DISTRO_FEATURES_append = " splashscreen "
+DISTRO_FEATURES:append = " splashscreen "
 
 # add support of wayland
-DISTRO_FEATURES_append = " wayland pam "
+DISTRO_FEATURES:append = " wayland pam "
 
 # add support of X11
-DISTRO_FEATURES_append = " x11 "
+DISTRO_FEATURES:append = " x11 "
 
 # add support of KDE (since OE thud version)
-DISTRO_FEATURES_append = " kde "
+DISTRO_FEATURES:append = " kde "
 
 # add support of systemd
-DISTRO_FEATURES_append = " systemd polkit "
+DISTRO_FEATURES:append = " systemd polkit "
 
 # add support of efi
-DISTRO_FEATURES_append = " efi "
+DISTRO_FEATURES:append = " efi "
 
 # add support of InitRD installation package
-DISTRO_FEATURES_append = " initrd "
+DISTRO_FEATURES:append = " initrd "
 
 # add support of autoresize through InitRD
-DISTRO_FEATURES_append = " autoresize "
+DISTRO_FEATURES:append = " autoresize "
 
 # add support of tpm2
-#DISTRO_FEATURES_append = " tpm2 "
+#DISTRO_FEATURES:append = " tpm2 "
 
 # Disabling pulseaudio
 #DISTRO_FEATURES_BACKFILL_CONSIDERED += "pulseaudio"
-DISTRO_FEATURES_append = "pulseaudio"
+DISTRO_FEATURES:append = "pulseaudio"
 
 # Disabling sysvinit
 DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit"
@@ -100,10 +100,10 @@ VIRTUAL-RUNTIME_initscripts = "systemd-compat-units"
 # =========================================================================
 IMAGE_LINGUAS = "en-us en-gb"
 
-LICENSE_FLAGS_WHITELIST += " non-commercial commercial"
+LICENSE_FLAGS_ACCEPTED += " non-commercial commercial"
 
 # X11 addons
-DISTRO_EXTRA_RDEPENDS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xf86-video-modesetting', '', d)} "
+DISTRO_EXTRA_RDEPENDS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xf86-video-modesetting', '', d)} "
 
 # INITRD addons to image
-DISTRO_EXTRA_RRECOMMENDS_append = " ${@bb.utils.contains('COMBINED_FEATURES', 'initrd', '${INITRD_PACKAGE}', '', d)} "
+DISTRO_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('COMBINED_FEATURES', 'initrd', '${INITRD_PACKAGE}', '', d)} "
diff --git a/conf/distro/openstlinux-eglfs.conf b/conf/distro/openstlinux-eglfs.conf
index 9df29b4..1c7e3ac 100644
--- a/conf/distro/openstlinux-eglfs.conf
+++ b/conf/distro/openstlinux-eglfs.conf
@@ -14,10 +14,10 @@ DISTRO_NAME = "ST OpenSTLinux - EGLfs - (A Yocto Project Based Distro)"
 # =========================================================================
 # DISTRO features
 # =========================================================================
-DISTRO_FEATURES_append = " opengl "
-DISTRO_FEATURES_remove = " wayland x11 "
+DISTRO_FEATURES:append = " opengl "
+DISTRO_FEATURES:remove = " wayland x11 "
 
-DISTRO_FEATURES_append = " gplv3 "
+DISTRO_FEATURES:append = " gplv3 "
 
 # FOR QT5 FORCE GIT PROTOCOL FOR HTTPS
 #QT_GIT_PROTOCOL = "https"
diff --git a/conf/distro/openstlinux-weston.conf b/conf/distro/openstlinux-weston.conf
index 8346f06..fa884a2 100644
--- a/conf/distro/openstlinux-weston.conf
+++ b/conf/distro/openstlinux-weston.conf
@@ -14,7 +14,9 @@ DISTRO_NAME = "ST OpenSTLinux - Weston - (A Yocto Project Based Distro)"
 # =========================================================================
 # DISTRO features
 # =========================================================================
-DISTRO_FEATURES_append = " opengl"
-#DISTRO_FEATURES_remove = " x11 "
+DISTRO_FEATURES:append = " opengl"
+DISTRO_FEATURES:remove = " x11 "
+# with X11
+#PREFERRED_PROVIDER_virtual/xserver = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', 'xserver-xorg', d)}"
 
-DISTRO_FEATURES_append = " gplv3 "
+DISTRO_FEATURES:append = " gplv3 "
diff --git a/oe-core/recipes-connectivity/openssh/openssh_%.bbappend b/oe-core/recipes-connectivity/openssh/openssh_%.bbappend
index bd75fdb..3f00634 100644
--- a/oe-core/recipes-connectivity/openssh/openssh_%.bbappend
+++ b/oe-core/recipes-connectivity/openssh/openssh_%.bbappend
@@ -1,5 +1,5 @@
-RDEPENDS_${PN}_remove = "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen"
+RDEPENDS:${PN}:remove = "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen"
 #the dependency are put on packagegroup
-RRECOMMENDS_${PN}-dev_remove = "openssh-keygen-dev update-alternatives-opkg-dev libcrypto-dev pam-plugin-keyinit-dev pam-plugin-loginuid-dev shadow-sysroot-dev"
-RDEPENDS_${PN}-dev = ""
-RRECOMMENDS_${PN}-dev_append = "openssh"
+RRECOMMENDS:${PN}-dev:remove = "openssh-keygen-dev update-alternatives-opkg-dev libcrypto-dev pam-plugin-keyinit-dev pam-plugin-loginuid-dev shadow-sysroot-dev"
+RDEPENDS:${PN}-dev = ""
+RRECOMMENDS:${PN}-dev:append = "openssh"
diff --git a/oe-core/recipes-connectivity/wireless-regdb/wireless-regdb_%.bbappend b/oe-core/recipes-connectivity/wireless-regdb/wireless-regdb_%.bbappend
index 69b8bad..4ed9ea5 100644
--- a/oe-core/recipes-connectivity/wireless-regdb/wireless-regdb_%.bbappend
+++ b/oe-core/recipes-connectivity/wireless-regdb/wireless-regdb_%.bbappend
@@ -1,9 +1,9 @@
 # There is a conflict with 'wireless-regdb-static' package and 'dev-pkgs'
 # IMAGE_FEATURES:
 # This configuration creates an install dependency for 'wireless-regdb' package,
-# while the 'wireless-regdb_%.bb' recipe set: RCONFLICTS_${PN} = "${PN}-static"
+# while the 'wireless-regdb_%.bb' recipe set: RCONFLICTS:${PN} = "${PN}-static"
 # This gives 'unmet dependencies' error.
 # To avoid this issue, modify dependencies for ${PN}-dev to not require the
 # ${PN} package by default.
-RDEPENDS_${PN}-dev = ""
-RRECOMMENDS_${PN}-dev_append = "${PN}"
+RDEPENDS:${PN}-dev = ""
+RRECOMMENDS:${PN}-dev:append = "${PN}"
diff --git a/oe-core/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bbappend b/oe-core/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bbappend
index 2edf1e3..a7713f2 100644
--- a/oe-core/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bbappend
+++ b/oe-core/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bbappend
@@ -1 +1 @@
-RDEPENDS_${PN} =+ "openssh-scp openssh-ssh openssh-sshd openssh-keygen"
+RDEPENDS:${PN} =+ "openssh-scp openssh-ssh openssh-sshd openssh-keygen"
diff --git a/oe-core/recipes-devtools/ltrace/ltrace_git.bbappend b/oe-core/recipes-devtools/ltrace/ltrace_git.bbappend
index 6c0afcf..bc5a8f0 100644
--- a/oe-core/recipes-devtools/ltrace/ltrace_git.bbappend
+++ b/oe-core/recipes-devtools/ltrace/ltrace_git.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI_append = " file://0001-Add-support-for-ARM-Thumb-branches-with-instruction-.patch "
+SRC_URI:append = " file://0001-Add-support-for-ARM-Thumb-branches-with-instruction-.patch "
diff --git a/oe-core/recipes-devtools/mtd/mtd-utils_git.bbappend b/oe-core/recipes-devtools/mtd/mtd-utils_git.bbappend
index 3a03eb9..d192902 100644
--- a/oe-core/recipes-devtools/mtd/mtd-utils_git.bbappend
+++ b/oe-core/recipes-devtools/mtd/mtd-utils_git.bbappend
@@ -1,9 +1,9 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 PV = "2.1.2"
 
 SRCREV = "54d68799b73e755923def1306b4da607ad45bd60"
-SRC_URI = "git://git.infradead.org/mtd-utils.git \
+SRC_URI = "git://git.infradead.org/mtd-utils.git;branch=master \
            file://0001-add-exclusion-to-mkfs-jffs2-git.patch \
 "
 
diff --git a/oe-core/recipes-support/ckermit/ckermit_%.bbappend b/oe-core/recipes-support/ckermit/ckermit_%.bbappend
index ba10de4..aecb94a 100644
--- a/oe-core/recipes-support/ckermit/ckermit_%.bbappend
+++ b/oe-core/recipes-support/ckermit/ckermit_%.bbappend
@@ -1,13 +1,13 @@
 CKERMIT_ADDITIONAL = ""
-CKERMIT_ADDITIONAL_append = " -pipe -funsigned-char -DFNFLOAT -DCK_NEWTERM -DPOSIX -UNOUNICODE"
-CKERMIT_ADDITIONAL_append = "  -UNOPUSH -UNOHELP -UNOFRILLS -UNOPUSH -DNO_OPENPTY"
-CKERMIT_ADDITIONAL_append = " -UNOB_115K -UNOSERVER -UNODEBUG -DDEBUG "
-CKERMIT_ADDITIONAL_append = "  -DTCPSOCKET -DNOLISTEN -DNOLOGIN"
+CKERMIT_ADDITIONAL:append = " -pipe -funsigned-char -DFNFLOAT -DCK_NEWTERM -DPOSIX -UNOUNICODE"
+CKERMIT_ADDITIONAL:append = "  -UNOPUSH -UNOHELP -UNOFRILLS -UNOPUSH -DNO_OPENPTY"
+CKERMIT_ADDITIONAL:append = " -UNOB_115K -UNOSERVER -UNODEBUG -DDEBUG "
+CKERMIT_ADDITIONAL:append = "  -DTCPSOCKET -DNOLISTEN -DNOLOGIN"
 
-CKERMIT_ADDITIONAL_append = " -UNOCSETS -UNONET -UNOFTP -UNODIAL -UNOPUSH -UNOIKSD -UNOHTTP -UDNOFLOAT "
-CKERMIT_ADDITIONAL_append = " -UNOSEXP -UNORLOGIN -UNOOLDMODEMS -UNOSSH -UNOLISTEN -UNORESEND -UNOAUTODL "
-CKERMIT_ADDITIONAL_append = " -UNOSTREAMING -UNOHINTS -UNOCKXYZ -UNOLEARN -UNOMKDIR -UNOPERMS -UNOCKTIMERS "
-CKERMIT_ADDITIONAL_append = " -UNOCKREGEX -UNOLOGDIAL -DNOLOCAL -DZLIB "
+CKERMIT_ADDITIONAL:append = " -UNOCSETS -UNONET -UNOFTP -UNODIAL -UNOPUSH -UNOIKSD -UNOHTTP -UDNOFLOAT "
+CKERMIT_ADDITIONAL:append = " -UNOSEXP -UNORLOGIN -UNOOLDMODEMS -UNOSSH -UNOLISTEN -UNORESEND -UNOAUTODL "
+CKERMIT_ADDITIONAL:append = " -UNOSTREAMING -UNOHINTS -UNOCKXYZ -UNOLEARN -UNOMKDIR -UNOPERMS -UNOCKTIMERS "
+CKERMIT_ADDITIONAL:append = " -UNOCKREGEX -UNOLOGDIAL -DNOLOCAL -DZLIB "
 
 do_compile () {
      # The original makefile doesn't differentiate between CC and CC_FOR_BUILD,
diff --git a/recipes-benchmark/glmark2/glmark2_%.bbappend b/recipes-benchmark/glmark2/glmark2_%.bbappend
index f4a251a..81522a7 100644
--- a/recipes-benchmark/glmark2/glmark2_%.bbappend
+++ b/recipes-benchmark/glmark2/glmark2_%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 DEPENDS += " udev "
 
diff --git a/recipes-bsp/tools/resize-helper.bb b/recipes-bsp/tools/resize-helper.bb
index 33a7098..43a4e26 100644
--- a/recipes-bsp/tools/resize-helper.bb
+++ b/recipes-bsp/tools/resize-helper.bb
@@ -2,14 +2,14 @@
 # Released under the MIT license (see COPYING.MIT for the terms)
 
 # Tools extracted from 96boards-tools https://github.com/96boards/96boards-tools
-DESCRIPTION = "Tools for resizing the file system"
+SUMMARY = "Tools for resizing the file system"
 SECTION = "devel"
 
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+LICENSE = "GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-or-later;md5=fed54355545ffd980b814dab4a3b312c"
 
 # e2fsprogs for resize2fs
-RDEPENDS_${PN} += " e2fsprogs-resize2fs "
+RDEPENDS:${PN} += " e2fsprogs-resize2fs "
 
 SRC_URI = " file://resize-helper.service file://resize-helper file://resize-helper.sh.in"
 
@@ -20,8 +20,8 @@ START_RESIZE_HELPER_SERVICE ?= "1"
 inherit systemd update-rc.d
 
 SYSTEMD_PACKAGES += " resize-helper "
-SYSTEMD_SERVICE_${PN} = "resize-helper.service"
-SYSTEMD_AUTO_ENABLE_${PN} = "${@bb.utils.contains('START_RESIZE_HELPER_SERVICE','1','enable','disable',d)}"
+SYSTEMD_SERVICE:${PN} = "resize-helper.service"
+SYSTEMD_AUTO_ENABLE:${PN} = "${@bb.utils.contains('START_RESIZE_HELPER_SERVICE','1','enable','disable',d)}"
 
 do_install() {
     install -d ${D}${systemd_unitdir}/system ${D}${base_sbindir}
diff --git a/recipes-bsp/tools/usbotg-gadget-config.bb b/recipes-bsp/tools/usbotg-gadget-config.bb
index 14d894b..f833838 100644
--- a/recipes-bsp/tools/usbotg-gadget-config.bb
+++ b/recipes-bsp/tools/usbotg-gadget-config.bb
@@ -37,5 +37,5 @@ do_install() {
 INITSCRIPT_NAME = "stm32_usbotg_eth_config.sh"
 INITSCRIPT_PARAMS = "start 22 5 3 ."
 
-FILES_${PN} += "${systemd_unitdir}/network"
+FILES:${PN} += "${systemd_unitdir}/network ${sysconfdir}/udev"
 
diff --git a/recipes-connectivity/connman/connman_%.bbappend b/recipes-connectivity/connman/connman_%.bbappend
index b058105..22337ec 100644
--- a/recipes-connectivity/connman/connman_%.bbappend
+++ b/recipes-connectivity/connman/connman_%.bbappend
@@ -1,12 +1,12 @@
 # Disable connman service at startup
-SYSTEMD_AUTO_ENABLE_${PN} = "disable"
+SYSTEMD_AUTO_ENABLE:${PN} = "disable"
 
 # Set low alternative priority for resolv-conf to keep systemd by default
 ALTERNATIVE_PRIORITY[resolv-conf] = "10"
 
 # As we disable CONNMAN service, we also need to remove the specific
 # /etc/tmpfiles.d/connman_resolvconf.conf to let systemd managing /etc/resolv.conf
-do_install_append() {
+do_install:append() {
     if [ -f ${D}/${sysconfdir}/tmpfiles.d/connman_resolvconf.conf ]; then
         rm ${D}/${sysconfdir}/tmpfiles.d/connman_resolvconf.conf
     fi
diff --git a/recipes-connectivity/wpa-supplicant/wpa-supplicant_%.bbappend b/recipes-connectivity/wpa-supplicant/wpa-supplicant_%.bbappend
index e0a3fe5..3438fe1 100644
--- a/recipes-connectivity/wpa-supplicant/wpa-supplicant_%.bbappend
+++ b/recipes-connectivity/wpa-supplicant/wpa-supplicant_%.bbappend
@@ -1,4 +1,4 @@
-do_configure_append() {
+do_configure:append() {
     # add CONFIG_P2P
     sed -i "s/^#CONFIG_P2P=y/CONFIG_P2P=y/" wpa_supplicant/.config
 }
diff --git a/recipes-core/busybox/busybox_%.bbappend b/recipes-core/busybox/busybox_%.bbappend
index 3c20334..993b8e4 100644
--- a/recipes-core/busybox/busybox_%.bbappend
+++ b/recipes-core/busybox/busybox_%.bbappend
@@ -1,10 +1,10 @@
-FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
+FILESEXTRAPATHS:append := ":${THISDIR}/${PN}"
 
 SRC_URI += "file://${BUSYBOX_CONFIG_FRAGMENT}"
 
 BUSYBOX_CONFIG_FRAGMENT = "busybox-openstlinux.cfg"
 
-do_configure_append () {
+do_configure:append () {
     # merge specific configuration to newly generated .config
     merge_config.sh -m -r -O ${B} ${B}/.config ${WORKDIR}/${BUSYBOX_CONFIG_FRAGMENT} 1>&2
     # make sure to generate proper config file for busybox
diff --git a/recipes-core/packagegroups/packagegroup-core-eclipse-debug.bbappend b/recipes-core/packagegroups/packagegroup-core-eclipse-debug.bbappend
index e5903fd..1786ce9 100644
--- a/recipes-core/packagegroups/packagegroup-core-eclipse-debug.bbappend
+++ b/recipes-core/packagegroups/packagegroup-core-eclipse-debug.bbappend
@@ -1,6 +1,6 @@
 #
 # Due to GPLv3 limitation, gdbserver are removed of package group
 #
-RDEPENDS_${PN}_remove = "\
+RDEPENDS:${PN}:remove = "\
     ${@bb.utils.contains('DISTRO_FEATURES', 'gplv3', '', 'gdbserver', d)} \
     "
diff --git a/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend b/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
index daa5ab1..9fc276d 100644
--- a/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
+++ b/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
@@ -1,5 +1,5 @@
-RDEPENDS_${PN}_remove = "${LTTNGMODULES}"
+RDEPENDS:${PN}:remove = "${LTTNGMODULES}"
 
-RRECOMMENDS_${PN}_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'gplv3', '', '${PERF}', d)}"
+RRECOMMENDS:${PN}:remove = "${@bb.utils.contains('DISTRO_FEATURES', 'gplv3', '', '${PERF}', d)}"
 
-#RDEPENDS_append += "oprofile"
+#RDEPENDS:append += "oprofile"
diff --git a/recipes-core/systemd/systemd-conf_%.bbappend b/recipes-core/systemd/systemd-conf_%.bbappend
index 888397f..a3e1416 100644
--- a/recipes-core/systemd/systemd-conf_%.bbappend
+++ b/recipes-core/systemd/systemd-conf_%.bbappend
@@ -1,10 +1,10 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI_append = " \
+SRC_URI:append = " \
     file://coredump-custom.conf \
     "
 
-do_install_prepend() {
+do_install:prepend() {
     install -d ${D}${sysconfdir}/systemd/coredump.conf.d/
     install -m 644 ${WORKDIR}/coredump-custom.conf ${D}${sysconfdir}/systemd/coredump.conf.d/
 
@@ -18,4 +18,4 @@ do_install_prepend() {
     echo "[Journal]" > ${D}${systemd_unitdir}/journald.conf.d/01-openstlinux.conf
     echo "Storage=volatile" >> ${D}${systemd_unitdir}/journald.conf.d/01-openstlinux.conf
 }
-FILES_${PN} += " ${sysconfdir}/systemd/coredump.conf.d/ "
+FILES:${PN} += " ${sysconfdir}/systemd/coredump.conf.d/ "
diff --git a/recipes-core/systemd/systemd-mount-partitions.bb b/recipes-core/systemd/systemd-mount-partitions.bb
index 818dee0..713de53 100644
--- a/recipes-core/systemd/systemd-mount-partitions.bb
+++ b/recipes-core/systemd/systemd-mount-partitions.bb
@@ -5,7 +5,7 @@ SUMMARY = "Mount partitions"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
-RDEPENDS_${PN} += " util-linux "
+RDEPENDS:${PN} += " util-linux "
 
 MOUNT_BASENAME = "mount-partitions"
 
@@ -20,8 +20,8 @@ INITSCRIPT_NAME = "${MOUNT_BASENAME}.sh"
 INITSCRIPT_PARAMS = "start 22 5 3 ."
 
 SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}"
-SYSTEMD_SERVICE_${PN} = "${MOUNT_BASENAME}.service"
-SYSTEMD_AUTO_ENABLE_${PN} = "enable"
+SYSTEMD_SERVICE:${PN} = "${MOUNT_BASENAME}.service"
+SYSTEMD_AUTO_ENABLE:${PN} = "enable"
 
 # This list should be set with partition label and associated mountpoint
 # <partition_label1>,<partition_mountpoint1> <partition_label2>,<partition_mountpoint2>
@@ -77,4 +77,4 @@ do_install() {
     fi
 }
 
-FILES_${PN} += " ${systemd_unitdir} ${base_sbindir} ${INIT_D_DIR}"
+FILES:${PN} += " ${systemd_unitdir} ${base_sbindir} ${INIT_D_DIR}"
diff --git a/recipes-core/systemd/systemd-networkd-configuration.bb b/recipes-core/systemd/systemd-networkd-configuration.bb
index 098dd54..a20539a 100644
--- a/recipes-core/systemd/systemd-networkd-configuration.bb
+++ b/recipes-core/systemd/systemd-networkd-configuration.bb
@@ -1,7 +1,7 @@
 # Copyright (C) 2017, STMicroelectronics - All Rights Reserved
 # Released under the MIT license (see COPYING.MIT for the terms)
 
-DESCRIPTION = "Basic networkd configuration"
+SUMMARY = "Basic networkd configuration"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 DEPENDS = "systemd"
@@ -29,4 +29,4 @@ do_install() {
 
 }
 
-FILES_${PN} += "${systemd_unitdir}/network"
+FILES:${PN} += "${systemd_unitdir}/network"
diff --git a/recipes-core/systemd/systemd-serialgetty.bbappend b/recipes-core/systemd/systemd-serialgetty.bbappend
index 72d991c..4fc41d0 100644
--- a/recipes-core/systemd/systemd-serialgetty.bbappend
+++ b/recipes-core/systemd/systemd-serialgetty.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
diff --git a/recipes-devtool/apt/apt_%.bbappend b/recipes-devtool/apt/apt_%.bbappend
index 3c91ddf..4f8510f 100644
--- a/recipes-devtool/apt/apt_%.bbappend
+++ b/recipes-devtool/apt/apt_%.bbappend
@@ -1,2 +1,2 @@
-RDEPENDS_${PN} += " gnupg "
+RDEPENDS:${PN} += " gnupg "
 
diff --git a/recipes-extended/infos/infos-openstlinux.bb b/recipes-extended/infos/infos-openstlinux.bb
index dcfdcc8..b5832fe 100644
--- a/recipes-extended/infos/infos-openstlinux.bb
+++ b/recipes-extended/infos/infos-openstlinux.bb
@@ -1,7 +1,7 @@
 SUMMARY = "Information for support"
 
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+LICENSE = "GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-or-later;md5=fed54355545ffd980b814dab4a3b312c"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -18,5 +18,5 @@ do_install() {
 # Make sure to update package as soon as EULA is accepted or not
 do_install[vardeps] += "${@d.getVar('ACCEPT_EULA_'+d.getVar('MACHINE'))}"
 
-FILES_${PN} = "${sysconfdir}/st-info.d"
-ALLOW_EMPTY_${PN} = "1"
+FILES:${PN} = "${sysconfdir}/st-info.d"
+ALLOW_EMPTY:${PN} = "1"
diff --git a/recipes-extended/stm32-ddr-tools/stm32-ddr-tools_1.0.bb b/recipes-extended/stm32-ddr-tools/stm32-ddr-tools_1.0.bb
index b2d7ceb..6315735 100644
--- a/recipes-extended/stm32-ddr-tools/stm32-ddr-tools_1.0.bb
+++ b/recipes-extended/stm32-ddr-tools/stm32-ddr-tools_1.0.bb
@@ -2,7 +2,7 @@ SUMMARY = "STM32 tool to convert the 'perf' tool counters into understandable MB
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
-RDEPENDS_${PN} += " python3-core "
+RDEPENDS:${PN} += " python3-core "
 
 SRC_URI += " \
     file://stm32_ddr_pmu.py \
@@ -13,4 +13,4 @@ do_install() {
        install -m 0755 ${WORKDIR}/stm32_ddr_pmu.py ${D}/${bindir}
 }
 
-FILES_${PN} = "${bindir}/stm32_ddr_pmu.py"
+FILES:${PN} = "${bindir}/stm32_ddr_pmu.py"
diff --git a/recipes-graphics/cairo/cairo_%.bbappend b/recipes-graphics/cairo/cairo_%.bbappend
index e71c919..00de08a 100644
--- a/recipes-graphics/cairo/cairo_%.bbappend
+++ b/recipes-graphics/cairo/cairo_%.bbappend
@@ -2,7 +2,7 @@ PACKAGECONFIG = " ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '',
     ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'egl glesv2', '', d)} \
     "
 
-do_install_append() {
+do_install:append() {
     install -d ${D}${bindir}/
     install -m 0755 ${B}/util/cairo-trace/cairo-trace ${D}${bindir}/
 }
diff --git a/recipes-graphics/lxdm/lxdm_0.5.3.bbappend b/recipes-graphics/lxdm/lxdm_0.5.3.bbappend
index 39dfebd..db37c86 100644
--- a/recipes-graphics/lxdm/lxdm_0.5.3.bbappend
+++ b/recipes-graphics/lxdm/lxdm_0.5.3.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 SRC_URI =+ " \
     file://0001-stop-splash-screen.patch \
diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend
index 72d991c..4fc41d0 100644
--- a/recipes-graphics/mesa/mesa_%.bbappend
+++ b/recipes-graphics/mesa/mesa_%.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
diff --git a/recipes-graphics/wayland/weston-init.bbappend b/recipes-graphics/wayland/weston-init.bbappend
index fc2ef2a..c5f63f5 100644
--- a/recipes-graphics/wayland/weston-init.bbappend
+++ b/recipes-graphics/wayland/weston-init.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += " \
             file://weston.ini \
@@ -21,9 +21,9 @@ FILES_${PN} += " ${datadir}/weston \
          /home/root \
          "
 
-CONFFILES_${PN} += "${sysconfdir}/xdg/weston/weston.ini"
+CONFFILES:${PN} += "${sysconfdir}/xdg/weston/weston.ini"
 
-do_install_append() {
+do_install:append() {
     install -d ${D}${sysconfdir}/xdg/weston/
     install -d ${D}${datadir}/weston/backgrounds
     install -d ${D}${datadir}/weston/icon
diff --git a/recipes-kernel/usbip/usbip.bb b/recipes-kernel/usbip/usbip.bb
index bbad9b2..db7c337 100644
--- a/recipes-kernel/usbip/usbip.bb
+++ b/recipes-kernel/usbip/usbip.bb
@@ -2,8 +2,8 @@ SUMMARY = "USB ip tools"
 DESCRIPTION = "USB ip tools from linux kernel"
 HOMEPAGE = "https://www.kernel.org"
 
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
 
 PV = "2.0"
 PR = "r1"
@@ -35,33 +35,19 @@ S = "${WORKDIR}/tools/usb/usbip"
 
 inherit autotools gettext pkgconfig systemd
 
-SYSTEMD_SERVICE_${PN} = "usbip.service"
-SYSTEMD_AUTO_ENABLE_${PN} = "disable"
+SYSTEMD_SERVICE:${PN} = "usbip.service"
+SYSTEMD_AUTO_ENABLE:${PN} = "disable"
 
 EXTRA_OECONF += "--with-tcp-wrappers"
 
-do_configure[prefuncs] += "copy_usbip_source_from_kernel"
 do_configure[prefuncs] += "base_do_unpack"
 
-python copy_usbip_source_from_kernel() {
-    sources = (d.getVar("USBIP_SRC") or "").split()
-    src_dir = d.getVar("STAGING_KERNEL_DIR")
-    dest_dir = d.getVar("WORKDIR")
-    bb.utils.mkdirhier(dest_dir)
-    for s in sources:
-        src = oe.path.join(src_dir, s)
-        dest = oe.path.join(dest_dir, s)
-        if not os.path.exists(src):
-            bb.fatal("Path does not exist: %s. Maybe USBIP_SRC does not match the kernel version." % src)
-        if os.path.isdir(src):
-            oe.path.copyhardlinktree(src, dest)
-        else:
-            src_path = os.path.dirname(s)
-            os.makedirs(os.path.join(dest_dir,src_path),exist_ok=True)
-            bb.utils.copyfile(src, dest)
+do_configure:prepend() {
+    # copy source source from kernel to workdir
+    mkdir -p ${WORKDIR}/${USBIP_SRC}
+    tar --xattrs --xattrs-include='*' -cf - -S -C ${STAGING_KERNEL_DIR}/${USBIP_SRC} -p . | tar --xattrs --xattrs-include='*' -xf - -C ${WORKDIR}/${USBIP_SRC}
 }
-
-do_install_append() {
+do_install:append() {
     install -d ${D}${datadir}/hwdata/
     install -m 0644 ${WORKDIR}/usb.ids ${D}${datadir}/hwdata/
 
@@ -77,4 +63,4 @@ do_install_append() {
     install -d ${D}${systemd_system_unitdir}/
     install -m 0644 ${WORKDIR}/usbip.service ${D}${systemd_system_unitdir}/
 }
-FILES_${PN} += "${datadir}/hwdata/ ${sbindir} ${sysconfdir}/udev/rules.d/ ${systemd_system_unitdir}/ ${sysconfdir}/modprobe.d/"
+FILES:${PN} += "${datadir}/hwdata/ ${sbindir} ${sysconfdir}/udev/rules.d/ ${systemd_system_unitdir}/ ${sysconfdir}/modprobe.d/"
diff --git a/recipes-qt/multimedia/gstreamer1.0-plugins-good_%.bbappend b/recipes-qt/multimedia/gstreamer1.0-plugins-good_%.bbappend
index 3a6a6c3..2593d41 100644
--- a/recipes-qt/multimedia/gstreamer1.0-plugins-good_%.bbappend
+++ b/recipes-qt/multimedia/gstreamer1.0-plugins-good_%.bbappend
@@ -1 +1 @@
-PACKAGECONFIG_remove = " qt5"
+PACKAGECONFIG:remove = " qt5"
diff --git a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bbappend b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bbappend
index ec1d8a7..8c6cb49 100644
--- a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bbappend
+++ b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bbappend
@@ -1,4 +1,4 @@
-RDEPENDS_${PN}_remove += "\
+RDEPENDS:${PN}:remove = " \
    qtenginio-dev \
    qtenginio-mkspecs \
    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtenginio-qmlplugins', '', d)} \
diff --git a/recipes-qt/qt5/openstlinux-qt-eglfs.bb b/recipes-qt/qt5/openstlinux-qt-eglfs.bb
index 6c78043..8f2cc23 100644
--- a/recipes-qt/qt5/openstlinux-qt-eglfs.bb
+++ b/recipes-qt/qt5/openstlinux-qt-eglfs.bb
@@ -1,5 +1,5 @@
 # Copyright (C) 2018, STMicroelectronics - All Rights Reserved
-DESCRIPTION = "add script and material to help with eglfs qt configuration"
+SUMMARY = "add script and material to help with eglfs qt configuration"
 HOMEPAGE = "www.st.com"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
@@ -21,5 +21,5 @@ do_install() {
     install -m 0755 ${WORKDIR}/qt-eglfs.sh ${D}/${sysconfdir}/profile.d/
     install -m 0664 ${WORKDIR}/cursor.json ${D}${datadir}/qt5/
 }
-RDEPENDS_${PN} = "qtbase"
-FILES_${PN} += "${datadir}/qt5"
+RDEPENDS:${PN} = "qtbase"
+FILES:${PN} += "${datadir}/qt5"
diff --git a/recipes-qt/qt5/openstlinux-qt-wayland.bb b/recipes-qt/qt5/openstlinux-qt-wayland.bb
index 9d79e32..b1f6a52 100644
--- a/recipes-qt/qt5/openstlinux-qt-wayland.bb
+++ b/recipes-qt/qt5/openstlinux-qt-wayland.bb
@@ -1,5 +1,5 @@
 # Copyright (C) 2020, STMicroelectronics - All Rights Reserved
-DESCRIPTION = "add script and material to help with qt-wayland configuration"
+SUMMARY = "add script and material to help with qt-wayland configuration"
 HOMEPAGE = "www.st.com"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
@@ -18,5 +18,5 @@ do_install() {
 
     install -m 0755 ${WORKDIR}/qt-wayland.sh ${D}/${sysconfdir}/profile.d/
 }
-RDEPENDS_${PN} = "qtwayland"
-FILES_${PN} += "${datadir}/qt5"
+RDEPENDS:${PN} = "qtwayland"
+FILES:${PN} += "${datadir}/qt5"
diff --git a/recipes-qt/qt5/qtbase-native_git.bbappend b/recipes-qt/qt5/qtbase-native_git.bbappend
index 0b065d4..5638733 100644
--- a/recipes-qt/qt5/qtbase-native_git.bbappend
+++ b/recipes-qt/qt5/qtbase-native_git.bbappend
@@ -1,3 +1,3 @@
 # we may encouter some undefined references with the linux kernel statx function
 # depending on the ACI machines / Yocto cache / zoostrap versions
-QT_CONFIG_FLAGS += "-no-feature-statx"
+QT_CONFIG_FLAGS += "-no-feature-statx -linuxfb"
diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend
index 3face4d..24a1f2d 100644
--- a/recipes-qt/qt5/qtbase_git.bbappend
+++ b/recipes-qt/qt5/qtbase_git.bbappend
@@ -1,6 +1,6 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 PACKAGECONFIG_GL = " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2', '', d)} "
-PACKAGECONFIG_append = " eglfs examples accessibility "
+PACKAGECONFIG:append = " eglfs examples accessibility "
 QT_CONFIG_FLAGS += " -no-sse2 -no-opengles3"
 
diff --git a/recipes-samples/ai-nn-application/ai-hand-char-reco-launcher.bb b/recipes-samples/ai-nn-application/ai-hand-char-reco-launcher.bb
index b5735da..1b3f9ce 100644
--- a/recipes-samples/ai-nn-application/ai-hand-char-reco-launcher.bb
+++ b/recipes-samples/ai-nn-application/ai-hand-char-reco-launcher.bb
@@ -1,10 +1,10 @@
-DESCRIPTION = "Hand writing character recognition launcher based on HCR Neural Network"
+SUMMARY = "Hand writing character recognition launcher based on HCR Neural Network"
 
-LICENSE = "GPLv2 & BSD-3-Clause"
+LICENSE = "GPL-2.0-only & BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
 DEPENDS = "gtk+3 gstreamer1.0-plugins-base demo-launcher"
-DEPENDS_append_stm32mpcommon += " m4projects-stm32mp1 "
+DEPENDS:append:stm32mpcommon = " m4projects-stm32mp1 "
 
 inherit pkgconfig
 
@@ -48,6 +48,6 @@ do_install() {
     install -m 0644 -D ${WORKDIR}/demo/application/*.yaml ${D}${prefix}/local/demo/application/
 }
 
-FILES_${PN} += "${prefix}/local/demo/"
-RDEPENDS_${PN} += "gtk+3 gstreamer1.0-plugins-base demo-launcher"
-RDEPENDS_${PN}_append_stm32mpcommon += " m4projects-stm32mp1-userfs "
+FILES:${PN} += "${prefix}/local/demo/"
+RDEPENDS:${PN} += "gtk+3 gstreamer1.0-plugins-base demo-launcher"
+RDEPENDS:${PN}:append:stm32mpcommon = " m4projects-stm32mp1-userfs "
diff --git a/recipes-samples/demo-application/demo-application-3d-cube.bb b/recipes-samples/demo-application/demo-application-3d-cube.bb
index f0bb71e..6138db6 100644
--- a/recipes-samples/demo-application/demo-application-3d-cube.bb
+++ b/recipes-samples/demo-application/demo-application-3d-cube.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Add support of 3d Cube application on Demo Launcher"
+SUMMARY = "Add support of 3d Cube application on Demo Launcher"
 HOMEPAGE = "wiki.st.com"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9"
@@ -50,13 +50,13 @@ do_install() {
 }
 
 PACKAGES += "${PN}-extra"
-FILES_${PN} = " \
+FILES:${PN} = " \
     ${prefix}/local/demo/application/3d-cube \
     ${prefix}/local/demo/application/040-3d_cube.yaml \
     "
-RDEPENDS_${PN} = "weston-cube demo-launcher"
+RDEPENDS:${PN} = "weston-cube demo-launcher"
 
-FILES_${PN}-extra = " \
+FILES:${PN}-extra = " \
     ${prefix}/local/demo/application/3d-cube-extra \
     ${prefix}/local/demo/application/100-3d-cube.yaml \
     ${prefix}/local/demo/application/101-3d-cube-shader.yaml \
@@ -67,4 +67,4 @@ FILES_${PN}-extra = " \
     ${prefix}/local/demo/application/116-3d_cube_camera_shader.yaml \
     ${prefix}/local/demo/application/120-3d-cube-pictures-shader.yaml \
     "
-RDEPENDS_${PN}-extra = "${PN} weston-cube demo-launcher"
+RDEPENDS:${PN}-extra = "${PN} weston-cube demo-launcher"
diff --git a/recipes-samples/demo-application/demo-application-bluetooth.bb b/recipes-samples/demo-application/demo-application-bluetooth.bb
index 3500238..669d2f2 100644
--- a/recipes-samples/demo-application/demo-application-bluetooth.bb
+++ b/recipes-samples/demo-application/demo-application-bluetooth.bb
@@ -29,5 +29,5 @@ do_install() {
     # python script
     install -m 0755 ${WORKDIR}/*.py ${D}${prefix}/local/demo/application/bluetooth/
 }
-RDEPENDS_${PN} += "python3-core python3-pexpect python3-pickle python3-pygobject gtk+3 demo-launcher"
-FILES_${PN} += "${prefix}/local/demo/application/"
+RDEPENDS:${PN} += "python3-core python3-pexpect python3-pickle python3-pygobject gtk+3 demo-launcher"
+FILES:${PN} += "${prefix}/local/demo/application/"
diff --git a/recipes-samples/demo-application/demo-application-camera.bb b/recipes-samples/demo-application/demo-application-camera.bb
index e1cd2ce..06dd153 100644
--- a/recipes-samples/demo-application/demo-application-camera.bb
+++ b/recipes-samples/demo-application/demo-application-camera.bb
@@ -33,5 +33,5 @@ do_install() {
     install -m 0644 ${WORKDIR}/*.fs ${D}${prefix}/local/demo/application/camera/shaders
 }
 
-FILES_${PN} += "${prefix}/local/demo/application/"
-RDEPENDS_${PN} += "event-gtk-player demo-launcher"
+FILES:${PN} += "${prefix}/local/demo/application/"
+RDEPENDS:${PN} += "event-gtk-player demo-launcher"
diff --git a/recipes-samples/demo-application/demo-application-netdata-hotspot.bb b/recipes-samples/demo-application/demo-application-netdata-hotspot.bb
index 944d60a..13d9402 100644
--- a/recipes-samples/demo-application/demo-application-netdata-hotspot.bb
+++ b/recipes-samples/demo-application/demo-application-netdata-hotspot.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Add support of netdata/hotspot wifi on Demo Launcher"
+SUMMARY = "Add support of netdata/hotspot wifi on Demo Launcher"
 HOMEPAGE = "wiki.st.com"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9"
@@ -36,5 +36,5 @@ do_install() {
     install -d ${D}${sysconfdir}/default
     install -m 0644 ${WORKDIR}/hostapd ${D}${sysconfdir}/default
 }
-RDEPENDS_${PN} += "python3-core python3-pygobject gtk+3 python3-threading demo-launcher demo-hotspot-wifi qrenc"
-FILES_${PN} += "${sysconfdir}/default ${prefix}/local/demo/application/"
+RDEPENDS:${PN} += "python3-core python3-pygobject gtk+3 python3-threading demo-launcher demo-hotspot-wifi qrenc"
+FILES:${PN} += "${sysconfdir}/default ${prefix}/local/demo/application/"
diff --git a/recipes-samples/demo-application/demo-application-video.bb b/recipes-samples/demo-application/demo-application-video.bb
index 39f9e95..a4adc0b 100644
--- a/recipes-samples/demo-application/demo-application-video.bb
+++ b/recipes-samples/demo-application/demo-application-video.bb
@@ -32,5 +32,5 @@ do_install() {
     install -m 0644 ${WORKDIR}/ST2297_visionv3.webm ${D}${prefix}/local/demo/media
 }
 
-FILES_${PN} += "${prefix}/local/demo/application/ ${prefix}/local/demo/media"
-RDEPENDS_${PN} += "demo-launcher event-gtk-player"
+FILES:${PN} += "${prefix}/local/demo/application/ ${prefix}/local/demo/media"
+RDEPENDS:${PN} += "demo-launcher event-gtk-player"
diff --git a/recipes-samples/demo/demo-launcher.bb b/recipes-samples/demo/demo-launcher.bb
index b351805..67002f9 100644
--- a/recipes-samples/demo/demo-launcher.bb
+++ b/recipes-samples/demo/demo-launcher.bb
@@ -44,8 +44,8 @@ do_install() {
     install -m 0755 ${WORKDIR}/start_up_demo_launcher.sh ${D}${prefix}/local/weston-start-at-startup/
 }
 
-FILES_${PN} += "${prefix}/local/demo/ ${prefix}/local/weston-start-at-startup/"
+FILES:${PN} += "${prefix}/local/demo/ ${prefix}/local/weston-start-at-startup/"
 
-RDEPENDS_${PN} += "python3-pygobject gtk+3 python3-resource python3-threading"
+RDEPENDS:${PN} += "python3-pygobject gtk+3 python3-resource python3-threading"
 #since zeus
-RDEPENDS_${PN} += " python3-core "
+RDEPENDS:${PN} += " python3-core "
diff --git a/recipes-samples/demo/qrenc.bb b/recipes-samples/demo/qrenc.bb
index e8dc57d..8b55f8e 100644
--- a/recipes-samples/demo/qrenc.bb
+++ b/recipes-samples/demo/qrenc.bb
@@ -1,7 +1,7 @@
 SUMMARY = "qrenc which uses libqrencode to generate QR-code"
 
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780"
+LICENSE = "LGPL-2.1-only"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/LGPL-2.1-only;md5=1a6d268fd218675ffea8be556788b780"
 
 DEPENDS += "qrencode"
 DEPENDS += "libpng"
@@ -19,6 +19,6 @@ do_install() {
     install -m 0755 ${B}/qrencode  ${D}${prefix}/bin/
 }
 
-FILES_${PN} += "${prefix}/bin/"
+FILES:${PN} += "${prefix}/bin/"
 
-RDEPENDS_${PN} += "qrencode libpng"
+RDEPENDS:${PN} += "qrencode libpng"
diff --git a/recipes-samples/demo/sensors-iks01a2.bb b/recipes-samples/demo/sensors-iks01a2.bb
index 14ca6ff..def1fa2 100644
--- a/recipes-samples/demo/sensors-iks01a2.bb
+++ b/recipes-samples/demo/sensors-iks01a2.bb
@@ -1,6 +1,6 @@
 # Copyright (C) 2018, STMicroelectronics - All Rights Reserved
 
-DESCRIPTION = "Python script which monitor temperature from sensor on Nucleo extension board iks01a2a"
+SUMMARY = "Python script which monitor temperature from sensor on Nucleo extension board iks01a2a"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://${OPENSTLINUX_BASE}/files/licenses/ST-Proprietary;md5=7cb1e55a9556c7dd1a3cae09db9cc85f"
 
@@ -25,5 +25,5 @@ do_install() {
     install -m 0644 ${WORKDIR}/README.txt ${D}${prefix}/local/demo/README_sensor_iks01a2.txt
 }
 
-FILES_${PN} += "${datadir}/sensors_temperature/"
-RDEPENDS_${PN} += "python3 python3-pygobject python3-pycairo gtk+3 "
+FILES:${PN} += "${datadir}/sensors_temperature/"
+RDEPENDS:${PN} += "python3 python3-pygobject python3-pycairo gtk+3 "
diff --git a/recipes-samples/event-gtk-player/event-gtk-player_git.bb b/recipes-samples/event-gtk-player/event-gtk-player_git.bb
index f093b5c..f830bc9 100644
--- a/recipes-samples/event-gtk-player/event-gtk-player_git.bb
+++ b/recipes-samples/event-gtk-player/event-gtk-player_git.bb
@@ -1,5 +1,5 @@
-SUMMARY= "GTK player with touch screen management"
-LICENSE = "GPL-2.0+"
+SUMMARY = "GTK player with touch screen management"
+LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=801f80980d171dd6425610833a22dbe6"
 
 SRC_URI = "git://github.com/STMicroelectronics/st-openstlinux-application.git;protocol=https;branch=master"
@@ -18,5 +18,5 @@ do_install () {
 	install -d ${D}${prefix}/local/demo/bin
 	install -m 0755 ${B}/touch-event-gtk-player ${D}${prefix}/local/demo/bin/
 }
-FILES_${PN} += "${prefix}/local/demo/bin"
+FILES:${PN} += "${prefix}/local/demo/bin"
 
diff --git a/recipes-samples/hotspot-wifi/demo-hotspot-wifi.bb b/recipes-samples/hotspot-wifi/demo-hotspot-wifi.bb
index be72288..9860f44 100644
--- a/recipes-samples/hotspot-wifi/demo-hotspot-wifi.bb
+++ b/recipes-samples/hotspot-wifi/demo-hotspot-wifi.bb
@@ -1,5 +1,5 @@
 # Copyright (C) 2018, STMicroelectronics - All Rights Reserved
-DESCRIPTION = "Shell script to enable/disable hotsopt wifi configuration"
+SUMMARY = "Shell script to enable/disable hotsopt wifi configuration"
 HOMEPAGE = "www.st.com"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
@@ -12,4 +12,4 @@ do_install() {
     install -m 755 ${WORKDIR}/st-hotspot-wifi-service.sh ${D}${prefix}/local/demo/bin
 }
 
-FILES_${PN} += "${prefix}/local/demo/bin"
+FILES:${PN} += "${prefix}/local/demo/bin"
diff --git a/recipes-samples/images/st-example-image-qtwayland.bb b/recipes-samples/images/st-example-image-qtwayland.bb
index 1077b69..02addcf 100644
--- a/recipes-samples/images/st-example-image-qtwayland.bb
+++ b/recipes-samples/images/st-example-image-qtwayland.bb
@@ -50,7 +50,7 @@ CORE_IMAGE_EXTRA_INSTALL += " \
     packagegroup-framework-sample-qt-examples   \
     "
 
-# IMAGE_INSTALL_append += "qtbase qtwayland qtbase-plugins qtwayland-plugins"
+# IMAGE_INSTALL:append = " qtbase qtwayland qtbase-plugins qtwayland-plugins "
 
 # NOTE:
 #   packagegroup-st-demo are installed on rootfs to populate the package
diff --git a/recipes-samples/packagegroups/packagegroup-framework-sample-qt-eglfs.bb b/recipes-samples/packagegroups/packagegroup-framework-sample-qt-eglfs.bb
index 63783e2..4b11e09 100644
--- a/recipes-samples/packagegroups/packagegroup-framework-sample-qt-eglfs.bb
+++ b/recipes-samples/packagegroups/packagegroup-framework-sample-qt-eglfs.bb
@@ -4,7 +4,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ad
 
 inherit packagegroup features_check
 
-RDEPENDS_${PN} = "\
+CONFLICT_DISTRO_FEATURES = "x11 wayland"
+
+RDEPENDS:${PN} = "\
     packagegroup-framework-sample-qt    \
     \
     openstlinux-qt-eglfs                \
diff --git a/recipes-samples/packagegroups/packagegroup-framework-sample-qt-extra.bb b/recipes-samples/packagegroups/packagegroup-framework-sample-qt-extra.bb
index 740246a..f79c8a0 100644
--- a/recipes-samples/packagegroups/packagegroup-framework-sample-qt-extra.bb
+++ b/recipes-samples/packagegroups/packagegroup-framework-sample-qt-extra.bb
@@ -14,7 +14,7 @@ PACKAGES = "\
             packagegroup-framework-sample-qt-extra-examples \
             "
 
-RDEPENDS_packagegroup-framework-sample-qt-extra = "\
+RDEPENDS:packagegroup-framework-sample-qt-extra = "\
     \
     qt3d                        \
     qt3d-qmlplugins             \
@@ -44,8 +44,8 @@ RDEPENDS_packagegroup-framework-sample-qt-extra = "\
     qtlocation-qmlplugins       \
     "
 
-SUMMARY_packagegroup-framework-sample-qt-extra-examples = "Framework sample qt extra components for examples"
-RDEPENDS_packagegroup-framework-sample-qt-extra-examples = "\
+SUMMARY:packagegroup-framework-sample-qt-extra-examples = "Framework sample qt extra components for examples"
+RDEPENDS:packagegroup-framework-sample-qt-extra-examples = "\
     qt5nmapcarousedemo          \
     cinematicexperience         \
     qtsmarthome                 \
diff --git a/recipes-samples/packagegroups/packagegroup-framework-sample-qt.bb b/recipes-samples/packagegroups/packagegroup-framework-sample-qt.bb
index 1e04fcc..797d169 100644
--- a/recipes-samples/packagegroups/packagegroup-framework-sample-qt.bb
+++ b/recipes-samples/packagegroups/packagegroup-framework-sample-qt.bb
@@ -14,7 +14,7 @@ PACKAGES = "\
             packagegroup-framework-sample-qt-examples   \
             "
 
-RDEPENDS_packagegroup-framework-sample-qt = "\
+RDEPENDS:packagegroup-framework-sample-qt = "\
     qtbase                          \
     liberation-fonts                \
     qtbase-plugins                  \
@@ -33,7 +33,7 @@ RDEPENDS_packagegroup-framework-sample-qt = "\
     qtscript                        \
     "
 
-SUMMARY_packagegroup-framework-sample-qt-examples = "Framework sample qt components for examples"
-RDEPENDS_packagegroup-framework-sample-qt-examples = "\
+SUMMARY:packagegroup-framework-sample-qt-examples = "Framework sample qt components for examples"
+RDEPENDS:packagegroup-framework-sample-qt-examples = "\
     qtbase-examples         \
 "
diff --git a/recipes-samples/packagegroups/packagegroup-framework-sample-qtwayland.bb b/recipes-samples/packagegroups/packagegroup-framework-sample-qtwayland.bb
index b4c6723..61129a8 100644
--- a/recipes-samples/packagegroups/packagegroup-framework-sample-qtwayland.bb
+++ b/recipes-samples/packagegroups/packagegroup-framework-sample-qtwayland.bb
@@ -6,7 +6,7 @@ inherit packagegroup features_check
 
 REQUIRED_DISTRO_FEATURES = "wayland"
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     packagegroup-framework-sample-qt    \
     \
     qtwayland                           \
diff --git a/recipes-samples/weston-cube/weston-cube_git.bb b/recipes-samples/weston-cube/weston-cube_git.bb
index 590ea05..edaeaa6 100644
--- a/recipes-samples/weston-cube/weston-cube_git.bb
+++ b/recipes-samples/weston-cube/weston-cube_git.bb
@@ -1,12 +1,12 @@
-SUMMARY= "3D cube for wayland/weston windows"
+SUMMARY = "3D cube for wayland/weston windows"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=23e79a8a8bc2486f30a780e6f8de22c4"
 
 SRC_URI = "git://github.com/STMicroelectronics/st-openstlinux-application.git;protocol=https;branch=master"
 
 # Modify these as desired
-PV = "2.1+git${SRCPV}"
-SRCREV = "533a3673f879a47b71fb175280acce6eb22164c0"
+PV = "4.0+git${SRCPV}"
+SRCREV = "cd44839e95af8c1dc80bb16270bcc6e938545849"
 
 DEPENDS += "wayland wayland-native wayland-protocols libdrm pixman libpng libjpeg-turbo \
 	virtual/egl virtual/libgles2 gstreamer1.0 gstreamer1.0-plugins-base"
@@ -29,4 +29,4 @@ do_install () {
 	    patchelf --replace-needed libGLESv2.so libGLESv2.so.2 ${D}${prefix}/local/demo/bin/weston-st-egl-cube-tex
 	fi
 }
-FILES_${PN} += "${prefix}/local/demo/bin"
+FILES:${PN} += "${prefix}/local/demo/bin"
diff --git a/recipes-security/packagegroups/packagegroup-optee-core.bb b/recipes-security/packagegroups/packagegroup-optee-core.bb
index 4cc31d1..fb13b38 100644
--- a/recipes-security/packagegroups/packagegroup-optee-core.bb
+++ b/recipes-security/packagegroups/packagegroup-optee-core.bb
@@ -1,7 +1,7 @@
 SUMMARY = "OPTEE core packagegroup"
 DESCRIPTION = "Provide optee-client package"
-LICENSE = "LGPLv2+"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/LGPL-2.0;md5=9427b8ccf5cf3df47c29110424c9641a"
+LICENSE = "LGPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/LGPL-2.0-or-later;md5=6d2d9952d88b50a51a5c73dc431d06c7"
 
 PACKAGE_ARCH = "${TUNE_PKGARCH}"
 
diff --git a/recipes-security/packagegroups/packagegroup-optee-test.bb b/recipes-security/packagegroups/packagegroup-optee-test.bb
index 8945966..111f17c 100644
--- a/recipes-security/packagegroups/packagegroup-optee-test.bb
+++ b/recipes-security/packagegroups/packagegroup-optee-test.bb
@@ -1,7 +1,7 @@
 SUMMARY = "OPTEE test packagegroup"
 DESCRIPTION = "Provide optee test and ta-sdp packages"
-LICENSE = "LGPLv2+"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/LGPL-2.0;md5=9427b8ccf5cf3df47c29110424c9641a"
+LICENSE = "LGPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/LGPL-2.0-or-later;md5=6d2d9952d88b50a51a5c73dc431d06c7"
 
 PACKAGE_ARCH = "${TUNE_PKGARCH}"
 
@@ -11,6 +11,6 @@ PACKAGES = "packagegroup-optee-test"
 
 PROVIDES = "${PACKAGES}"
 
-RDEPENDS_packagegroup-optee-test = "\
+RDEPENDS:packagegroup-optee-test = "\
     optee-test \
 "
diff --git a/recipes-st/images/st-image-extended.bb b/recipes-st/images/st-image-extended.bb
new file mode 100644
index 0000000..b4ab0a6
--- /dev/null
+++ b/recipes-st/images/st-image-extended.bb
@@ -0,0 +1,38 @@
+# With this image, we want to generate additionnal packages that could be
+# used to populate a package repository server.
+# The default st-image-weston is "extended" with extra IMAGE_FEATURES, and is also
+# extended with as much as possible 'packagegroup-framework-*'.
+
+SUMMARY = "OpenSTLinux image based on ST weston image to generate all packages supported by ST."
+LICENSE = "Proprietary"
+
+include recipes-st/images/st-image-weston.bb
+
+# let's make sure we have a good image...
+REQUIRED_DISTRO_FEATURES = "wayland"
+
+# Define ROOTFS_MAXSIZE to unlimited size
+IMAGE_ROOTFS_MAXSIZE = ""
+IMAGE_FSTYPES = "tar"
+ENABLE_FLASHLAYOUT_CONFIG = "0"
+
+#
+# IMAGE_FEATURES addons
+#
+IMAGE_FEATURES:append = " \
+    tools-debug     \
+    nfs-server      \
+    "
+
+#
+# INSTALL addons (manage to add all available openstlinux packages)
+#
+CORE_IMAGE_EXTRA_INSTALL:append = " \
+    packagegroup-framework-tools-extra              \
+    \
+    packagegroup-framework-sample-qtwayland         \
+    packagegroup-framework-sample-qt-examples       \
+    packagegroup-framework-sample-qt-extra          \
+    packagegroup-framework-sample-qt-extra-examples \
+    "
+
diff --git a/recipes-st/images/st-image.inc b/recipes-st/images/st-image.inc
index b5498b5..495b2b5 100644
--- a/recipes-st/images/st-image.inc
+++ b/recipes-st/images/st-image.inc
@@ -16,7 +16,7 @@ image_copy_image_license() {
         bbwarn "Missing 'EULA_FILE_ST' var : no image license copied..."
     fi
 }
-IMAGE_POSTPROCESS_COMMAND_prepend = "image_copy_image_license;"
+IMAGE_POSTPROCESS_COMMAND:prepend = "image_copy_image_license;"
 
 sdk_copy_image_license() {
     mkdir -p ${SDKDEPLOYDIR}
@@ -26,7 +26,7 @@ sdk_copy_image_license() {
         bbwarn "Missing 'EULA_FILE_ST' var : no image license copied..."
     fi
 }
-SDK_POSTPROCESS_COMMAND_prepend = "sdk_copy_image_license;"
+SDK_POSTPROCESS_COMMAND:prepend = "sdk_copy_image_license;"
 
 LSB_RELASE_TIMESTAMP = "${DATE}-${TIME}"
 LSB_RELASE_TIMESTAMP[vardepsexclude] += "DATE"
@@ -38,4 +38,11 @@ update_lsbreleasedate() {
         sed -i 's/^DISTRIB_DESCRIPTION=\(.*\)-snapshot-.*\"/DISTRIB_DESCRIPTION=\1-snapshot-'"${LSB_RELASE_TIMESTAMP}"'\"/' ${IMAGE_ROOTFS}${sysconfdir}/lsb-release
     fi
 }
-ROOTFS_POSTPROCESS_COMMAND_append = "update_lsbreleasedate;"
+ROOTFS_POSTPROCESS_COMMAND:append = "update_lsbreleasedate;"
+
+zap_empty_weston_password () {
+    if [ -e ${IMAGE_ROOTFS}/etc/shadow ]; then
+        sed -i 's%^weston:!:%weston::%' ${IMAGE_ROOTFS}/etc/shadow
+    fi
+}
+ROOTFS_POSTPROCESS_COMMAND:append = "zap_empty_weston_password;"
diff --git a/recipes-st/initrd/initrd-boot.bb b/recipes-st/initrd/initrd-boot.bb
index 3676237..aa2da1a 100644
--- a/recipes-st/initrd/initrd-boot.bb
+++ b/recipes-st/initrd/initrd-boot.bb
@@ -12,4 +12,4 @@ do_install() {
 
 inherit allarch
 
-FILES_${PN} += "/init.d/"
+FILES:${PN} += "/init.d/"
diff --git a/recipes-st/initrd/st-initrd.bb b/recipes-st/initrd/st-initrd.bb
index 18a7327..91f502c 100644
--- a/recipes-st/initrd/st-initrd.bb
+++ b/recipes-st/initrd/st-initrd.bb
@@ -38,7 +38,7 @@ do_deploy() {
 }
 addtask deploy before do_build after do_compile
 
-FILES_${PN} += "/boot"
+FILES:${PN} += "/boot"
 
 # Provide empty package to allow direct use on image side even with none InitRD
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
diff --git a/recipes-st/packagegroups/packagegroup-framework-core-base.bb b/recipes-st/packagegroups/packagegroup-framework-core-base.bb
index cb4245f..067aae9 100644
--- a/recipes-st/packagegroups/packagegroup-framework-core-base.bb
+++ b/recipes-st/packagegroups/packagegroup-framework-core-base.bb
@@ -15,24 +15,24 @@ PACKAGES = "\
             "
 
 # Manage to provide all framework core base packages with overall one
-RDEPENDS_packagegroup-framework-core-base = "\
+RDEPENDS:packagegroup-framework-core-base = "\
     packagegroup-framework-core-base-display    \
     packagegroup-framework-core-base-mm         \
     packagegroup-framework-core-base-fs         \
     "
 
-SUMMARY_packagegroup-framework-core-base-display = "Framework core base components for display"
-RDEPENDS_packagegroup-framework-core-base-display = "\
+SUMMARY:packagegroup-framework-core-base-display = "Framework core base components for display"
+RDEPENDS:packagegroup-framework-core-base-display = "\
     libdrm          \
     libdrm-tests    \
     "
 
-SUMMARY_packagegroup-framework-core-base-mm = "Framework core base components for multimedia"
-RDEPENDS_packagegroup-framework-core-base-mm = "\
+SUMMARY:packagegroup-framework-core-base-mm = "Framework core base components for multimedia"
+RDEPENDS:packagegroup-framework-core-base-mm = "\
     "
 
-SUMMARY_packagegroup-framework-core-base-fs = "Framework core base components for filesystem"
-RDEPENDS_packagegroup-framework-core-base-fs = "\
+SUMMARY:packagegroup-framework-core-base-fs = "Framework core base components for filesystem"
+RDEPENDS:packagegroup-framework-core-base-fs = "\
     ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-mount-partitions', '', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'userfs-cleanup-package', '', d)} \
     "
diff --git a/recipes-st/packagegroups/packagegroup-framework-core-extra.bb b/recipes-st/packagegroups/packagegroup-framework-core-extra.bb
index 62ab2d0..2a98f6d 100644
--- a/recipes-st/packagegroups/packagegroup-framework-core-extra.bb
+++ b/recipes-st/packagegroups/packagegroup-framework-core-extra.bb
@@ -14,21 +14,22 @@ PACKAGES = "\
             "
 
 # Manage to provide all framework core extra packages with overall one
-RDEPENDS_packagegroup-framework-core-extra = "\
+RDEPENDS:packagegroup-framework-core-extra = "\
     packagegroup-framework-core-extra-display   \
     packagegroup-framework-core-extra-mm        \
 "
 
-SUMMARY_packagegroup-framework-core-extra-display = "Framework core extra components for display"
-RDEPENDS_packagegroup-framework-core-extra-display = "\
+SUMMARY:packagegroup-framework-core-extra-display = "Framework core extra components for display"
+RDEPENDS:packagegroup-framework-core-extra-display = "\
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'weston', '', d)}                        \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'weston-init', '', d)}                   \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'weston-examples', '', d)}               \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'tzdata', '', d)}                        \
     ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk+3', '', d)}       \
     ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk+3-demo', '', d)}  \
     \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'weston-xwayland', '', d)}       \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xserver-xorg-xwayland', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'libx11-locale', '', d)}         \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'libx11', '', d)}                \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'libxcb', '', d)}                \
@@ -42,11 +43,12 @@ RDEPENDS_packagegroup-framework-core-extra-display = "\
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xkbcomp', '', d)}               \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xorg-minimal-fonts', '', d)}    \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xterm', '', d)}                 \
+    \
+    ${@bb.utils.contains('MACHINE_FEATURES', 'opengl', 'kmscube', '', d)} \
     "
 
-SUMMARY_packagegroup-framework-core-extra-mm = "Framework core extra components for multimedia"
-RDEPENDS_packagegroup-framework-core-extra-mm = "\
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'kmscube', '', d)} \
+SUMMARY:packagegroup-framework-core-extra-mm = "Framework core extra components for multimedia"
+RDEPENDS:packagegroup-framework-core-extra-mm = "\
     qrencode    \
     qrenc       \
     "
diff --git a/recipes-st/packagegroups/packagegroup-framework-core.bb b/recipes-st/packagegroups/packagegroup-framework-core.bb
index 7b21638..145557e 100644
--- a/recipes-st/packagegroups/packagegroup-framework-core.bb
+++ b/recipes-st/packagegroups/packagegroup-framework-core.bb
@@ -14,19 +14,19 @@ PACKAGES = "\
             "
 
 # Manage to provide all framework core packages with overall one
-RDEPENDS_packagegroup-framework-core = "\
+RDEPENDS:packagegroup-framework-core = "\
     packagegroup-framework-core-display \
     packagegroup-framework-core-mm      \
     infos-openstlinux \
     "
 
-SUMMARY_packagegroup-framework-core-display = "Framework core components for display"
-RDEPENDS_packagegroup-framework-core-display = "\
+SUMMARY:packagegroup-framework-core-display = "Framework core components for display"
+RDEPENDS:packagegroup-framework-core-display = "\
     fb-test \
     "
 
-SUMMARY_packagegroup-framework-core-mm = "Framework core components for multimedia"
-RDEPENDS_packagegroup-framework-core-mm = "\
+SUMMARY:packagegroup-framework-core-mm = "Framework core components for multimedia"
+RDEPENDS:packagegroup-framework-core-mm = "\
     tiff        \
     libv4l      \
     rc-keymaps  \
diff --git a/recipes-st/packagegroups/packagegroup-framework-tools-base.bb b/recipes-st/packagegroups/packagegroup-framework-tools-base.bb
index def6591..ac8db40 100644
--- a/recipes-st/packagegroups/packagegroup-framework-tools-base.bb
+++ b/recipes-st/packagegroups/packagegroup-framework-tools-base.bb
@@ -18,7 +18,7 @@ PACKAGES = "\
             "
 
 # Manage to provide all framework tools base packages with overall one
-RDEPENDS_packagegroup-framework-tools-base = "\
+RDEPENDS:packagegroup-framework-tools-base = "\
     packagegroup-framework-tools-base-core      \
     packagegroup-framework-tools-base-kernel    \
     packagegroup-framework-tools-base-network   \
@@ -27,8 +27,8 @@ RDEPENDS_packagegroup-framework-tools-base = "\
     packagegroup-framework-tools-base-python3   \
     "
 
-SUMMARY_packagegroup-framework-tools-base-core = "Framework tools base components for core"
-RDEPENDS_packagegroup-framework-tools-base-core = "\
+SUMMARY:packagegroup-framework-tools-base-core = "Framework tools base components for core"
+RDEPENDS:packagegroup-framework-tools-base-core = "\
     ckermit         \
     coreutils       \
     libiio-iiod     \
@@ -36,11 +36,12 @@ RDEPENDS_packagegroup-framework-tools-base-core = "\
     lrzsz           \
     libgpiod        \
     libgpiod-tools  \
+    openssl-engines \
     ${@bb.utils.contains('DISTRO_FEATURES', 'usbgadget', 'usbotg-gadget-config', '', d)} \
     "
 
-SUMMARY_packagegroup-framework-tools-base-kernel = "Framework tools base components for kernel"
-RDEPENDS_packagegroup-framework-tools-base-kernel = "\
+SUMMARY:packagegroup-framework-tools-base-kernel = "Framework tools base components for kernel"
+RDEPENDS:packagegroup-framework-tools-base-kernel = "\
     can-utils       \
     i2c-tools       \
     strace          \
@@ -55,24 +56,24 @@ RDEPENDS_packagegroup-framework-tools-base-kernel = "\
     pciutils        \
     "
 
-SUMMARY_packagegroup-framework-tools-base-network = "Framework tools base components for network"
-RDEPENDS_packagegroup-framework-tools-base-network = "\
+SUMMARY:packagegroup-framework-tools-base-network = "Framework tools base components for network"
+RDEPENDS:packagegroup-framework-tools-base-network = "\
     ethtool         \
     iproute2        \
     curl            \
     "
 
-SUMMARY_packagegroup-framework-tools-base-audio = "Framework tools base components for audio"
-RDEPENDS_packagegroup-framework-tools-base-audio = "\
+SUMMARY:packagegroup-framework-tools-base-audio = "Framework tools base components for audio"
+RDEPENDS:packagegroup-framework-tools-base-audio = "\
     ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'libasound alsa-conf', '', d)}  \
     ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa-utils', '', d)}           \
     ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa-plugins', '', d)}         \
     "
 
-SUMMARY_packagegroup-framework-tools-base-ui = "Framework tools base components for ui"
-RDEPENDS_packagegroup-framework-tools-base-ui = "\
+SUMMARY:packagegroup-framework-tools-base-ui = "Framework tools base components for ui"
+RDEPENDS:packagegroup-framework-tools-base-ui = "\
     "
 
-SUMMARY_packagegroup-framework-tools-base-python3 = "Framework tools base components for python3"
-RDEPENDS_packagegroup-framework-tools-base-python3 = "\
+SUMMARY:packagegroup-framework-tools-base-python3 = "Framework tools base components for python3"
+RDEPENDS:packagegroup-framework-tools-base-python3 = "\
     "
diff --git a/recipes-st/packagegroups/packagegroup-framework-tools-extra.bb b/recipes-st/packagegroups/packagegroup-framework-tools-extra.bb
index b53831c..095d7a0 100644
--- a/recipes-st/packagegroups/packagegroup-framework-tools-extra.bb
+++ b/recipes-st/packagegroups/packagegroup-framework-tools-extra.bb
@@ -18,7 +18,7 @@ PACKAGES = "\
             "
 
 # Manage to provide all framework tools extra packages with overall one
-RDEPENDS_packagegroup-framework-tools-extra = "\
+RDEPENDS:packagegroup-framework-tools-extra = "\
     packagegroup-framework-tools-extra-core     \
     packagegroup-framework-tools-extra-kernel   \
     packagegroup-framework-tools-extra-network  \
@@ -27,8 +27,8 @@ RDEPENDS_packagegroup-framework-tools-extra = "\
     packagegroup-framework-tools-extra-python3  \
     "
 
-SUMMARY_packagegroup-framework-tools-extra-core = "Framework tools extra components for core"
-RDEPENDS_packagegroup-framework-tools-extra-core = "\
+SUMMARY:packagegroup-framework-tools-extra-core = "Framework tools extra components for core"
+RDEPENDS:packagegroup-framework-tools-extra-core = "\
     tslib-calibrate \
     pointercal      \
     \
@@ -38,8 +38,8 @@ RDEPENDS_packagegroup-framework-tools-extra-core = "\
     ltrace          \
     "
 
-SUMMARY_packagegroup-framework-tools-extra-kernel = "Framework tools extra components for kernel"
-RDEPENDS_packagegroup-framework-tools-extra-kernel = "\
+SUMMARY:packagegroup-framework-tools-extra-kernel = "Framework tools extra components for kernel"
+RDEPENDS:packagegroup-framework-tools-extra-kernel = "\
     powertop        \
     fio             \
     \
@@ -57,12 +57,15 @@ RDEPENDS_packagegroup-framework-tools-extra-kernel = "\
     dhrystone       \
     "
 
-RDEPENDS_packagegroup-framework-tools-extra-kernel_append_arm = "\
+RDEPENDS:packagegroup-framework-tools-extra-kernel:append:arm = "\
+    cpuburn-arm     \
+    "
+RDEPENDS:packagegroup-framework-tools-extra-kernel:append:aarch64 = "\
     cpuburn-arm     \
     "
 
-SUMMARY_packagegroup-framework-tools-extra-network = "Framework tools extra components for network"
-RDEPENDS_packagegroup-framework-tools-extra-network = "\
+SUMMARY:packagegroup-framework-tools-extra-network = "Framework tools extra components for network"
+RDEPENDS:packagegroup-framework-tools-extra-network = "\
     iperf3          \
     netperf         \
     bridge-utils    \
@@ -75,19 +78,19 @@ RDEPENDS_packagegroup-framework-tools-extra-network = "\
     neard           \
     "
 
-SUMMARY_packagegroup-framework-tools-extra-audio = "Framework tools extra components for audio"
-RDEPENDS_packagegroup-framework-tools-extra-audio = "\
+SUMMARY:packagegroup-framework-tools-extra-audio = "Framework tools extra components for audio"
+RDEPENDS:packagegroup-framework-tools-extra-audio = "\
     ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa-utils-aplay', '', d)} \
     "
 
-SUMMARY_packagegroup-framework-tools-extra-ui = "Framework tools extra components for ui"
-RDEPENDS_packagegroup-framework-tools-extra-ui = "\
+SUMMARY:packagegroup-framework-tools-extra-ui = "Framework tools extra components for ui"
+RDEPENDS:packagegroup-framework-tools-extra-ui = "\
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11perf', '', d)}       \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtkperf', '', d)}       \
     "
 
-SUMMARY_packagegroup-framework-tools-extra-python3 = "Framework tools extra components for python3"
-RDEPENDS_packagegroup-framework-tools-extra-python3 = "\
+SUMMARY:packagegroup-framework-tools-extra-python3 = "Framework tools extra components for python3"
+RDEPENDS:packagegroup-framework-tools-extra-python3 = "\
     python3-pip         \
     python3-pytest      \
     python3-lxml        \
diff --git a/recipes-st/packagegroups/packagegroup-framework-tools.bb b/recipes-st/packagegroups/packagegroup-framework-tools.bb
index ccd81d2..2987329 100644
--- a/recipes-st/packagegroups/packagegroup-framework-tools.bb
+++ b/recipes-st/packagegroups/packagegroup-framework-tools.bb
@@ -18,7 +18,7 @@ PACKAGES = "\
             "
 
 # Manage to provide all framework tools packages with overall one
-RDEPENDS_packagegroup-framework-tools = "\
+RDEPENDS:packagegroup-framework-tools = "\
     packagegroup-framework-tools-core       \
     packagegroup-framework-tools-kernel     \
     packagegroup-framework-tools-network    \
@@ -27,8 +27,8 @@ RDEPENDS_packagegroup-framework-tools = "\
     packagegroup-framework-tools-python3    \
     "
 
-SUMMARY_packagegroup-framework-tools-core = "Framework tools components for core"
-RDEPENDS_packagegroup-framework-tools-core = "\
+SUMMARY:packagegroup-framework-tools-core = "Framework tools components for core"
+RDEPENDS:packagegroup-framework-tools-core = "\
     grep            \
     util-linux      \
     util-linux-lscpu\
@@ -56,8 +56,8 @@ RDEPENDS_packagegroup-framework-tools-core = "\
     stm32-ddr-tools \
     "
 
-SUMMARY_packagegroup-framework-tools-kernel = "Framework tools components for kernel"
-RDEPENDS_packagegroup-framework-tools-kernel = "\
+SUMMARY:packagegroup-framework-tools-kernel = "Framework tools components for kernel"
+RDEPENDS:packagegroup-framework-tools-kernel = "\
     cpufrequtils    \
     sysfsutils      \
     dosfstools      \
@@ -67,8 +67,8 @@ RDEPENDS_packagegroup-framework-tools-kernel = "\
     sysprof         \
     "
 
-SUMMARY_packagegroup-framework-tools-network = "Framework tools components for network"
-RDEPENDS_packagegroup-framework-tools-network = "\
+SUMMARY:packagegroup-framework-tools-network = "Framework tools components for network"
+RDEPENDS:packagegroup-framework-tools-network = "\
     tcpdump         \
     packagegroup-core-full-cmdline-extended \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'iw', '', d)}                       \
@@ -76,14 +76,13 @@ RDEPENDS_packagegroup-framework-tools-network = "\
     ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'hostapd', '', d)}                  \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'wireless-regdb-static', '', d)}    \
     openssh-sftp    \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'dhcp-client', '', d)}                       \
     ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-networkd-configuration', '', d)}    \
     usbip uhubctl   \
     bridge-utils    \
     "
 
-SUMMARY_packagegroup-framework-tools-audio = "Framework tools components for audio"
-RDEPENDS_packagegroup-framework-tools-audio = "\
+SUMMARY:packagegroup-framework-tools-audio = "Framework tools components for audio"
+RDEPENDS:packagegroup-framework-tools-audio = "\
     ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}                     \
     ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio-server', '', d)}              \
     ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio-misc', '', d)}                \
@@ -94,16 +93,16 @@ RDEPENDS_packagegroup-framework-tools-audio = "\
     ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio bluetooth', 'pulseaudio-module-bluez5-discover', '', d)}    \
     "
 
-SUMMARY_packagegroup-framework-tools-ui = "Framework tools components for ui"
-RDEPENDS_packagegroup-framework-tools-ui = "\
+SUMMARY:packagegroup-framework-tools-ui = "Framework tools components for ui"
+RDEPENDS:packagegroup-framework-tools-ui = "\
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xvinfo', '', d)}    \
     ${@bb.utils.contains('DISTRO_FEATURES', 'gplv3', 'glmark2', '', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'gplv3', 'netdata', '', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'gplv3', 'lmsensors-libsensors lmsensors-sensors', '', d)} \
     "
 
-SUMMARY_packagegroup-framework-tools-python3 = "Framework tools components for python3"
-RDEPENDS_packagegroup-framework-tools-python3 = "\
+SUMMARY:packagegroup-framework-tools-python3 = "Framework tools components for python3"
+RDEPENDS:packagegroup-framework-tools-python3 = "\
     python3-datetime    \
     python3-dateutil    \
     python3-distutils   \
diff --git a/recipes-st/packagegroups/packagegroup-gstreamer1-0.bb b/recipes-st/packagegroups/packagegroup-gstreamer1-0.bb
index 90c4fdd..aa66fd7 100644
--- a/recipes-st/packagegroups/packagegroup-gstreamer1-0.bb
+++ b/recipes-st/packagegroups/packagegroup-gstreamer1-0.bb
@@ -1,6 +1,6 @@
-DESCRIPTION = "Gstreamer 1.0 components"
-LICENSE = "LGPLv2+"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/LGPL-2.0;md5=9427b8ccf5cf3df47c29110424c9641a"
+SUMMARY = "Gstreamer 1.0 components"
+LICENSE = "LGPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/LGPL-2.0-or-later;md5=6d2d9952d88b50a51a5c73dc431d06c7"
 
 PACKAGE_ARCH = "${TUNE_PKGARCH}"
 
@@ -11,7 +11,7 @@ PACKAGES = "\
     "
 
 PROVIDES = "${PACKAGES}"
-RDEPENDS_packagegroup-gstreamer1-0 = "\
+RDEPENDS:packagegroup-gstreamer1-0 = "\
     gstreamer1.0-plugins-base-meta \
     gstreamer1.0-plugins-base \
     gstreamer1.0-plugins-good-meta \
diff --git a/recipes-st/packagegroups/packagegroup-st-demo.bbappend b/recipes-st/packagegroups/packagegroup-st-demo.bbappend
index 6844133..665e3f9 100644
--- a/recipes-st/packagegroups/packagegroup-st-demo.bbappend
+++ b/recipes-st/packagegroups/packagegroup-st-demo.bbappend
@@ -1,4 +1,4 @@
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'demo-launcher', '', d)} \
     \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'demo-application-netdata-hotspot', '', d)} \
@@ -9,7 +9,7 @@ RDEPENDS_${PN} += "\
     "
 
 AI_DEMO_APPLICATION = "${@bb.utils.contains('MACHINE_FEATURES', 'm4copro', 'ai-hand-char-reco-launcher', '', d)} "
-RDEPENDS_${PN}_append_stm32mpcommon = " \
+RDEPENDS:${PN}:append:stm32mpcommon = " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '${AI_DEMO_APPLICATION}', '', d)} \
     "
 
diff --git a/recipes-support/ntp/ntp_%.bbappend b/recipes-support/ntp/ntp_%.bbappend
index 1823322..027718a 100644
--- a/recipes-support/ntp/ntp_%.bbappend
+++ b/recipes-support/ntp/ntp_%.bbappend
@@ -1,4 +1,4 @@
 
-SYSTEMD_AUTO_ENABLE_ntp = "disable"
-SYSTEMD_AUTO_ENABLE_ntpdate = "disable"
-SYSTEMD_AUTO_ENABLE_sntp = "disable"
+SYSTEMD_AUTO_ENABLE:ntp = "disable"
+SYSTEMD_AUTO_ENABLE:ntpdate = "disable"
+SYSTEMD_AUTO_ENABLE:sntp = "disable"
diff --git a/recipes-support/userfs/userfs-cleanup-package.bb b/recipes-support/userfs/userfs-cleanup-package.bb
index faadeb0..ef8aeb4 100644
--- a/recipes-support/userfs/userfs-cleanup-package.bb
+++ b/recipes-support/userfs/userfs-cleanup-package.bb
@@ -1,12 +1,12 @@
 # Copyright (C) 2019, STMicroelectronics - All Rights Reserved
 # Released under the MIT license (see COPYING.MIT for the terms)
 
-DESCRIPTION = "Tools for cleaning apt databse"
+SUMMARY = "Tools for cleaning apt databse"
 SECTION = "devel"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9"
 
-RDEPENDS_${PN} += " apt "
+RDEPENDS:${PN} += " apt "
 
 SRC_URI = " file://userfs-cleanup-package.service  file://userfs-cleanup-package.sh"
 
@@ -17,8 +17,8 @@ inherit systemd update-rc.d
 ST_USERFS ?= "1"
 
 SYSTEMD_PACKAGES += "${PN}"
-SYSTEMD_SERVICE_${PN} = "userfs-cleanup-package.service"
-SYSTEMD_AUTO_ENABLE_${PN} = "${@bb.utils.contains('ST_USERFS', '1', 'enable', 'disable', d)}"
+SYSTEMD_SERVICE:${PN} = "userfs-cleanup-package.service"
+SYSTEMD_AUTO_ENABLE:${PN} = "${@bb.utils.contains('ST_USERFS', '1', 'enable', 'disable', d)}"
 
 do_install() {
     install -d ${D}${systemd_unitdir}/system ${D}${base_sbindir}
diff --git a/recipes-support/zbar/python3-pyzbar_0.1.8.bb b/recipes-support/zbar/python3-pyzbar_0.1.8.bb
index 9806d2e..776bc8d 100644
--- a/recipes-support/zbar/python3-pyzbar_0.1.8.bb
+++ b/recipes-support/zbar/python3-pyzbar_0.1.8.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Read one-dimensional barcodes and QR codes from Python 2 and 3 using the zbar library"
+SUMMARY = "Read one-dimensional barcodes and QR codes from Python 2 and 3 using the zbar library"
 HOMEPAGE = "https://github.com/NaturalHistoryMuseum/pyzbar"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c27c2135d76d2d03f4842d9c133f1ed4"
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c27c2135d76d2d03f4842d9c133f1ed4"
 SECTION = "devel/python"
 DEPENDS = "python3-pillow zbar-openstlinux"
 
-SRC_URI = "git://github.com/NaturalHistoryMuseum/pyzbar.git;protocol=https"
+SRC_URI = "git://github.com/NaturalHistoryMuseum/pyzbar.git;protocol=https;branch=master"
 SRCREV = "b6853df71aee4b38a9986af8565603a0115e81b7"
 S = "${WORKDIR}/git"
 
diff --git a/recipes-support/zbar/zbar-openstlinux_git.bb b/recipes-support/zbar/zbar-openstlinux_git.bb
index 09892ee..1ea64f7 100644
--- a/recipes-support/zbar/zbar-openstlinux_git.bb
+++ b/recipes-support/zbar/zbar-openstlinux_git.bb
@@ -1,6 +1,6 @@
-DESRIPTION = "2D barcode scanner toolkit."
+SUMMARY = "2D barcode scanner toolkit."
 SECTION = "graphics"
-LICENSE = "LGPL-2.1"
+LICENSE = "LGPL-2.1-only"
 
 DEPENDS = "pkgconfig intltool-native libpng jpeg"
 DEPENDS += "xmlto-native"
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4015840237ca7f0175cd626f78714ca8"
 PV = "0.10+git${SRCPV}"
 
 SRCREV = "67003d2a985b5f9627bee2d8e3e0b26d0c474b57"
-SRC_URI = "git://github.com/ZBar/Zbar \
+SRC_URI = "git://github.com/ZBar/Zbar;branch=master;protocol=https \
            file://0001-make-relies-GNU-extentions.patch \
            file://0002-support-of-ImageMagick-7.patch \
 "
@@ -41,7 +41,9 @@ do_install() {
 
     # install library
     install -m 0755 ${B}/zbar/.libs/libzbar.so.0.2.0 ${D}${libdir}
-    ln -s ${libdir}/libzbar.so.0.2.0 ${D}${libdir}/libzbar.so.0
+    cd ${D}${libdir}
+    ln -s libzbar.so.0.2.0 libzbar.so.0
+    ln -s libzbar.so.0.2.0 libzbar.so
 
     # install zbarcam
     install -m 0755 ${B}/zbarcam/.libs/zbarcam ${D}${bindir}