diff --git a/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.6.bb b/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.6.bb
index dbcbc84..34fcdb8 100644
--- a/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.6.bb
+++ b/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.6.bb
@@ -17,7 +17,7 @@ SRC_URI += " \
      "
 
 TF_A_VERSION = "v2.6"
-TF_A_SUBVERSION = "stm32mp1"
+TF_A_SUBVERSION = "stm32mp"
 TF_A_RELEASE = "r1"
 PV = "${TF_A_VERSION}-${TF_A_SUBVERSION}-${TF_A_RELEASE}"
 
@@ -47,7 +47,7 @@ include ${@oe.utils.ifelse(d.getVar('ST_ARCHIVER_ENABLE') == '1', 'tf-a-stm32mp-
 BBCLASSEXTEND = "devupstream:target"
 
 SRC_URI:class-devupstream = "git://github.com/STMicroelectronics/arm-trusted-firmware.git;protocol=https;branch=${ARCHIVER_ST_BRANCH}"
-SRCREV:class-devupstream = "3e1e3f0a6149d04946ff5debcd871173e782111c"
+SRCREV:class-devupstream = "c6da17964e4260944af2a703171a3c36b9e3edf8"
 
 # ---------------------------------
 # Configure default preference to manage dynamic selection between tarball and github
diff --git a/recipes-bsp/u-boot/u-boot-stm32mp-common_2021.10.inc b/recipes-bsp/u-boot/u-boot-stm32mp-common_2021.10.inc
index 7db3cdc..bc72597 100644
--- a/recipes-bsp/u-boot/u-boot-stm32mp-common_2021.10.inc
+++ b/recipes-bsp/u-boot/u-boot-stm32mp-common_2021.10.inc
@@ -29,7 +29,7 @@ SRC_URI += "\
 SRC_URI += "${@bb.utils.contains('ST_UBOOT_DEBUG_TRACE', '1', '', 'file://0098-silent_mode.patch', d)}"
 
 U_BOOT_VERSION = "v2021.10"
-U_BOOT_SUBVERSION = "stm32mp1"
+U_BOOT_SUBVERSION = "stm32mp"
 U_BOOT_RELEASE = "r1"
 
 PV = "${U_BOOT_VERSION}-${U_BOOT_SUBVERSION}-${U_BOOT_RELEASE}"
@@ -47,7 +47,7 @@ S = "${WORKDIR}/git"
 BBCLASSEXTEND = "devupstream:target"
 
 SRC_URI:class-devupstream = "git://github.com/STMicroelectronics/u-boot.git;protocol=https;branch=${ARCHIVER_ST_BRANCH}"
-SRCREV:class-devupstream = "6fde82adf71ebad4b16d99f76ed69abfd9cfaf42"
+SRCREV:class-devupstream = "ef9715e76295f5f6aae49efdb51617b440b54deb"
 
 # ---------------------------------
 # Configure default preference to manage dynamic selection between tarball and github
diff --git a/recipes-extended/linux-examples/linux-examples-stm32mp1.bb b/recipes-extended/linux-examples/linux-examples-stm32mp1.bb
index cfd91c6..4eff081 100644
--- a/recipes-extended/linux-examples/linux-examples-stm32mp1.bb
+++ b/recipes-extended/linux-examples/linux-examples-stm32mp1.bb
@@ -6,8 +6,8 @@ COMPATIBLE_MACHINE = "(stm32mpcommon)"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-SRC_URI = "git://gerrit.st.com:29418/mpu/oe/st/linux-examples;protocol=ssh;branch=master"
-SRCREV  = "377d3eb9f1afb938632129b6576d486b3ddbe324"
+SRC_URI = "git://github.com/STMicroelectronics/linux-examples;protocol=https;branch=master"
+SRCREV  = "8e1c0b246c3f34aad075a2a8c0807ef46288e4d8"
 
 PV = "5.4+${SRCPV}"
 
diff --git a/recipes-kernel/linux/linux-stm32mp_5.15.bb b/recipes-kernel/linux/linux-stm32mp_5.15.bb
index ced8a3c..f4fbd85 100644
--- a/recipes-kernel/linux/linux-stm32mp_5.15.bb
+++ b/recipes-kernel/linux/linux-stm32mp_5.15.bb
@@ -40,7 +40,7 @@ SRC_URI += " \
     file://${LINUX_VERSION}/${LINUX_VERSION}.${LINUX_SUBVERSION}/0022-ARM-5.15.24-stm32mp1-r1-CONFIG.patch \
     "
 
-LINUX_TARGET = "stm32mp1"
+LINUX_TARGET = "stm32mp"
 LINUX_RELEASE = "r1"
 
 PV = "${LINUX_VERSION}.${LINUX_SUBVERSION}-${LINUX_TARGET}-${LINUX_RELEASE}"
@@ -59,7 +59,7 @@ S = "${WORKDIR}/linux-${LINUX_VERSION}.${LINUX_SUBVERSION}"
 BBCLASSEXTEND = "devupstream:target"
 
 SRC_URI:class-devupstream = "git://github.com/STMicroelectronics/linux.git;protocol=https;branch=${ARCHIVER_ST_BRANCH}"
-SRCREV:class-devupstream = "64e6a220537c5cd7e8cc5b723ef09c6341388c98"
+SRCREV:class-devupstream = "0ea7234e7642a404115908c4688a050cb6cc2503"
 
 # ---------------------------------
 # Configure default preference to manage dynamic selection between tarball and github
diff --git a/recipes-security/optee/optee-os-stm32mp_3.16.0.bb b/recipes-security/optee/optee-os-stm32mp_3.16.0.bb
index 53cbbdb..4d36934 100644
--- a/recipes-security/optee/optee-os-stm32mp_3.16.0.bb
+++ b/recipes-security/optee/optee-os-stm32mp_3.16.0.bb
@@ -13,7 +13,7 @@ SRC_URI += " \
 SRC_URI[fonts.sha256sum] = "4941e8bb6d8ac377838e27b214bf43008c496a24a8f897e0b06433988cbd53b2"
 
 OPTEE_VERSION = "3.16.0"
-OPTEE_SUBVERSION = "stm32mp1"
+OPTEE_SUBVERSION = "stm32mp"
 OPTEE_RELEASE = "r1"
 
 PV = "${OPTEE_VERSION}-${OPTEE_SUBVERSION}-${OPTEE_RELEASE}"
@@ -49,7 +49,7 @@ include ${@oe.utils.ifelse(d.getVar('ST_ARCHIVER_ENABLE') == '1', 'optee-os-stm3
 BBCLASSEXTEND = "devupstream:target"
 
 SRC_URI:class-devupstream = "git://github.com/STMicroelectronics/optee_os.git;protocol=https;branch=${ARCHIVER_ST_BRANCH}"
-SRCREV:class-devupstream = "639a8566de8fa720d2cb7ab7231e8de105e7859d"
+SRCREV:class-devupstream = "4bbca1689f6854f660a80327a0d2959537bea222"
 
 # ---------------------------------
 # Configure default preference to manage dynamic selection between tarball and github