diff --git a/meta-digi-arm/conf/machine/ccimx6qpsbc.conf b/meta-digi-arm/conf/machine/ccimx6qpsbc.conf
index 07d1789e5..1026f9d0a 100644
--- a/meta-digi-arm/conf/machine/ccimx6qpsbc.conf
+++ b/meta-digi-arm/conf/machine/ccimx6qpsbc.conf
@@ -16,6 +16,8 @@ MACHINE_EXTRA_RRECOMMENDS += " \
     cryptoauth-openssl-engine \
 "
 
+MACHINE_FEATURES += "cryptochip"
+
 # Firmware
 MACHINE_FIRMWARE_append = " ${@base_conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6564-bt', '', d)}"
 MACHINE_FIRMWARE_append = " ${@base_conditional('HAVE_WIFI', '1', 'firmware-qualcomm-qca6564-wifi', '', d)}"
diff --git a/meta-digi-arm/conf/machine/include/ccimx6ul.inc b/meta-digi-arm/conf/machine/include/ccimx6ul.inc
index f7c7c0dca..962f2c2d9 100644
--- a/meta-digi-arm/conf/machine/include/ccimx6ul.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx6ul.inc
@@ -41,7 +41,7 @@ MACHINE_EXTRA_RRECOMMENDS += " \
     cryptoauth-openssl-engine \
 "
 
-MACHINE_FEATURES += "wifi bluetooth"
+MACHINE_FEATURES += "wifi bluetooth cryptochip"
 
 MACHINE_FIRMWARE_append = " ${@base_conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6564-bt', '', d)}"
 MACHINE_FIRMWARE_append = " ${@base_conditional('HAVE_WIFI', '1', 'firmware-qualcomm-qca6564-wifi', '', d)}"
diff --git a/meta-digi-arm/conf/machine/include/ccimx8x.inc b/meta-digi-arm/conf/machine/include/ccimx8x.inc
index c1276dd3f..096005667 100644
--- a/meta-digi-arm/conf/machine/include/ccimx8x.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx8x.inc
@@ -34,7 +34,7 @@ MACHINE_EXTRA_RRECOMMENDS += " \
     cryptodev-module \
 "
 
-MACHINE_FEATURES += "accel-graphics accel-video wifi bluetooth"
+MACHINE_FEATURES += "accel-graphics accel-video wifi bluetooth cryptochip"
 
 # AARCH64 doesn't support compressed kernel images
 KERNEL_IMAGETYPE = "Image"
diff --git a/meta-digi-dey/recipes-connectivity/openssl/openssl_%.bbappend b/meta-digi-dey/recipes-connectivity/openssl/openssl_%.bbappend
index 2a3d70134..5f35df7c2 100644
--- a/meta-digi-dey/recipes-connectivity/openssl/openssl_%.bbappend
+++ b/meta-digi-dey/recipes-connectivity/openssl/openssl_%.bbappend
@@ -2,15 +2,12 @@
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
 
-SRC_URI += " \
-    file://0001-cryptodev-Fix-issue-with-signature-generation.patch \
-    file://0002-cryptodev-allow-copying-EVP-contexts.patch \
-"
-
 CRYPTOCHIP_COMMON_PATCHES = " \
     file://0003-Modify-openssl.cnf-to-automatically-load-the-cryptoc.patch \
 "
 
-SRC_URI_append_ccimx6ul = " ${CRYPTOCHIP_COMMON_PATCHES}"
-SRC_URI_append_ccimx6qpsbc = " ${CRYPTOCHIP_COMMON_PATCHES}"
-SRC_URI_append_ccimx8x = " ${CRYPTOCHIP_COMMON_PATCHES}"
+SRC_URI += " \
+    file://0001-cryptodev-Fix-issue-with-signature-generation.patch \
+    file://0002-cryptodev-allow-copying-EVP-contexts.patch \
+    ${@bb.utils.contains("MACHINE_FEATURES", "cryptochip", "${CRYPTOCHIP_COMMON_PATCHES}", "", 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 175e144f7..831baeebc 100644
--- a/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb
+++ b/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb
@@ -13,6 +13,7 @@ RDEPENDS_${PN} = "\
 	${@bb.utils.contains("MACHINE_FEATURES", "bluetooth", "dey-examples-bt", "", d)} \
 	${@bb.utils.contains("MACHINE_FEATURES", "bluetooth", "dey-examples-btconfig", "", d)} \
 	${@bb.utils.contains("MACHINE_FEATURES", "bluetooth", "dey-examples-hdp", "", d)} \
+	${@bb.utils.contains("MACHINE_FEATURES", "cryptochip", "dey-examples-cryptochip", "", d)} \
 	awsiotsdk-demo \
 	dey-examples-can \
 	dey-examples-cloudconnector \
@@ -31,18 +32,12 @@ RDEPENDS_${PN}_append_ccimx6 = "\
 RDEPENDS_${PN}_append_ccimx6ul = "\
 	dey-examples-adc \
 	dey-examples-adc-cmp \
-	dey-examples-cryptochip \
 	dey-examples-tamper \
 "
 
-RDEPENDS_${PN}_append_ccimx6qpsbc = "\
-	dey-examples-cryptochip \
-"
-
 RDEPENDS_${PN}_append_ccimx8x = "\
 	dey-examples-adc \
 	dey-examples-adc-cmp \
-	dey-examples-cryptochip \
 	dey-examples-tamper \
 	dey-examples-v4l2 \
 "