diff --git a/meta-digi-arm/conf/machine/include/ccmp1.inc b/meta-digi-arm/conf/machine/include/ccmp1.inc
index 60082d3d7..0d8b41b3e 100644
--- a/meta-digi-arm/conf/machine/include/ccmp1.inc
+++ b/meta-digi-arm/conf/machine/include/ccmp1.inc
@@ -58,13 +58,13 @@ IMAGE_FSTYPES:remove = "ext4"
 IMAGE_FSTYPES:append = " ${@bb.utils.contains('BOOTDEVICE_LABELS', 'sdcard', 'boot.vfat ext4.gz', '', d)}"
 
 # List of supported boot devices
-BOOTDEVICE_LABELS ?= "nand-4-256"
+BOOTDEVICE_LABELS ?= "nand-4-256-1024 usb"
 # Supported boot schemes
 BOOTSCHEME_LABELS ?= "optee"
 
 # Remove NAND-based ubi/ubifs images added by st-machine-common-stm32mp.inc
 # because image_types_digi.bbclass already builds their own.
-MULTIUBI_BUILD:remove = "nand_4_256"
+MULTIUBI_BUILD:remove = "nand-4-256-1024"
 IMAGE_FSTYPES:remove = "stmultiubi"
 
 # Wic files