diff --git a/targets/targets.json b/targets/targets.json
index faf3a22b9e..59ca71778f 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -4,6 +4,7 @@
         "default_toolchain": "ARM",
         "supported_toolchains": null,
         "extra_labels": [],
+        "components": ["PSA_SRV_IMPL", "PSA_SRV_EMUL", "NSPE"],
         "is_disk_virtual": false,
         "macros": [],
         "device_has": [],
@@ -1349,7 +1350,7 @@
     },
     "K64F": {
         "supported_form_factors": ["ARDUINO"],
-        "components": ["SD"],
+        "components_add": ["SD"],
         "core": "Cortex-M4F",
         "supported_toolchains": ["ARM", "GCC_ARM", "IAR"],
         "extra_labels": [
@@ -1600,7 +1601,7 @@
     },
     "K66F": {
         "supported_form_factors": ["ARDUINO"],
-        "components": ["SD"],
+        "components_add": ["SD"],
         "core": "Cortex-M4F",
         "supported_toolchains": ["ARM", "GCC_ARM", "IAR"],
         "extra_labels": [
@@ -1646,7 +1647,7 @@
     },
     "K82F": {
         "supported_form_factors": ["ARDUINO"],
-        "components": ["SPIF"],
+        "components_add": ["SPIF"],
         "core": "Cortex-M4F",
         "supported_toolchains": ["ARM", "GCC_ARM", "IAR"],
         "extra_labels": ["Freescale", "MCUXpresso_MCUS", "KSDK2_MCUS", "FRDM"],
@@ -2326,7 +2327,7 @@
     },
     "USI_WM_BN_BM_22": {
         "inherits": ["FAMILY_STM32"],
-        "components": ["SPIF"],
+        "components_add": ["SPIF"],
         "core": "Cortex-M4F",
         "extra_labels_add": [
             "STM32F4",
@@ -2373,7 +2374,7 @@
         }
     },
     "DISCO_F413ZH": {
-        "components": ["QSPIF"],
+        "components_add": ["QSPIF"],
         "inherits": ["FAMILY_STM32"],
         "supported_form_factors": ["ARDUINO"],
         "core": "Cortex-M4F",
@@ -3065,7 +3066,7 @@
         "device_name": "STM32L486RG"
     },
     "MTB_ADV_WISE_1570": {
-        "components": ["FLASHIAP"],
+        "components_add": ["FLASHIAP"],
         "inherits": ["FAMILY_STM32"],
         "core": "Cortex-M4F",
         "extra_labels_add": [
@@ -3297,7 +3298,7 @@
         "bootloader_supported": true
     },
     "DISCO_F469NI": {
-        "components": ["QSPIF"],
+        "components_add": ["QSPIF"],
         "inherits": ["FAMILY_STM32"],
         "supported_form_factors": ["ARDUINO"],
         "core": "Cortex-M4F",
@@ -3493,7 +3494,7 @@
         }
     },
     "DISCO_L475VG_IOT01A": {
-        "components": ["QSPIF"],
+        "components_add": ["QSPIF"],
         "inherits": ["FAMILY_STM32"],
         "core": "Cortex-M4F",
         "extra_labels_add": ["STM32L4", "STM32L475xG", "STM32L475VG"],
@@ -3524,7 +3525,7 @@
         "bootloader_supported": true
     },
     "DISCO_L476VG": {
-        "components": ["QSPIF"],
+        "components_add": ["QSPIF"],
         "inherits": ["FAMILY_STM32"],
         "core": "Cortex-M4F",
         "extra_labels_add": ["STM32L4", "STM32L476xG", "STM32L476VG"],