diff --git a/meta-digi-arm/conf/machine/include/ccimx8m.inc b/meta-digi-arm/conf/machine/include/ccimx8m.inc
index bb2d79f7c..c164d867a 100644
--- a/meta-digi-arm/conf/machine/include/ccimx8m.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx8m.inc
@@ -54,6 +54,10 @@ MACHINE_EXTRA_RRECOMMENDS += "${WIRELESS_MODULE}"
 
 MACHINE_FEATURES += "accel-graphics wifi bluetooth cryptochip mca optee"
 
+# For nativesdk packages that need to go to the toolchain depending on an
+# specific machine feature.
+SDK_MACHINE_FEATURES:append = " optee"
+
 # TrustFence
 TRUSTFENCE_SIGN_MODE = "HAB"
 
diff --git a/meta-digi-arm/conf/machine/include/ccimx9.inc b/meta-digi-arm/conf/machine/include/ccimx9.inc
index 1eb93c2a1..c6bc929d5 100644
--- a/meta-digi-arm/conf/machine/include/ccimx9.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx9.inc
@@ -40,6 +40,10 @@ DDR_FIRMWARE_NAME = " \
 MACHINE_FEATURES += "pci wifi bluetooth"
 MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse"
 
+# For nativesdk packages that need to go to the toolchain depending on an
+# specific machine feature.
+SDK_MACHINE_FEATURES:append = " optee"
+
 STORAGE_MEDIA = "mmc"
 WLAN_P2P_INTERFACE = "wfd0"
 
diff --git a/meta-digi-arm/recipes-core/packagegroup/nativesdk-packagegroup-sdk-host.bbappend b/meta-digi-arm/recipes-core/packagegroup/nativesdk-packagegroup-sdk-host.bbappend
index 1df3246f1..e9697af51 100644
--- a/meta-digi-arm/recipes-core/packagegroup/nativesdk-packagegroup-sdk-host.bbappend
+++ b/meta-digi-arm/recipes-core/packagegroup/nativesdk-packagegroup-sdk-host.bbappend
@@ -1,6 +1,6 @@
 # Copyright (C) 2016-2025, Digi International Inc.
 
-IMX_OPTEE_SDK_RDEPENDS ?= "${@bb.utils.contains('MACHINE_FEATURES', 'optee', \
+IMX_OPTEE_SDK_RDEPENDS ?= "${@bb.utils.contains('SDK_MACHINE_FEATURES', 'optee', \
 					        'nativesdk-python3-cryptography nativesdk-python3-pyelftools', \
 					        '', d)}"