diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.8.bb b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.8.bb
index d83049b77..b604ec605 100644
--- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.8.bb
+++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.8.bb
@@ -12,7 +12,7 @@ TFA_URI_STASH = "${DIGI_MTK_GIT}/emp/arm-trusted-firmware.git;protocol=ssh"
 TFA_URI_GITHUB = "${DIGI_GITHUB_GIT}/arm-trusted-firmware.git;protocol=https"
 TFA_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${TFA_URI_STASH}', '${TFA_URI_GITHUB}', d)}"
 
-SRCBRANCH = "v2.8/stm32mp/master"
+SRCBRANCH = "v2.8/stm32mp/maint_ccmp2-beta"
 SRCREV = "${AUTOREV}"
 
 SRC_URI = " \
diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-tools_2.8.bb b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-tools_2.8.bb
index 27bff1dde..d6e1a3294 100644
--- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-tools_2.8.bb
+++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-tools_2.8.bb
@@ -9,7 +9,7 @@ TFA_URI_STASH = "${DIGI_MTK_GIT}/emp/arm-trusted-firmware.git;protocol=ssh"
 TFA_URI_GITHUB = "${DIGI_GITHUB_GIT}/arm-trusted-firmware.git;protocol=https"
 TFA_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${TFA_URI_STASH}', '${TFA_URI_GITHUB}', d)}"
 
-SRCBRANCH = "v2.8/stm32mp/master"
+SRCBRANCH = "v2.8/stm32mp/maint_ccmp2-beta"
 SRCREV = "${AUTOREV}"
 
 SRC_URI = " \
diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.19.0.bb b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.19.0.bb
index 2fe62ea76..4b91f0704 100644
--- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.19.0.bb
+++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.19.0.bb
@@ -7,7 +7,7 @@ OPTEE_URI_STASH = "${DIGI_MTK_GIT}/emp/optee_os.git;protocol=ssh"
 OPTEE_URI_GITHUB = "${DIGI_GITHUB_GIT}/optee_os.git;protocol=https"
 OPTEE_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${OPTEE_URI_STASH}', '${OPTEE_URI_GITHUB}', d)}"
 
-SRCBRANCH = "3.19.0/stm/master"
+SRCBRANCH = "3.19.0/stm/maint_ccmp2-beta"
 SRCREV = "${AUTOREV}"
 
 SRC_URI = " \
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.10.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.10.bb
index 11f0da850..c23632bdc 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.10.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.10.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1"
 DEPENDS += "flex-native bison-native"
 DEPENDS += "python3-setuptools-native"
 
-SRCBRANCH = "v2022.10/master"
+SRCBRANCH = "v2022.10/maint_ccmp2-beta"
 SRCREV = "${AUTOREV}"
 
 SRC_URI += " \
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb
index f946687ee..b81dfdda6 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1"
 
 DEPENDS += "flex-native bison-native"
 
-SRCBRANCH = "v2024.04/master"
+SRCBRANCH = "v2024.04/maint"
 SRCREV = "${AUTOREV}"
 
 COMPATIBLE_MACHINE = "(ccimx91)"
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb
index 8320996c6..bacbf6737 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb
@@ -3,7 +3,7 @@
 require recipes-kernel/linux/linux-dey.inc
 
 SRCBRANCH = "v6.1/nxp/dey-4.0/maint"
-SRCBRANCH:stm32mp2common = "v6.1.28/stm/master"
+SRCBRANCH:stm32mp2common = "v6.1/stm/dey-4.0/maint_ccmp2-beta"
 SRCREV = "${AUTOREV}"
 SRCREV:stm32mp2common = "${AUTOREV}"
 
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb
index ee482354e..241772dea 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb
@@ -2,7 +2,7 @@
 
 require recipes-kernel/linux/linux-dey.inc
 
-SRCBRANCH = "v6.6.23/nxp/master"
+SRCBRANCH = "v6.6/nxp/dey-4.0/maint"
 SRCREV = "${AUTOREV}"
 
 # Blacklist btnxpuart module. It will be managed by the bluetooth-init script