diff --git a/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros.bb b/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros.bb
index b9311c6cb..c039dc191 100644
--- a/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros.bb
+++ b/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros.bb
@@ -82,4 +82,4 @@ FILES_${PN}-ar3k = "/lib/firmware/ar3k"
 FILES_${PN}-ath6kl = "/lib/firmware/ath6k"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(ccardimx28|ccimx6)"
+COMPATIBLE_MACHINE = "(ccardimx28|ccimx6$)"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb
index 816082c23..795921585 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb
@@ -57,4 +57,4 @@ do_deploy_append() {
 	mkimage -T script -n bootscript -C none -d ${WORKDIR}/boot.txt ${DEPLOYDIR}/boot.scr
 }
 
-COMPATIBLE_MACHINE = "(ccimx6)"
+COMPATIBLE_MACHINE = "(ccimx6$)"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend b/meta-digi-arm/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend
index ca253e736..8540dc4cb 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend
@@ -27,4 +27,4 @@ pkg_postinst_${PN}() {
 	fi
 }
 
-COMPATIBLE_MACHINE = "(ccimx6)"
+COMPATIBLE_MACHINE = "(ccimx6$)"
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb
index 023241b1b..6819a65b9 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb
@@ -8,4 +8,4 @@ inherit fsl-vivante-kernel-driver-handler
 SRCBRANCH = "v3.14/dey-2.0/maint"
 SRCREV = "${AUTOREV}"
 
-COMPATIBLE_MACHINE = "(ccimx6)"
+COMPATIBLE_MACHINE = "(ccimx6$)"
diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-bt.bb b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-bt.bb
index 975b0c4fa..3fed99409 100644
--- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-bt.bb
+++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-bt.bb
@@ -22,4 +22,4 @@ do_install() {
 	install -m 0755 bt_test ${D}${bindir}
 }
 
-COMPATIBLE_MACHINE = "(ccardimx28|ccimx6)"
+COMPATIBLE_MACHINE = "(ccardimx28|ccimx6$)"
diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-btconfig.bb b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-btconfig.bb
index fa6e52f99..c40c90d20 100644
--- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-btconfig.bb
+++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-btconfig.bb
@@ -22,4 +22,4 @@ do_install() {
 	install -m 0755 btconfig ${D}${bindir}
 }
 
-COMPATIBLE_MACHINE = "(ccardimx28|ccimx6)"
+COMPATIBLE_MACHINE = "(ccardimx28|ccimx6$)"
diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-can.bb b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-can.bb
index e87d11af4..1233f7725 100644
--- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-can.bb
+++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-can.bb
@@ -18,4 +18,4 @@ do_install() {
 	install -m 0755 can_test ${D}${bindir}
 }
 
-COMPATIBLE_MACHINE = "(ccardimx28|ccimx6)"
+COMPATIBLE_MACHINE = "(ccardimx28|ccimx6$)"
diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-hdp.bb b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-hdp.bb
index 72a34b357..64290d8f5 100644
--- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-hdp.bb
+++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-hdp.bb
@@ -16,4 +16,4 @@ do_install() {
 
 RDEPENDS_${PN} = "python python-argparse python-crypt python-dbus python-pygobject"
 
-COMPATIBLE_MACHINE = "(ccardimx28|ccimx6)"
+COMPATIBLE_MACHINE = "(ccardimx28|ccimx6$)"
diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles.bb b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles.bb
index cf9ada749..f28891e71 100644
--- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles.bb
+++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles.bb
@@ -24,4 +24,4 @@ RDEPENDS_${PN}_ccimx6 = "libopenvg-mx6"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-COMPATIBLE_MACHINE = "(ccimx6)"
+COMPATIBLE_MACHINE = "(ccimx6$)"
diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-v4l2.bb b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-v4l2.bb
index 757bf796a..1e0ce763d 100644
--- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-v4l2.bb
+++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-v4l2.bb
@@ -25,4 +25,4 @@ do_install() {
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-COMPATIBLE_MACHINE = "(ccimx6)"
+COMPATIBLE_MACHINE = "(ccimx6$)"
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 d19be8411..a0315823c 100644
--- a/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb
+++ b/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb
@@ -35,4 +35,4 @@ RDEPENDS_${PN}_append_ccimx6 = "\
 	dey-examples-v4l2 \
 "
 
-COMPATIBLE_MACHINE = "(ccardimx28|ccimx6)"
+COMPATIBLE_MACHINE = "(ccardimx28|ccimx6$)"