diff --git a/build_helper/build_helper_config_maps.py b/build_helper/build_helper_config_maps.py
index c161572..13e8c9a 100644
--- a/build_helper/build_helper_config_maps.py
+++ b/build_helper/build_helper_config_maps.py
@@ -63,8 +63,8 @@
     # MMIO
     "MMIO"         : "-DPSA_FRAMEWORK_HAS_MM_IOVEC=ON ",
     # FPU support
-    "FPSOFT"       : "-DCONFIG_TFM_FP=soft ",
-    "FPHARD"       : ("-DCONFIG_TFM_FP=hard "
+    "FPOFF"        : "-DCONFIG_TFM_ENABLE_FP=OFF ",
+    "FPON"         : ("-DCONFIG_TFM_ENABLE_FP=ON "
                       "-DTEST_S_FPU=ON -DTEST_NS_FPU=ON "),
     "LZOFF"        : "-DCONFIG_TFM_LAZY_STACKING=OFF ",
     # SFN
diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index d9282b7..b959f3e 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -286,9 +286,9 @@
                     # MUSCA_S1_GCC_LIB_1_REG_Debug_BL2
                     ("arm/musca_s1", "GCC_10_3", True, "1",
                      True, "OFF", "Debug", True, "", "ON", ""),
-                    # MUSCA_S1_GCC_IPC_2_REG_Release_BL2_FPHARD
+                    # MUSCA_S1_GCC_IPC_2_REG_Release_BL2_FPON
                     ("arm/musca_s1", "GCC_10_3", False, "2",
-                     True, "OFF", "Release", True, "", "ON", "FPHARD"),
+                     True, "OFF", "Release", True, "", "ON", "FPON"),
                     # MUSCA_S1_GCC_IPC_1_REG_Release_BL2_CC_DRIVER_PSA
                     ("arm/musca_s1", "GCC_7_3_1", False, "1",
                      True, "OFF", "Release", True, "", "ON", "CC_DRIVER_PSA"),
@@ -450,7 +450,7 @@
                 "with_bl2":         [True],
                 "profile":          [""],
                 "partition_ps":     ["ON"],
-                "extra_params":     ["FPSOFT", "FPHARD", "FPHARD, LZOFF"]
+                "extra_params":     ["FPOFF", "FPON", "FPON, LZOFF"]
                 },
                 "common_params": _common_tfm_builder_cfg,
                 "invalid": _common_tfm_invalid_configs + []