diff --git a/build_helper/build_helper_config_maps.py b/build_helper/build_helper_config_maps.py
index 82964f4..61a94df 100644
--- a/build_helper/build_helper_config_maps.py
+++ b/build_helper/build_helper_config_maps.py
@@ -68,8 +68,6 @@
     "LZOFF"        : "-DCONFIG_TFM_LAZY_STACKING=OFF ",
     # Partiton
     "PSOFF"        : "-DTFM_PARTITION_PROTECTED_STORAGE=OFF ",
-    # SFN
-    "SFN"          : "-DCONFIG_TFM_SPM_BACKEND=SFN ",
     # CC Driver
     "CC_DRIVER_PSA": "-DCC312_LEGACY_DRIVER_API_ENABLED=OFF ",
     # ST support
diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index b4013d5..c21bafd 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -225,9 +225,9 @@
                     # AN521_ARMCLANG_3_REG_Minsizerel_BL2
                     ("arm/mps2/an521", "ARMCLANG_6_13", "3",
                      True, "OFF", "Minsizerel", True, "", ""),
-                    # AN521_ARMCLANG_1_REG_Debug_BL2_SMALL_PSOFF_SFN
+                    # AN521_ARMCLANG_1_REG_Debug_BL2_SMALL_PSOFF
                     ("arm/mps2/an521", "ARMCLANG_6_13", "1",
-                     True, "OFF", "Debug", True, "profile_small", "PSOFF, SFN"),
+                     True, "OFF", "Debug", True, "profile_small", "PSOFF"),
                     # AN521_GCC_1_REG_Debug_BL2
                     ("arm/mps2/an521", "GCC_10_3", "1",
                      True, "OFF", "Debug", True, "", ""),
@@ -346,11 +346,6 @@
                 "extra_params":     ["PSOFF"]
                 },
                 "common_params": _common_tfm_builder_cfg,
-                "valid": [
-                    # Profile Small also supports SFN model
-                    ("*", "*", "*", "*", "*",
-                     "*", "*", "*", "PSOFF, SFN")
-                ],
                 "invalid": _common_tfm_invalid_configs + [
                     ("arm/mps2/an519", "GCC_10_3", "*", "*",
                      "*", "Minsizerel", "*", "*", "*")