diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index b7f8993..2a0e252 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -143,21 +143,18 @@
     # No PSA_ACK with regression
     ("*", "*", "*", "*", True, "IPC", "*", "*", "*", "*", "*", "*"),
     ("*", "*", "*", "*", True, "CRYPTO", "*", "*", "*", "*", "*", "*"),
-    ("*", "*", "*", "*", True, "PROTECTED_STORAGE", "*", "*", "*", "*", "*", "*"),
     ("*", "*", "*", "*", True, "INITIAL_ATTESTATION", "*", "*", "*", "*", "*", "*"),
-    ("*", "*", "*", "*", True, "INTERNAL_TRUSTED_STORAGE", "*", "*", "*", "*", "*", "*"),
+    ("*", "*", "*", "*", True, "STORAGE", "*", "*", "*", "*", "*", "*"),
     # PSA_ACK requires NS
     ("*", "*", "*", "*", "*", "IPC", "*", "*", "*", False, "*", "*"),
     ("*", "*", "*", "*", "*", "CRYPTO", "*", "*", "*", False, "*", "*"),
-    ("*", "*", "*", "*", "*", "PROTECTED_STORAGE", "*", "*", "*", False, "*", "*"),
     ("*", "*", "*", "*", "*", "INITIAL_ATTESTATION", "*", "*", "*", False, "*", "*"),
-    ("*", "*", "*", "*", "*", "INTERNAL_TRUSTED_STORAGE", "*", "*", "*", False, "*", "*"),
+    ("*", "*", "*", "*", "*", "STORAGE", "*", "*", "*", False, "*", "*"),
     # PSA_ACK does not support LVL3
     ("*", "*", "*", "3", "*", "IPC", "*", "*", "*", "*", "*", "*"),
     ("*", "*", "*", "3", "*", "CRYPTO", "*", "*", "*", "*", "*", "*"),
-    ("*", "*", "*", "3", "*", "PROTECTED_STORAGE", "*", "*", "*", "*", "*", "*"),
     ("*", "*", "*", "3", "*", "INITIAL_ATTESTATION", "*", "*", "*", "*", "*", "*"),
-    ("*", "*", "*", "3", "*", "INTERNAL_TRUSTED_STORAGE", "*", "*", "*", "*", "*", "*"),
+    ("*", "*", "*", "3", "*", "STORAGE", "*", "*", "*", "*", "*", "*"),
     # Musca requires BL2
     ("arm/musca_b1/sse_200", "*", "*", "*", "*", "*", "*",  "*", False, "*", "*", "*"),
     ("arm/musca_s1", "*", "*", "*", "*", "*", "*",  "*", False, "*", "*", "*"),
@@ -175,9 +172,8 @@
     ("arm/musca_b1/secure_enclave", "*", "*", "*", True, "*", "*", "*", "*", "*", "*", "*"),
     ("arm/musca_b1/secure_enclave", "*", "*", "*", "*", "IPC", "*", "*", "*", "*", "*", "*"),
     ("arm/musca_b1/secure_enclave", "*", "*", "*", "*", "CRYPTO", "*", "*", "*", "*", "*", "*"),
-    ("arm/musca_b1/secure_enclave", "*", "*", "*", "*", "PROTECTED_STORAGE", "*", "*", "*", "*", "*", "*"),
     ("arm/musca_b1/secure_enclave", "*", "*", "*", "*", "INITIAL_ATTESTATION", "*", "*", "*", "*", "*", "*"),
-    ("arm/musca_b1/secure_enclave", "*", "*", "*", "*", "INTERNAL_TRUSTED_STORAGE", "*", "*", "*", "*", "*", "*"),
+    ("arm/musca_b1/secure_enclave", "*", "*", "*", "*", "STORAGE", "*", "*", "*", "*", "*", "*"),
     ("arm/musca_b1/secure_enclave", "*", "*", "*", "*", "*", "*", "*", "*", "*", "profile_small", "*"),
     ("arm/musca_b1/secure_enclave", "*", "*", "*", "*", "*", "*", "*", "*", "*", "profile_medium", "*"),
     ("arm/musca_b1/secure_enclave", "*", "*", "*", "*", "*", "*", "*", "*", True, "*", "*"),
@@ -258,9 +254,8 @@
                 "isolation_level":  ["1", "2", "3"],
                 "test_regression":  [False],
                 "test_psa_api":     ["CRYPTO",
-                                     "PROTECTED_STORAGE",
                                      "INITIAL_ATTESTATION",
-                                     "INTERNAL_TRUSTED_STORAGE"],
+                                     "STORAGE"],
                 "cmake_build_type": ["Debug", "Release", "Minsizerel"],
                 "with_otp":         ["off"],
                 "with_bl2":         [True],
@@ -300,9 +295,8 @@
                 "isolation_level":  ["1", "2", "3"],
                 "test_regression":  [False],
                 "test_psa_api":     ["CRYPTO",
-                                     "PROTECTED_STORAGE",
                                      "INITIAL_ATTESTATION",
-                                     "INTERNAL_TRUSTED_STORAGE"],
+                                     "STORAGE"],
                 "cmake_build_type": ["Debug", "Release", "Minsizerel"],
                 "with_otp":         ["ENABLED"],
                 "with_bl2":         [True],
@@ -627,9 +621,8 @@
                 "test_regression":  [False],
                 "test_psa_api":     ["IPC",
                                      "CRYPTO",
-                                     "PROTECTED_STORAGE",
                                      "INITIAL_ATTESTATION",
-                                     "INTERNAL_TRUSTED_STORAGE"],
+                                     "STORAGE"],
                 "cmake_build_type": ["Debug", "Release", "Minsizerel"],
                 "with_otp":         ["off"],
                 "with_bl2":         [True],
@@ -744,9 +737,8 @@
                 "isolation_level":  ["1", "2", "3"],
                 "test_regression":  [False],
                 "test_psa_api":     ["CRYPTO",
-                                     "PROTECTED_STORAGE",
                                      "INITIAL_ATTESTATION",
-                                     "INTERNAL_TRUSTED_STORAGE"],
+                                     "STORAGE"],
                 "cmake_build_type": ["Debug", "Release"],
                 "with_otp":         ["off"],
                 "with_bl2":         [True],
@@ -929,9 +921,8 @@
                 "test_regression":  [False],
                 "test_psa_api":     ["IPC",
                                      "CRYPTO",
-                                     "PROTECTED_STORAGE",
                                      "INITIAL_ATTESTATION",
-                                     "INTERNAL_TRUSTED_STORAGE"],
+                                     "STORAGE"],
                 "cmake_build_type": ["Release"],
                 "with_otp":         ["off"],
                 "with_bl2":         [True],