diff --git a/tfm_ci_pylib/fastmodel_wrapper/config_templates.py b/tfm_ci_pylib/fastmodel_wrapper/config_templates.py
index ef87e98..760850e 100644
--- a/tfm_ci_pylib/fastmodel_wrapper/config_templates.py
+++ b/tfm_ci_pylib/fastmodel_wrapper/config_templates.py
@@ -89,8 +89,8 @@
 
     # Set defaults across all variants
     _vdict["build_path"] = "build-ci-all"
-    _vdict["app_bin_path"] = "install/outputs/fvp"
-    _vdict["data_bin_path"] = "install/outputs/fvp"
+    _vdict["app_bin_path"] = "bin/fvp"
+    _vdict["data_bin_path"] = "bin/fvp"
     _vdict["variant_name_tpl"] = "%(platform)s_%(compiler)s_%(config)s_" + \
         "%(build_type)s_%(bootloader)s"
 
@@ -122,8 +122,8 @@
 
     # Set defaults across all variants
     _vdict["build_path"] = "build-ci-all"
-    _vdict["app_bin_path"] = "install/outputs/fvp"
-    _vdict["data_bin_path"] = "install/outputs/fvp"
+    _vdict["app_bin_path"] = "bin/fvp"
+    _vdict["data_bin_path"] = "bin/fvp"
     _vdict["variant_name_tpl"] = "%(platform)s_%(compiler)s_%(config)s_" + \
         "%(build_type)s_%(bootloader)s"
 
@@ -169,8 +169,8 @@
     # Set defaults across all variants
     _vdict["build_path"] = "build-ci-all"
 
-    _vdict["app_bin_path"] = "install/outputs/fvp"
-    _vdict["data_bin_path"] = "install/outputs/fvp"
+    _vdict["app_bin_path"] = "bin/fvp"
+    _vdict["data_bin_path"] = "bin/fvp"
 
     _vdict["variant_name_tpl"] = "%(platform)s_%(compiler)s_%(config)s_" + \
         "%(build_type)s_%(bootloader)s"
@@ -205,8 +205,8 @@
     # Set defaults across all variants
     _vdict["build_path"] = "build-ci-all"
 
-    _vdict["app_bin_path"] = "install/outputs/fvp"
-    _vdict["data_bin_path"] = "install/outputs/fvp"
+    _vdict["app_bin_path"] = "bin/fvp"
+    _vdict["data_bin_path"] = "bin/fvp"
 
     _vdict["variant_name_tpl"] = "%(platform)s_%(compiler)s_%(config)s_" + \
         "%(build_type)s_%(bootloader)s"
@@ -241,8 +241,8 @@
     # Set defaults across all variants
     _vdict["build_path"] = "build-ci-all"
 
-    _vdict["app_bin_path"] = "install/outputs/fvp"
-    _vdict["data_bin_path"] = "install/outputs/fvp"
+    _vdict["app_bin_path"] = "bin/fvp"
+    _vdict["data_bin_path"] = "bin/fvp"
 
     _vdict["variant_name_tpl"] = "%(platform)s_%(compiler)s_%(config)s_" + \
         "%(psa_suite)s_%(build_type)s_%(bootloader)s"
@@ -276,8 +276,8 @@
     # Set defaults across all variants
     _vdict["build_path"] = "build-ci-all"
 
-    _vdict["app_bin_path"] = "install/outputs/fvp"
-    _vdict["data_bin_path"] = "install/outputs/fvp"
+    _vdict["app_bin_path"] = "bin/fvp"
+    _vdict["data_bin_path"] = "bin/fvp"
 
     _vdict["variant_name_tpl"] = "%(platform)s_%(compiler)s_%(config)s_" + \
         "%(psa_suite)s_%(build_type)s_%(bootloader)s"
@@ -311,8 +311,8 @@
     # Set defaults across all variants
     _vdict["build_path"] = "build-ci-all"
 
-    _vdict["app_bin_path"] = "install/outputs/fvp"
-    _vdict["data_bin_path"] = "install/outputs/fvp"
+    _vdict["app_bin_path"] = "bin/fvp"
+    _vdict["data_bin_path"] = "bin/fvp"
 
     _vdict["variant_name_tpl"] = "%(platform)s_%(compiler)s_%(config)s_" + \
         "%(psa_suite)s_%(build_type)s_%(bootloader)s"
diff --git a/tfm_ci_pylib/fastmodel_wrapper/fastmodel_wrapper_config.py b/tfm_ci_pylib/fastmodel_wrapper/fastmodel_wrapper_config.py
index e5dc1fd..d70f779 100644
--- a/tfm_ci_pylib/fastmodel_wrapper/fastmodel_wrapper_config.py
+++ b/tfm_ci_pylib/fastmodel_wrapper/fastmodel_wrapper_config.py
@@ -178,7 +178,7 @@
                 # Adjust the binaries based on bootloader presense
                 if _vdict["bootloader"] == "BL2":
                     _vdict["app_bin"] = override_params["app_bin"] if \
-                        "app_bin" in override_params else "mcuboot.axf"
+                        "app_bin" in override_params else "bl2.axf"
                     _vdict["data_bin"] = override_params["data_bin"] if \
                         "data_bin" in override_params \
                         else "tfm_s_ns_signed.bin"