diff --git a/targets/targets.json b/targets/targets.json
index 0e10b4628a..2b8d854a7f 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -765,7 +765,8 @@
             "KPSDK_CODE",
             "MCU_K64F",
             "Freescale_EMAC",
-            "PSA"
+            "PSA",
+            "MBED_PSA_SRV"
         ],
         "is_disk_virtual": true,
         "macros": [
@@ -1022,7 +1023,8 @@
             "KSDK2_MCUS",
             "FRDM",
             "Freescale_EMAC",
-            "PSA"
+            "PSA",
+            "MBED_PSA_SRV"
         ],
         "is_disk_virtual": true,
         "macros": [
@@ -1983,7 +1985,8 @@
         "extra_labels_add": [
             "STM32F4",
             "STM32F429xI",
-            "PSA"
+            "PSA",
+            "MBED_PSA_SRV"
         ],
         "macros_add": [
             "STM32F429xx"
@@ -4691,6 +4694,7 @@
         "extra_labels_add": [
             "MUSCA_A1_NS",
             "PSA",
+            "MBED_PSA_SRV",
             "TFM"
         ],
         "post_binary_hook": {
@@ -4748,6 +4752,7 @@
         "extra_labels_add": [
             "MUSCA_B1_NS",
             "PSA",
+            "MBED_PSA_SRV",
             "TFM"
         ],
         "post_binary_hook": {
@@ -6273,7 +6278,8 @@
         "public": false,
         "extra_labels": [
             "ARM_FM",
-            "PSA"
+            "PSA",
+            "MBED_PSA_SRV"
         ]
     },
     "FVP_MPS2": {
@@ -7306,7 +7312,8 @@
             "GD32F4XX",
             "GD32F450ZI",
             "GD_EMAC",
-            "PSA"
+            "PSA",
+            "MBED_PSA_SRV"
         ],
         "device_has_add": [
             "RTC",