diff --git a/build_helper/build_helper_config_maps.py b/build_helper/build_helper_config_maps.py
index a4e248f..69b3736 100644
--- a/build_helper/build_helper_config_maps.py
+++ b/build_helper/build_helper_config_maps.py
@@ -95,6 +95,9 @@
                       "-DTEST_S_IPC=OFF "
                       "-DEXTRA_S_TEST_SUITE_PATH=%(codebase_root_dir)s/platform/ext/target/arm/corstone1000/ci_regression_tests/ "),
 
+    # Platform Varients Support
+    "CFG0"         : "-DTFM_PLATFORM_VARIANT=0",
+
     # Extra test cases
     "TEST_CBOR"    : "-DTEST_NS_QCBOR=ON ",
 
diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index 72bac3b..07e28ff 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -302,12 +302,9 @@
                     # RSS_TC_GCC_2_Release_BL2_PSOFF
                     ("arm/rss/tc", "GCC_10_3", "2",
                      "RegS, RegNS", "OFF", "Release", True, "", "PSOFF"),
-                    # RSS_RDFremont_GCC_2_Release_BL2_PSOFF
+                    # RSS_RDFremont_GCC_2_Release_BL2_PSOFF_CFG0
                     ("arm/rss/rdfremont", "GCC_10_3", "2",
-                     "OFF", "OFF", "Release", True, "", "PSOFF"),
-                    # RSS_RDFremont_GCC_2_Release_BL2_PSOFF_CFG2
-                    ("arm/rss/rdfremont", "GCC_10_3", "2",
-                     "OFF", "OFF", "Release", True, "", "PSOFF, CFG2"),
+                     "OFF", "OFF", "Release", True, "", "PSOFF, CFG0"),
                     # stm32l562e_dk_ARMCLANG_1_RegS_RegNS_Release_BL2_CRYPTO_OFF
                     ("stm/stm32l562e_dk", "ARMCLANG_6_21", "1",
                      "RegS, RegNS", "OFF", "Release", True, "", "CRYPTO_OFF"),
@@ -851,7 +848,7 @@
                 "cmake_build_type": ["Debug", "Release"],
                 "with_bl2":         [True],
                 "profile":          [""],
-                "extra_params":     ["PSOFF"]
+                "extra_params":     ["PSOFF, CFG0"]
                 },
                 "common_params": _common_tfm_builder_cfg,
                 "invalid": _common_tfm_invalid_configs + []