diff --git a/meta-digi-arm/conf/machine/ccmp13-dvk.conf b/meta-digi-arm/conf/machine/ccmp13-dvk.conf
index a75aece69..6cbcbbb32 100644
--- a/meta-digi-arm/conf/machine/ccmp13-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp13-dvk.conf
@@ -31,8 +31,11 @@ UBOOT_CONFIG[ccmp13-dvk] = "ccmp13-dvk_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}"
 # =========================================================================
 # Machine settings
 # =========================================================================
-# Define list of devicetree per board
-STM32MP_DEVICETREE ??= "ccmp13-dvk-256MB"
+# Define list of devicetree per supported storage
+STM32MP_DT_FILES_NAND = "ccmp13-dvk-256MB"
+STM32MP_DT_FILES_SDCARD = "${STM32MP_DT_FILES_NAND}"
+STM32MP_DT_FILES_USB = "${STM32MP_DT_FILES_NAND}"
+
 # Extra DTB for board - need to specify it with .dtb ...
 STM32MP_KERNEL_DEVICETREE:ccmp13-dvk += " \
     ccmp13_bt_test.dtbo \
diff --git a/meta-digi-arm/conf/machine/ccmp15-dvk.conf b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
index daf3a748b..351aad17f 100644
--- a/meta-digi-arm/conf/machine/ccmp15-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
@@ -31,8 +31,11 @@ UBOOT_CONFIG[ccmp15-dvk] = "ccmp15-dvk_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}"
 # =========================================================================
 # Machine settings
 # =========================================================================
-# Define list of devicetree per board
-STM32MP_DEVICETREE ??= "ccmp15-dvk-512MB ccmp15-dvk-1GB"
+# Define list of devicetree per supported storage
+STM32MP_DT_FILES_NAND = "ccmp15-dvk-512MB ccmp15-dvk-1GB"
+STM32MP_DT_FILES_SDCARD = "${STM32MP_DT_FILES_NAND}"
+STM32MP_DT_FILES_USB = "${STM32MP_DT_FILES_NAND}"
+
 # Extra DTB for board - need to specify it with .dtb ...
 STM32MP_KERNEL_DEVICETREE:ccmp15-dvk += " \
     ccmp15_bt_test.dtbo \