diff --git a/build_helper/build_helper_config_maps.py b/build_helper/build_helper_config_maps.py
index 1651c0b..009fdd7 100644
--- a/build_helper/build_helper_config_maps.py
+++ b/build_helper/build_helper_config_maps.py
@@ -65,9 +65,7 @@
     "FPSOFT"       : "-DCONFIG_TFM_FP=soft ",
     "FPHARD"       : ("-DCONFIG_TFM_FP=hard "
                       "-DTEST_S_FPU=ON -DTEST_NS_FPU=ON "),
-    "FPHARD_LOFF"  : ("-DCONFIG_TFM_FP=hard "
-                      "-DCONFIG_TFM_LAZY_STACKING=OFF "
-                      "-DTEST_S_FPU=ON -DTEST_NS_FPU=ON "),
+    "LZOFF"        : "-DCONFIG_TFM_LAZY_STACKING=OFF ",
     # SFN
     "SFN"          : "-DCONFIG_TFM_SPM_BACKEND=SFN ",
     # CC Driver
@@ -80,4 +78,5 @@
     # Corstone1000 support
     "FVP"          : "-DPLATFORM_IS_FVP=True ",
     "FPGA"         : "-DPLATFORM_IS_FVP=False ",
+    "S_PS_OFF"     : "-DTEST_S_PS=OFF ",
 }
diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index 236a3dc..255894e 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -451,7 +451,7 @@
                 "with_ns":          [True],
                 "profile":          [""],
                 "partition_ps":     ["ON"],
-                "extra_params":     ["FPSOFT", "FPHARD", "FPHARD_LOFF"]
+                "extra_params":     ["FPSOFT", "FPHARD", "FPHARD, LZOFF"]
                 },
                 "common_params": _common_tfm_builder_cfg,
                 "invalid": _common_tfm_invalid_configs + []
@@ -725,7 +725,7 @@
                 "with_ns":          [False],
                 "profile":          [""],
                 "partition_ps":     ["ON"],
-                "extra_params":     ["FVP", "FPGA"]
+                "extra_params":     ["S_PS_OFF, FVP", "FPGA"]
                 },
                 "common_params": _common_tfm_builder_cfg,
                 "invalid": _common_tfm_invalid_configs + []