diff --git a/meta-digi-arm/conf/machine/ccmp13-dvk.conf b/meta-digi-arm/conf/machine/ccmp13-dvk.conf
index 476b9242b..11f2cf6dc 100644
--- a/meta-digi-arm/conf/machine/ccmp13-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp13-dvk.conf
@@ -3,10 +3,6 @@
 #@DESCRIPTION: Configuration for Digi ConnectCore MP13 DVK
 #@NEEDED_BSPLAYERS: layers/meta-digi
 
-include conf/machine/include/st-machine-common-stm32mp.inc
-include conf/machine/include/arm/armv7a/tune-cortexa7.inc
-include conf/machine/include/digi-defaults.inc
-
 # Include the machine configuration for Digi's ConnectCore MP1.
 include conf/machine/include/ccmp1.inc
 
diff --git a/meta-digi-arm/conf/machine/ccmp15-dvk.conf b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
index 1ede449b1..069607ea8 100644
--- a/meta-digi-arm/conf/machine/ccmp15-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
@@ -3,10 +3,6 @@
 #@DESCRIPTION: Configuration for Digi ConnectCore MP15 DVK
 #@NEEDED_BSPLAYERS: layers/meta-digi
 
-include conf/machine/include/st-machine-common-stm32mp.inc
-include conf/machine/include/arm/armv7a/tune-cortexa7.inc
-include conf/machine/include/digi-defaults.inc
-
 # Include the machine configuration for Digi's ConnectCore MP1.
 include conf/machine/include/ccmp1.inc
 
diff --git a/meta-digi-arm/conf/machine/include/ccmp1.inc b/meta-digi-arm/conf/machine/include/ccmp1.inc
index cf4866135..657f1a517 100644
--- a/meta-digi-arm/conf/machine/include/ccmp1.inc
+++ b/meta-digi-arm/conf/machine/include/ccmp1.inc
@@ -2,6 +2,10 @@
 #@NAME: ConnectCore for STM32MP1.
 #@DESCRIPTION: Machine configuration for Digi's ConnectCore MP1.
 
+include conf/machine/include/st-machine-common-stm32mp.inc
+include conf/machine/include/arm/armv7a/tune-cortexa7.inc
+include conf/machine/include/digi-defaults.inc
+
 # Platform u-boot settings
 UBOOT_PREFIX = "u-boot"
 UBOOT_SUFFIX = "bin"