diff --git a/arch/arm/mach-snapdragon/of_fixup.c b/arch/arm/mach-snapdragon/of_fixup.c
index 4420b8fa8af6..6259929a78c5 100644
--- a/arch/arm/mach-snapdragon/of_fixup.c
+++ b/arch/arm/mach-snapdragon/of_fixup.c
@@ -273,7 +273,7 @@ static int qcom_of_fixup_nodes(void * __maybe_unused ctx, struct event *event)
 
 	time_call(fixup_usb_nodes, root);
 
-	if (IS_ENABLED(CONFIG_OPTEE) && is_optee_smc_api())
+	if (CONFIG_IS_ENABLED(OPTEE) && is_optee_smc_api())
 		time_call(add_optee_node, root);
 
 	return 0;
diff --git a/configs/qcom_nord_defconfig b/configs/qcom_nord_defconfig
index b5e95db921b4..7eae5ab00c15 100644
--- a/configs/qcom_nord_defconfig
+++ b/configs/qcom_nord_defconfig
@@ -21,3 +21,7 @@ CONFIG_REMAKE_ELF=y
 
 # Address where U-Boot will be loaded
 CONFIG_TEXT_BASE=0xD8D00000
+
+CONFIG_TEE=y
+CONFIG_OPTEE=y
+CONFIG_OPTEE_LIB=y
diff --git a/configs/qcom_nord_ride_spl_defconfig b/configs/qcom_nord_ride_spl_defconfig
index ca2bab9d85bb..175a44f397b6 100644
--- a/configs/qcom_nord_ride_spl_defconfig
+++ b/configs/qcom_nord_ride_spl_defconfig
@@ -21,6 +21,10 @@ CONFIG_ENV_SCSI_PART_TYPE_GUID="bc0330eb-3410-4951-a617-03898dbe3372"
 # CONFIG_ENV_IS_DEFAULT is not set
 # CONFIG_ENV_IS_NOWHERE is not set
 
+CONFIG_TEE=y
+CONFIG_OPTEE=y
+CONFIG_OPTEE_LIB=y
+
 # SPL configurations for Nord-Ride
 # Purpose: Load FIT image (containing TFA, OPTEE and U-Boot proper)
 # from UFS storage and jump to next image (TFA)