diff --git a/meta-digi-arm/conf/machine/ccmp13-dvk.conf b/meta-digi-arm/conf/machine/ccmp13-dvk.conf
index 54fce1d0e..6476ce159 100644
--- a/meta-digi-arm/conf/machine/ccmp13-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp13-dvk.conf
@@ -27,6 +27,8 @@ DEVICE_BOARD_ENABLE:SDCARD += "${@bb.utils.contains('BOOTDEVICE_LABELS', 'sdcard
 # Last one is the default (the one the symlinks point at)
 UBOOT_CONFIG = "ccmp13-dvk"
 UBOOT_CONFIG[ccmp13-dvk] = "ccmp13-dvk_defconfig,,u-boot.dtb"
+# List of U-Boot device tree to use
+UBOOT_DEVICETREE = "${STM32MP_DEVICETREE}"
 
 # =========================================================================
 # Machine settings
@@ -51,8 +53,12 @@ STM32MP_KERNEL_DEVICETREE:ccmp13-dvk += " \
 FIT_CONF_DEFAULT_DTB = "ccmp133-dvk.dtb"
 # Set DTB load address to U-Boot fdt_addr_r
 UBOOT_DTB_LOADADDRESS = "0xc4000000"
-# List of U-Boot device tree to use
-UBOOT_DEVICETREE = "${STM32MP_DEVICETREE}"
+
+# =========================================================================
+# optee
+# =========================================================================
+# Map OPTEE configuration to device tree list
+OPTEE_DEVICETREE_optee = "${STM32MP_DEVICETREE}"
 
 # =========================================================================
 # Machine features
@@ -104,12 +110,6 @@ ST_TOOLS_FOR_SDK:remove = "nativesdk-gcc-arm-none-eabi"
 # activate/deactivate the debug and trace on boot stage
 ST_DEBUG_TRACE = "0"
 
-# =========================================================================
-# optee
-# =========================================================================
-# Map OPTEE configuration to device tree list
-OPTEE_DEVICETREE_optee = "${STM32MP_DEVICETREE}"
-
 # =========================================================================
 # Flashlayouts
 # =========================================================================
diff --git a/meta-digi-arm/conf/machine/ccmp15-dvk.conf b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
index aa89aab05..bf04babd2 100644
--- a/meta-digi-arm/conf/machine/ccmp15-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
@@ -27,6 +27,8 @@ DEVICE_BOARD_ENABLE:SDCARD += "${@bb.utils.contains('BOOTDEVICE_LABELS', 'sdcard
 # Last one is the default (the one the symlinks point at)
 UBOOT_CONFIG = "ccmp15-dvk"
 UBOOT_CONFIG[ccmp15-dvk] = "ccmp15-dvk_defconfig,,u-boot.dtb"
+# List of U-Boot device tree to use
+UBOOT_DEVICETREE = "${STM32MP_DEVICETREE}"
 
 # =========================================================================
 # Machine settings
@@ -59,10 +61,14 @@ STM32MP_KERNEL_DEVICETREE:ccmp15-dvk += " \
     ccmp157-dvk.dtb \
 "
 FIT_CONF_DEFAULT_DTB = "ccmp157-dvk.dtb"
+
+# =========================================================================
+# optee
+# =========================================================================
+# Map OPTEE configuration to device tree list
+OPTEE_DEVICETREE_optee = "${STM32MP_DEVICETREE}"
 # Set DTB load address to U-Boot fdt_addr_r
 UBOOT_DTB_LOADADDRESS = "0xc4000000"
-# List of U-Boot device tree to use
-UBOOT_DEVICETREE = "${STM32MP_DEVICETREE}"
 
 # =========================================================================
 # Machine features
@@ -118,12 +124,6 @@ ST_TOOLS_FOR_SDK:remove = "nativesdk-gcc-arm-none-eabi"
 # activate/deactivate the debug and trace on boot stage
 ST_DEBUG_TRACE = "0"
 
-# =========================================================================
-# optee
-# =========================================================================
-# Map OPTEE configuration to device tree list
-OPTEE_DEVICETREE_optee = "${STM32MP_DEVICETREE}"
-
 # =========================================================================
 # Flashlayouts
 # =========================================================================
diff --git a/meta-digi-arm/conf/machine/include/ccmp1.inc b/meta-digi-arm/conf/machine/include/ccmp1.inc
index 0d8b41b3e..f17a6531d 100644
--- a/meta-digi-arm/conf/machine/include/ccmp1.inc
+++ b/meta-digi-arm/conf/machine/include/ccmp1.inc
@@ -11,11 +11,27 @@ DIGI_FAMILY = "ccmp1"
 # Platform T-FA settings
 TFA_SIGN_SUFFIX ?= "${@bb.utils.contains('TRUSTFENCE_SIGN', '1', '_signed', '', d)}"
 
+# =========================================================================
+# U-Boot
+# =========================================================================
 # Platform u-boot settings
 UBOOT_PREFIX = "fip"
 UBOOT_SUFFIX = "bin"
 # Set U-Boot FIP settings
 FIP_UBOOT_DTB = "u-boot"
+# Include boot script into the FIT image
+UBOOT_ENV = "boot"
+# Set InitRAMDisk load address to U-boot initrd_addr
+UBOOT_RD_LOADADDRESS = "0xc4400000"
+# U-Boot environment offset (within partition)
+UBOOT_ENV_OFFSET ?= "0x0"
+UBOOT_ENV_REDUND_OFFSET ?= "0x0"
+# U-Boot environment size
+UBOOT_ENV_SIZE ?= "0x20000"
+# U-Boot environment range: size (in hex) in the environment partition that
+# the U-Boot environment can take up (if undefined, it will take up all the
+# available space in the environment partition)
+UBOOT_ENV_RANGE ?= ""
 FIP_SIGN_SUFFIX ?= "${@bb.utils.contains('TRUSTFENCE_SIGN', '1', '_Signed', '', d)}"
 
 STORAGE_MEDIA = "mtd"
@@ -32,19 +48,6 @@ ROOTFS_DEV_NAME ?= "rootfs"
 ROOTFS_ENC_DEV = "${ROOTFS_DEV_NAME}"
 ROOTFS_DEV_NAME_FINAL = "${@oe.utils.ifelse(d.getVar('TRUSTFENCE_ENCRYPT_ROOTFS') == '1', '${ROOTFS_ENC_DEV}', '${ROOTFS_DEV_NAME}')}"
 
-# U-Boot environment offset (within partition)
-UBOOT_ENV_OFFSET ?= "0x0"
-UBOOT_ENV_REDUND_OFFSET ?= "0x0"
-# U-Boot environment size
-UBOOT_ENV_SIZE ?= "0x20000"
-# U-Boot environment range: size (in hex) in the environment partition that
-# the U-Boot environment can take up (if undefined, it will take up all the
-# available space in the environment partition)
-UBOOT_ENV_RANGE ?= ""
-
-# Set InitRAMDisk load address to U-boot initrd_addr
-UBOOT_RD_LOADADDRESS = "0xc4400000"
-
 # OPTEE runtime packages to install
 OPTEE_PKGS ??= "optee-client"
 
@@ -77,9 +80,6 @@ WKS_FILE_DEPENDS ?= " \
 # Disable the generation of flashlayout files
 ENABLE_FLASHLAYOUT_CONFIG = "0"
 
-# Include boot script into the FIT image
-UBOOT_ENV = "boot"
-
 # Partitions to blacklist for swupdate:
 # fsbl1, fsbl2, metadata1, metadata2, fip-a, fip-b
 SWUPDATE_MTD_BLACKLIST = "0 1 2 3 4 5"