diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto-sdk-target.bb
index 01b20759..ff72c007 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto-sdk-target.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto-sdk-target.bb
@@ -1,15 +1,12 @@
 DESCRIPTION = "Task to install crypto dev packages in SDK"
 LICENSE = "MIT"
-PR = "r7"
+PR = "r8"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 inherit packagegroup
 
-CRYPTO_API = ""
-CRYPTO_API:ti33x = "cryptodev-module-dev"
-CRYPTO_API:ti43x = "cryptodev-module-dev"
-CRYPTO_API:dra7xx = "cryptodev-module-dev"
+CRYPTO_API = "cryptodev-module-dev"
 
 RDEPENDS:${PN} = "\
     openssl-dev \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto.bb
index d2189a50..30224244 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task to install crypto packages into target FS"
 LICENSE = "MIT"
-PR = "r12"
+PR = "r13"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -11,12 +11,9 @@ CRYPTO_SUPPORT = "\
     openssl-bin \
     openssl-conf \
     openssl-engines \
+    cryptodev-module \
 "
 
-CRYPTO_SUPPORT:append:ti33x = " cryptodev-module cryptodev-tests"
-CRYPTO_SUPPORT:append:ti43x = " cryptodev-module cryptodev-tests"
-CRYPTO_SUPPORT:append:dra7xx = " cryptodev-module cryptodev-tests"
-
 RDEPENDS:${PN} = "\
     ${CRYPTO_SUPPORT} \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-test.bb b/meta-arago-distro/recipes-core/packagegroups/ti-test.bb
index da52d47a..73250ac8 100644
--- a/meta-arago-distro/recipes-core/packagegroups/ti-test.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/ti-test.bb
@@ -38,6 +38,7 @@ ARAGO_TEST = "\
     openntpd \
     nbench-byte \
     stream \
+    cryptodev-tests \
 "
 
 ARAGO_TEST:append:armv7a = " \