diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index 8140c20..3ed5901 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -173,6 +173,10 @@
     # LVL2 and LVL3 requires IPC model
     ("*", "*", True, "2", "*", "*", "*", "*", "*", "*", "*", "*"),
     ("*", "*", True, "3", "*", "*", "*", "*", "*", "*", "*", "*"),
+    # FF does not support library model
+    ("*", "*", True, "*", "*", "IPC", "*", "*", "*", "*", "*", "*"),
+    # FF does not support L3
+    ("*", "*", "*", "3", "*", "IPC", "*", "*", "*", "*", "*", "*"),
     # Regression requires NS
     ("*", "*", "*", "*", True, "*", "*", "*", False, "*", "*", "*"),
     # Musca requires BL2
@@ -473,14 +477,7 @@
                 "extra_params":     [""]
                 },
                 "common_params": _common_tfm_builder_cfg,
-                "invalid": _common_tfm_invalid_configs + [
-                    # FF does not support library model
-                    ("*", "*", True, "*", "*", "IPC",
-                     "*", "*", "*", "*", "*", "*"),
-                    # FF does not support L3
-                    ("*", "*", "*", "3", "*", "IPC",
-                     "*", "*", "*", "*", "*", "*"),
-                ]
+                "invalid": _common_tfm_invalid_configs + []
                 }
 
 config_nsce = {"seed_params": {