diff --git a/lava_helper/lava_create_jobs.py b/lava_helper/lava_create_jobs.py
index 419bfce..3f60583 100755
--- a/lava_helper/lava_create_jobs.py
+++ b/lava_helper/lava_create_jobs.py
@@ -32,7 +32,8 @@
 
     print("Using built-in config: %s" % config_key)
     try:
-        config = lava_gen_config_map[config_key]
+        config = lava_gen_config_map_bl2[config_key] if os.getenv("BL2") == "True" \
+                 else lava_gen_config_map_nobl2[config_key]
     except KeyError:
         print("No template found for config: %s" % config_key)
         sys.exit(1)
@@ -129,7 +130,8 @@
 
 def main(user_args):
     user_args.template_dir = "jinja2_templates"
-    config_keys = list(lava_gen_config_map.keys())
+    config_keys = list(lava_gen_config_map_bl2.keys()) if os.getenv("BL2") == "True" \
+                  else list(lava_gen_config_map_nobl2.keys())
     if user_args.fvp_only:
         config_keys = [key for key in config_keys if "fvp" in key]
     if user_args.physical_board_only:
diff --git a/lava_helper/lava_helper_configs.py b/lava_helper/lava_helper_configs.py
index 538f312..57d7f47 100644
--- a/lava_helper/lava_helper_configs.py
+++ b/lava_helper/lava_helper_configs.py
@@ -324,7 +324,8 @@
 }
 
 # All configurations should be mapped here
-lava_gen_config_map = {
+# Configs need bl2
+lava_gen_config_map_bl2 = {
     "mps2_an521_bl2": tfm_mps2_sse_200,
     "fvp_mps3_cs300_bl2": fvp_mps3_cs300_bl2,
     "fvp_mps2_an521_bl2": fvp_mps2_an521_bl2,
@@ -333,8 +334,12 @@
     "qemu_mps2_bl2": qemu_mps2_bl2,
     "musca_b1": musca_b1_bl2,
     "stm32l562e_dk": stm32l562e_dk,
-    "lpcxpresso55s69": lpcxpresso55s69,
     "b_u585i_iot02a": b_u585i_iot02a,
+}
+
+# Configs without bl2
+lava_gen_config_map_nobl2 = {
+    "lpcxpresso55s69": lpcxpresso55s69,
     "psoc64": psoc64,
 }