diff --git a/build_helper/build_helper_config_maps.py b/build_helper/build_helper_config_maps.py
index a53e653..7606747 100644
--- a/build_helper/build_helper_config_maps.py
+++ b/build_helper/build_helper_config_maps.py
@@ -84,6 +84,8 @@
     "LZOFF"        : "-DCONFIG_TFM_LAZY_STACKING=OFF ",
     # Partiton
     "PSOFF"        : "-DTFM_PARTITION_PROTECTED_STORAGE=OFF ",
+    "PSCLEAR"      : "-DPS_ENCRYPTION=OFF",
+    "PSLIMIT"      : "-DPS_AES_KEY_USAGE_LIMIT=1000000",
     # IPC
     "IPC"          : "-DCONFIG_TFM_SPM_BACKEND=IPC ",
     # CC Driver
diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index 52a111d..06d5254 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -291,6 +291,12 @@
                     # AN521_ARMCLANG_1_RegBL2_RegS_RegNS_Debug_BL2
                     ("arm/mps2/an521", "ARMCLANG_6_21", "1",
                      "RegBL2, RegS, RegNS", "OFF", "Debug", True, "", ""),
+                    # AN521_ARMCLANG_1_RegBL2_RegS_RegNS_Debug_BL2_PSCLEAR
+                    ("arm/mps2/an521", "ARMCLANG_6_21", "1",
+                     "RegBL2, RegS, RegNS", "OFF", "Debug", True, "", "PSCLEAR"),
+                    # AN521_ARMCLANG_1_RegBL2_RegS_RegNS_Debug_BL2_PSLIMIT
+                    ("arm/mps2/an521", "ARMCLANG_6_21", "1",
+                     "RegBL2, RegS, RegNS", "OFF", "Debug", True, "", "PSLIMIT"),
                     # AN521_ARMCLANG_1_RegBL2_RegS_RegNS_Debug_BL2_IPC
                     ("arm/mps2/an521", "ARMCLANG_6_21", "1",
                      "RegBL2, RegS, RegNS", "OFF", "Debug", True, "", "IPC"),