diff --git a/meta-digi-arm/conf/machine/include/ccimx6ul.inc b/meta-digi-arm/conf/machine/include/ccimx6ul.inc
index d2d182c7c..39332c141 100644
--- a/meta-digi-arm/conf/machine/include/ccimx6ul.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx6ul.inc
@@ -26,7 +26,6 @@ MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-
 
 MACHINE_EXTRA_RDEPENDS += " \
     imx-kobs \
-    mca-tool \
     mtd-utils-ubifs \
     u-boot-fw-utils \
 "
@@ -40,7 +39,7 @@ MACHINE_EXTRA_RRECOMMENDS += " \
 "
 MACHINE_EXTRA_RRECOMMENDS_remove_use-mainline-bsp = "${@bb.utils.contains('COMBINED_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)}"
 
-MACHINE_FEATURES += "wifi bluetooth cryptochip"
+MACHINE_FEATURES += "wifi bluetooth cryptochip mca"
 MACHINE_FEATURES_remove_use-mainline-bsp = "wifi"
 
 # mkfs.ubifs parameters for boot partition (the one holding kernel and device tree files)
diff --git a/meta-digi-arm/conf/machine/include/ccimx8mn.inc b/meta-digi-arm/conf/machine/include/ccimx8mn.inc
index 64ef81825..da1365361 100644
--- a/meta-digi-arm/conf/machine/include/ccimx8mn.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx8mn.inc
@@ -41,7 +41,6 @@ MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-
 MACHINE_EXTRA_RDEPENDS += " \
     e2fsprogs-mke2fs \
     e2fsprogs-resize2fs \
-    mca-tool \
     parted \
     u-boot-fw-utils \
     xbee-init \
@@ -54,7 +53,7 @@ MACHINE_EXTRA_RRECOMMENDS += " \
     cryptoauthlib \
 "
 
-MACHINE_FEATURES += "accel-graphics accel-video wifi bluetooth cryptochip"
+MACHINE_FEATURES += "accel-graphics accel-video wifi bluetooth cryptochip mca"
 
 # AARCH64 doesn't support self-extracting zImage
 KERNEL_IMAGETYPE = "Image.gz"
diff --git a/meta-digi-arm/conf/machine/include/ccimx8x.inc b/meta-digi-arm/conf/machine/include/ccimx8x.inc
index 25a326412..583b3984e 100644
--- a/meta-digi-arm/conf/machine/include/ccimx8x.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx8x.inc
@@ -44,7 +44,6 @@ MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-
 MACHINE_EXTRA_RDEPENDS += " \
     e2fsprogs-mke2fs \
     e2fsprogs-resize2fs \
-    mca-tool \
     parted \
     u-boot-fw-utils \
     xbee-init \
@@ -57,7 +56,7 @@ MACHINE_EXTRA_RRECOMMENDS += " \
     cryptoauthlib \
 "
 
-MACHINE_FEATURES += "accel-graphics accel-video wifi bluetooth cryptochip pci"
+MACHINE_FEATURES += "accel-graphics accel-video wifi bluetooth cryptochip pci mca"
 
 # AARCH64 doesn't support self-extracting zImage
 KERNEL_IMAGETYPE = "Image.gz"
diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc
index c68c66233..231bde899 100644
--- a/meta-digi-arm/conf/machine/include/digi-defaults.inc
+++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc
@@ -61,3 +61,8 @@ MACHINEOVERRIDES .= "${@['', ':${MACHINE_VARIANT}']['${MACHINE_VARIANT}' != '']}
 # U-Boot symlink
 UBOOT_SYMLINK ?= "${UBOOT_PREFIX}-${MACHINE}.${UBOOT_SUFFIX}"
 BOOTABLE_ARTIFACTS ?= ""
+
+# Extra RDEPENDS
+MACHINE_EXTRA_RDEPENDS += " \
+    ${@bb.utils.contains("MACHINE_FEATURES", "mca", "mca-tool", "", d)} \
+"
diff --git a/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb b/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb
index 8668c9b82..a4e1d74f5 100644
--- a/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb
+++ b/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb
@@ -15,6 +15,8 @@ RDEPENDS_${PN} = "\
 	${@bb.utils.contains("MACHINE_FEATURES", "bluetooth", "dey-examples-bt-gatt-server", "", d)} \
 	${@bb.utils.contains("MACHINE_FEATURES", "bluetooth", "dey-examples-hdp", "", d)} \
 	${@bb.utils.contains("MACHINE_FEATURES", "cryptochip", "dey-examples-cryptochip", "", d)} \
+	${@bb.utils.contains("MACHINE_FEATURES", "mca", "dey-examples-adc-cmp \
+							 dey-examples-tamper", "", d)} \
 	awsiotsdk-demo \
 	dey-examples-caamblob \
 	dey-examples-cloudconnector \
@@ -27,20 +29,11 @@ RDEPENDS_${PN}_append_ccimx6 = "\
 	dey-examples-v4l2 \
 "
 
-RDEPENDS_${PN}_append_ccimx6ul = "\
-	dey-examples-adc-cmp \
-	dey-examples-tamper \
-"
-
 RDEPENDS_${PN}_append_ccimx8x = "\
-	dey-examples-adc-cmp \
-	dey-examples-tamper \
 	dey-examples-v4l2 \
 "
 
 RDEPENDS_${PN}_append_ccimx8m = "\
-	dey-examples-adc-cmp \
-	dey-examples-tamper \
 	dey-examples-v4l2 \
 "