diff --git a/meta-digi-arm/conf/machine/ccimx6ulsbc.conf b/meta-digi-arm/conf/machine/ccimx6ulsbc.conf
index 44b42f30e..862d0a3c8 100644
--- a/meta-digi-arm/conf/machine/ccimx6ulsbc.conf
+++ b/meta-digi-arm/conf/machine/ccimx6ulsbc.conf
@@ -12,16 +12,6 @@ UBOOT_CONFIG[ccimx6ulsbc1GB] = "ccimx6ulsbc1GB_defconfig,,u-boot-dtb.${UBOOT_SUF
 UBOOT_CONFIG[ccimx6ulsbc512MB] = "ccimx6ulsbc512MB_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}"
 UBOOT_CONFIG[ccimx6ulsbc] = "ccimx6ulsbc_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}"
 
-# U-Boot environment size
-UBOOT_ENV_SIZE ?= "0x20000"
-# U-Boot environment offset (within partition)
-UBOOT_ENV_OFFSET ?= "0x0"
-UBOOT_ENV_REDUND_OFFSET ?= "${UBOOT_ENV_SIZE}"
-# 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 ?= ""
-
 KERNEL_DEVICETREE ?= " \
     imx6ul-ccimx6ulsbc.dtb \
     imx6ul-ccimx6ulsbc-wb.dtb \
diff --git a/meta-digi-arm/conf/machine/ccimx6ulstarter.conf b/meta-digi-arm/conf/machine/ccimx6ulstarter.conf
index 178abaa60..92d506f75 100644
--- a/meta-digi-arm/conf/machine/ccimx6ulstarter.conf
+++ b/meta-digi-arm/conf/machine/ccimx6ulstarter.conf
@@ -12,16 +12,6 @@ UBOOT_CONFIG[ccimx6ulstarter1GB] = "ccimx6ulstarter1GB_defconfig,,u-boot-dtb.${U
 UBOOT_CONFIG[ccimx6ulstarter512MB] = "ccimx6ulstarter512MB_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}"
 UBOOT_CONFIG[ccimx6ulstarter] = "ccimx6ulstarter_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}"
 
-# U-Boot environment size
-UBOOT_ENV_SIZE ?= "0x20000"
-# U-Boot environment offset (within partition)
-UBOOT_ENV_OFFSET ?= "0x0"
-UBOOT_ENV_REDUND_OFFSET ?= "${UBOOT_ENV_SIZE}"
-# 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 ?= ""
-
 KERNEL_DEVICETREE ?= " \
     imx6ul-ccimx6ulstarter.dtb \
     imx6ul-ccimx6ulstarter-wb.dtb \
diff --git a/meta-digi-arm/conf/machine/ccmp13-dvk.conf b/meta-digi-arm/conf/machine/ccmp13-dvk.conf
index aeea34c97..a0454d185 100644
--- a/meta-digi-arm/conf/machine/ccmp13-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp13-dvk.conf
@@ -122,15 +122,6 @@ ST_KERNEL_LOADADDR ?= "0xC0008000"
 # =========================================================================
 IMAGE_CLASSES = "image_types_digi image_types-stubi"
 
-# U-Boot environment offset (within partition)
-UBOOT_ENV_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 ?= ""
-
 # mkfs.ubifs parameters for boot partition (the one holding kernel and device tree files)
 # Max LEB count (-c 255) calculated for a partition of up to 32 MiB considering 128 KiB erase-block size.
 MKUBIFS_BOOT_ARGS ?= "-m 2048 -e 126976 -c 255"
diff --git a/meta-digi-arm/conf/machine/ccmp15-dvk.conf b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
index 9675cba44..7f4c01b74 100644
--- a/meta-digi-arm/conf/machine/ccmp15-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
@@ -130,16 +130,6 @@ ST_KERNEL_LOADADDR ?= "0xC0008000"
 # =========================================================================
 IMAGE_CLASSES = "image_types_digi image_types-stubi"
 
-# 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 ?= ""
-
 # mkfs.ubifs parameters for boot partition (the one holding kernel and device tree files)
 # Max LEB count (-c 255) calculated for a partition of up to 32 MiB considering 128 KiB erase-block size.
 MKUBIFS_BOOT_ARGS ?= "-m 2048 -e 126976 -c 255"
diff --git a/meta-digi-arm/conf/machine/include/ccimx6ul.inc b/meta-digi-arm/conf/machine/include/ccimx6ul.inc
index 9d5e91d82..6b83e56ed 100644
--- a/meta-digi-arm/conf/machine/include/ccimx6ul.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx6ul.inc
@@ -61,3 +61,12 @@ ROOTFS_ENC_DEV = "${ROOTFS_DEV_NAME}"
 ROOTFS_DEV_NAME_FINAL = "${@oe.utils.ifelse(d.getVar('TRUSTFENCE_ENCRYPT_ROOTFS', True) == '1', '${ROOTFS_ENC_DEV}', '${ROOTFS_DEV_NAME}')}"
 
 UBOOT_DEV_NAME ?= "/dev/mtd"
+# U-Boot environment offset (within partition)
+UBOOT_ENV_OFFSET ?= "0x0"
+UBOOT_ENV_REDUND_OFFSET ?= "${UBOOT_ENV_SIZE}"
+# 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 ?= ""
diff --git a/meta-digi-arm/conf/machine/include/ccmp1.inc b/meta-digi-arm/conf/machine/include/ccmp1.inc
index d093790e3..ed3ae6a2d 100644
--- a/meta-digi-arm/conf/machine/include/ccmp1.inc
+++ b/meta-digi-arm/conf/machine/include/ccmp1.inc
@@ -27,6 +27,15 @@ ROOTFS_ENC_DEV = "${ROOTFS_DEV_NAME}"
 ROOTFS_DEV_NAME_FINAL = "${@oe.utils.ifelse(d.getVar('TRUSTFENCE_ENCRYPT_ROOTFS', True) == '1', '${ROOTFS_ENC_DEV}', '${ROOTFS_DEV_NAME}')}"
 
 UBOOT_DEV_NAME ?= "/dev/mtd"
+# 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 ?= ""
 
 # Extra udev rules
 MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf"