diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index 4d408ee..aac49a5 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -460,7 +460,7 @@
                 "with_ns":          [False],
                 "profile":          [""],
                 "partition_ps":     ["ON"],
-                "extra_params":     [""]
+                "extra_params":     ["FVP", "FPGA"]
                 },
                 "common_params": _common_tfm_builder_cfg,
                 "invalid": _common_tfm_invalid_configs + []
diff --git a/tfm_ci_pylib/tfm_build_manager.py b/tfm_ci_pylib/tfm_build_manager.py
index 673771c..8a45305 100644
--- a/tfm_ci_pylib/tfm_build_manager.py
+++ b/tfm_ci_pylib/tfm_build_manager.py
@@ -75,7 +75,9 @@
                   "FPSOFT":        "-DCONFIG_TFM_FP=soft ",
                   "FPHARD":        "-DCONFIG_TFM_FP=hard ",
                   "FPHARD_LOFF":   ("-DCONFIG_TFM_FP=hard "
-                                    "-DCONFIG_TFM_LAZY_STACKING=OFF ")
+                                    "-DCONFIG_TFM_LAZY_STACKING=OFF "),
+                  "FVP":           "-DPLATFORM_IS_FVP=True",
+                  "FPGA":          "-DPLATFORM_IS_FVP=False"
                   }
 
 class TFM_Build_Manager(structuredTask):