diff --git a/meta-digi-arm/conf/machine/include/ccmp1.inc b/meta-digi-arm/conf/machine/include/ccmp1.inc
index 15ff18221..fd74a2ad8 100644
--- a/meta-digi-arm/conf/machine/include/ccmp1.inc
+++ b/meta-digi-arm/conf/machine/include/ccmp1.inc
@@ -51,6 +51,11 @@ BOOTDEVICE_LABELS ?= "nand-4-256"
 # 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"
+IMAGE_FSTYPES:remove = "stmultiubi"
+
 # Wic files
 WKS_FILE += "ccmp1.wks.in"
 WKS_FILE_DEPENDS ?= " \