diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index 9c7a35f..c27d219 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -73,7 +73,7 @@
 
     # ALL commands will be executed for every build.
     # Other keys will append extra commands when matching target_platform
-    "build_cmds": {"all": ["cmake --build ."],
+    "build_cmds": {"all": ["cmake --build ./ -- install"],
                    "musca_a": [("srec_cat "
                                 "%(_tbm_build_dir_)s/bin/"
                                 "bl2.bin "
diff --git a/jenkins/build-config-infra-health.jpl b/jenkins/build-config-infra-health.jpl
index 2c016c0..fd595fd 100644
--- a/jenkins/build-config-infra-health.jpl
+++ b/jenkins/build-config-infra-health.jpl
@@ -108,7 +108,7 @@
       sh "tf-m-ci-scripts/run-build.sh"
     }
     stage("Post") {
-      archiveArtifacts 'trusted-firmware-m/build/bin/**'
+      archiveArtifacts 'trusted-firmware-m/build/install/**'
     }
   } catch (Exception e) {
     manager.buildFailure()
diff --git a/jenkins/build-config.jpl b/jenkins/build-config.jpl
index 579aa93..fccfad6 100644
--- a/jenkins/build-config.jpl
+++ b/jenkins/build-config.jpl
@@ -98,6 +98,7 @@
       sh "tf-m-ci-scripts/run-build.sh"
     }
     stage("Post") {
+      archiveArtifacts 'trusted-firmware-m/build/install/**'
       archiveArtifacts 'trusted-firmware-m/build/bin/**'
     }
   } catch (Exception e) {
diff --git a/jenkins/build-docs.jpl b/jenkins/build-docs.jpl
index 38b207f..e63ab73 100644
--- a/jenkins/build-docs.jpl
+++ b/jenkins/build-docs.jpl
@@ -77,6 +77,7 @@
       sh "tf-m-ci-scripts/build-docs.sh"
     }
     stage("Post") {
+      archiveArtifacts 'trusted-firmware-m/build/install/**'
       archiveArtifacts 'trusted-firmware-m/build/docs/**'
     }
   } catch (Exception e) {
diff --git a/lava_helper/jinja2_templates/qemu_mps2.jinja2 b/lava_helper/jinja2_templates/qemu_mps2.jinja2
new file mode 100644
index 0000000..7e0cefe
--- /dev/null
+++ b/lava_helper/jinja2_templates/qemu_mps2.jinja2
@@ -0,0 +1,55 @@
+{#------------------------------------------------------------------------------
+# Copyright (c) 2019-2020, Arm Limited and Contributors. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+#-----------------------------------------------------------------------------#}
+actions:
+- deploy:
+    images:
+      mcuboot: {image_arg: '-device loader,file={mcuboot},addr=0x10000000', url: '{{ bootloader_url }}'}
+      tfm: {image_arg: '-device loader,file={tfm},addr=0x10080000', url: '{{ firmware_url }}'}
+    timeout: {seconds: 100}
+    to: tmpfs
+- boot:
+    docker: {binary: /usr/bin/qemu-system-arm, image: 'kevintownsend/lite-qemu5:v1'}
+    method: qemu
+    timeout: {seconds: 300}
+- test:
+    monitors:
+    - name: wait-finish
+      start: "Non-Secure system starting"
+      end: "End of Non-secure test suites"
+      pattern: "[\x1b]\\[37mTest suite '(?P<test_case_id>.*?)' has [\x1b]\\[32m (?P<result>PASSED|FAILED)"
+      fixupdict:
+        PASSED: pass
+        FAILED: fail
+    timeout: {seconds: 300}
+
+context:
+  arch: arm
+  cpu: 'cortex-m33'
+  machine: mps2-an521
+  serial: '-serial mon:stdio'
+  vga: '-vga none'
+  memory: 16M
+  model: model=lan9118
+
+device_type: {{ device_type }}
+job_name: {{ job_name }}
+priority: medium
+timeouts:
+  action: {seconds: 300}
+  job: {seconds: 300}
+visibility: public
+
+metadata:
+  build_no: {{ build_no }}
+  compiler: {{ compiler }}
+  build_type: {{ build_type }}
+  boot_type: {{ boot_type }}
+  name: {{ name }}
+  platform: {{ platform }}
+  build_name: {{ build_name }}
+  build_job_url: {{ build_job_url }}
+
diff --git a/lava_helper/lava_create_jobs.py b/lava_helper/lava_create_jobs.py
index 2e803c3..71baa3f 100755
--- a/lava_helper/lava_create_jobs.py
+++ b/lava_helper/lava_create_jobs.py
@@ -53,7 +53,13 @@
     if params["device_type"] == "fvp":
         platform = "fvp"
 
-    url = "{}/artifact/trusted-firmware-m/build/bin/{}".format(artifact_store_url.rstrip("/"), filename)
+    # FIXME: temporary workaround until we switch all platforms artifacts
+    #        to use the same location (new build system)
+    url = "{}/artifact/trusted-firmware-m/build".format(artifact_store_url.rstrip("/"))
+    if platform.lower().startswith("musca"):
+        url = "{}/bin/{}".format(url, filename)
+    else:
+        url = "{}/install/outputs/{}/{}".format(url, platform, filename)
     return url
 
 
diff --git a/lava_helper/lava_helper.py b/lava_helper/lava_helper.py
index 6e10323..54c62ae 100755
--- a/lava_helper/lava_helper.py
+++ b/lava_helper/lava_helper.py
@@ -76,7 +76,7 @@
 
 
 def get_artifact_url(artifact_store_url, params, filename):
-    url = "{}/{}/artifact/build-ci-all/{}_{}_Config{}_{}_{}/bin/{}/{}".format(
+    return "{}/{}/artifact/build-ci-all/{}_{}_Config{}_{}_{}/install/outputs/{}/{}".format(
         artifact_store_url,
         params['build_no'],
         params['platform'],
@@ -87,7 +87,6 @@
         params['platform'],
         filename,
     )
-    return url
 
 def get_recovery_url(recovery_store_url, build_no, recovery):
     return("{}/{}/artifact/{}".format(
diff --git a/lava_helper/lava_helper_configs.py b/lava_helper/lava_helper_configs.py
index 1f7a03d..1920458 100644
--- a/lava_helper/lava_helper_configs.py
+++ b/lava_helper/lava_helper_configs.py
@@ -45,11 +45,6 @@
     return cfg
 
 
-# MPS2 with BL2 bootloader
-# IMAGE0ADDRESS: 0x10000000
-# IMAGE0FILE: \Software\bl2.bin  ; BL2 bootloader
-# IMAGE1ADDRESS: 0x10080000
-# IMAGE1FILE: \Software\tfm_s_ns_signed.bin ; TF-M example application binary blob
 tfm_mps2_sse_200 = {
     "templ": "mps2.jinja2",
     "job_name": "mps2_an521_bl2",
@@ -59,15 +54,15 @@
     "monitor_timeout": 10,
     "poweroff_timeout": 1,
     "recovery_store_url": "https://ci.trustedfirmware.org/userContent/",
-    "platforms": {"AN521": "mps2_sse200_an512_new.tar.gz"},
+    "platforms": {"AN521": "mps2_sse200_an512.tar.gz"},
     "compilers": ["GNUARM", "ARMCLANG"],
     "build_types": ["Debug", "Release", "Minsizerel"],
     "boot_types": ["BL2"],
     "tests": {
         'Default': {
             "binaries": {
-                "firmware": "tfm_s_ns_signed.bin",
-                "bootloader": "bl2.bin"
+                "firmware": "tfm_sign.bin",
+                "bootloader": "mcuboot.bin"
             },
             "monitors": [
                 {
@@ -84,8 +79,8 @@
         },  # Default
         'Regression': {
             "binaries": {
-                "firmware": "tfm_s_ns_signed.bin",
-                "bootloader": "bl2.bin"
+                "firmware": "tfm_sign.bin",
+                "bootloader": "mcuboot.bin"
             },
             "monitors": [
                 {
@@ -137,8 +132,8 @@
         },  # Regression
         'RegressionIPC': {
             "binaries": {
-                "firmware": "tfm_s_ns_signed.bin",
-                "bootloader": "bl2.bin"
+                "firmware": "tfm_sign.bin",
+                "bootloader": "mcuboot.bin"
             },
             "monitors": [
                 {
@@ -190,8 +185,8 @@
         },  # Regression
         'RegressionIPCTfmLevel2': {
             "binaries": {
-                "firmware": "tfm_s_ns_signed.bin",
-                "bootloader": "bl2.bin"
+                "firmware": "tfm_sign.bin",
+                "bootloader": "mcuboot.bin"
             },
             "monitors": [
                 {
@@ -243,8 +238,8 @@
         },  # Regression
         'CoreIPC': {
             "binaries": {
-                "firmware": "tfm_s_ns_signed.bin",
-                "bootloader": "bl2.bin"
+                "firmware": "tfm_sign.bin",
+                "bootloader": "mcuboot.bin"
             },
             "monitors": [
                 {
@@ -261,8 +256,8 @@
         },  # CoreIPC
         'CoreIPCTfmLevel2': {
             "binaries": {
-                "firmware": "tfm_s_ns_signed.bin",
-                "bootloader": "bl2.bin"
+                "firmware": "tfm_sign.bin",
+                "bootloader": "mcuboot.bin"
             },
             "monitors": [
                 {
@@ -281,9 +276,6 @@
 }
 
 
-# FVP with BL2 bootloader
-# firmware <-> ns <-> application: --application cpu0=bl2.axf
-# bootloader <-> s <-> data: --data cpu0=tfm_s_ns_signed.bin@0x10080000
 fvp_mps2_an521_bl2 = {
     "templ": "fvp_mps2.jinja2",
     "job_name": "fvp_mps2_an521_bl2",
@@ -300,7 +292,7 @@
     "tests": {
         'Default': {
             "binaries": {
-                "firmware": "bl2.axf",
+                "firmware": "mcuboot.axf",
                 "bootloader": "tfm_s_ns_signed.bin"
             },
             "monitors": [
@@ -318,7 +310,7 @@
         },  # Default
         'DefaultProfileS': {
             "binaries": {
-                "firmware": "bl2.axf",
+                "firmware": "mcuboot.axf",
                 "bootloader": "tfm_s_ns_signed.bin"
             },
             "monitors": [
@@ -336,7 +328,7 @@
         },  # DefaultProfileS
         'DefaultProfileM': {
             "binaries": {
-                "firmware": "bl2.axf",
+                "firmware": "mcuboot.axf",
                 "bootloader": "tfm_s_ns_signed.bin"
             },
             "monitors": [
@@ -355,7 +347,7 @@
 
         'Regression': {
             "binaries": {
-                "firmware": "bl2.axf",
+                "firmware": "mcuboot.axf",
                 "bootloader": "tfm_s_ns_signed.bin"
             },
             "monitors": [
@@ -409,7 +401,7 @@
 
         'RegressionProfileM': {
             "binaries": {
-                "firmware": "bl2.axf",
+                "firmware": "mcuboot.axf",
                 "bootloader": "tfm_s_ns_signed.bin"
             },
             "monitors": [
@@ -462,7 +454,7 @@
         },  # RegressionProfileM
         'RegressionProfileS': {
             "binaries": {
-                "firmware": "bl2.axf",
+                "firmware": "mcuboot.axf",
                 "bootloader": "tfm_s_ns_signed.bin"
             },
             "monitors": [
@@ -516,7 +508,7 @@
 
         'RegressionIPC': {
             "binaries": {
-                "firmware": "bl2.axf",
+                "firmware": "mcuboot.axf",
                 "bootloader": "tfm_s_ns_signed.bin"
             },
             "monitors": [
@@ -569,7 +561,7 @@
         },  # Regression
         'RegressionIPCTfmLevel2': {
             "binaries": {
-                "firmware": "bl2.axf",
+                "firmware": "mcuboot.axf",
                 "bootloader": "tfm_s_ns_signed.bin"
             },
             "monitors": [
@@ -622,7 +614,7 @@
         },  # Regression
         'RegressionIPCTfmLevel3': {
             "binaries": {
-                "firmware": "bl2.axf",
+                "firmware": "mcuboot.axf",
                 "bootloader": "tfm_s_ns_signed.bin"
             },
             "monitors": [
@@ -675,7 +667,7 @@
         },  # Regression
         'CoreIPC': {
             "binaries": {
-                "firmware": "bl2.axf",
+                "firmware": "mcuboot.axf",
                 "bootloader": "tfm_s_ns_signed.bin"
             },
             "monitors": [
@@ -693,7 +685,7 @@
         },  # CoreIPC
         'CoreIPCTfmLevel2': {
             "binaries": {
-                "firmware": "bl2.axf",
+                "firmware": "mcuboot.axf",
                 "bootloader": "tfm_s_ns_signed.bin"
             },
             "monitors": [
@@ -711,7 +703,7 @@
         },  # CoreIPCTfmLevel2
         'CoreIPCTfmLevel3': {
             "binaries": {
-                "firmware": "bl2.axf",
+                "firmware": "mcuboot.axf",
                 "bootloader": "tfm_s_ns_signed.bin"
             },
             "monitors": [
@@ -731,9 +723,6 @@
 }
 
 
-# FVP without BL2 bootloader
-# firmware <-> ns <-> application: --application cpu0=tfm_s.axf
-# bootloader <-> s <-> data: --data cpu0=tfm_ns.bin@0x00100000
 fvp_mps2_an521_nobl2 = {
     "templ": "fvp_mps2.jinja2",
     "job_name": "fvp_mps2_an521_nobl2",
@@ -1181,9 +1170,6 @@
 }
 
 
-# FVP with BL2 bootloader
-# firmware <-> ns <-> application: --application cpu0=bl2.axf
-# bootloader <-> s <-> data: --data cpu0=tfm_s_ns_signed.bin@0x10080000
 fvp_mps2_an519_bl2 = {
     "templ": "fvp_mps2.jinja2",
     "job_name": "fvp_mps2_an519_bl2",
@@ -1201,7 +1187,7 @@
     "tests": {
         'Default': {
             "binaries": {
-                "firmware": "bl2.axf",
+                "firmware": "mcuboot.axf",
                 "bootloader": "tfm_s_ns_signed.bin"
             },
             "monitors": [
@@ -1219,7 +1205,7 @@
         },  # Default
         'DefaultProfileS': {
             "binaries": {
-                "firmware": "bl2.axf",
+                "firmware": "mcuboot.axf",
                 "bootloader": "tfm_s_ns_signed.bin"
             },
             "monitors": [
@@ -1237,7 +1223,7 @@
         },  # DefaultProfileS
         'DefaultProfileM': {
             "binaries": {
-                "firmware": "bl2.axf",
+                "firmware": "mcuboot.axf",
                 "bootloader": "tfm_s_ns_signed.bin"
             },
             "monitors": [
@@ -1256,7 +1242,7 @@
 
         'Regression': {
             "binaries": {
-                "firmware": "bl2.axf",
+                "firmware": "mcuboot.axf",
                 "bootloader": "tfm_s_ns_signed.bin"
             },
             "monitors": [
@@ -1310,7 +1296,7 @@
 
         'RegressionProfileM': {
             "binaries": {
-                "firmware": "bl2.axf",
+                "firmware": "mcuboot.axf",
                 "bootloader": "tfm_s_ns_signed.bin"
             },
             "monitors": [
@@ -1363,7 +1349,7 @@
         },  # RegressionProfileM
         'RegressionProfileS': {
             "binaries": {
-                "firmware": "bl2.axf",
+                "firmware": "mcuboot.axf",
                 "bootloader": "tfm_s_ns_signed.bin"
             },
             "monitors": [
@@ -1417,7 +1403,7 @@
 
         'RegressionIPC': {
             "binaries": {
-                "firmware": "bl2.axf",
+                "firmware": "mcuboot.axf",
                 "bootloader": "tfm_s_ns_signed.bin"
             },
             "monitors": [
@@ -1470,7 +1456,7 @@
         },  # Regression
         'RegressionIPCTfmLevel2': {
             "binaries": {
-                "firmware": "bl2.axf",
+                "firmware": "mcuboot.axf",
                 "bootloader": "tfm_s_ns_signed.bin"
             },
             "monitors": [
@@ -1523,7 +1509,7 @@
         },  # Regression
         'CoreIPC': {
             "binaries": {
-                "firmware": "bl2.axf",
+                "firmware": "mcuboot.axf",
                 "bootloader": "tfm_s_ns_signed.bin"
             },
             "monitors": [
@@ -1541,7 +1527,7 @@
         },  # CoreIPC
         'CoreIPCTfmLevel2': {
             "binaries": {
-                "firmware": "bl2.axf",
+                "firmware": "mcuboot.axf",
                 "bootloader": "tfm_s_ns_signed.bin"
             },
             "monitors": [
@@ -1561,9 +1547,6 @@
 }
 
 
-# FVP without BL2 bootloader
-# firmware <-> ns <-> application: --application cpu0=tfm_s.axf
-# bootloader <-> s <-> data: --data cpu0=tfm_ns.bin@0x00100000
 fvp_mps2_an519_nobl2 = {
     "templ": "fvp_mps2.jinja2",
     "job_name": "fvp_mps2_an519_nobl2",
@@ -1940,48 +1923,6 @@
 }
 
 
-# MPS2 with BL2 bootloader
-# IMAGE0ADDRESS: 0x10000000
-# IMAGE0FILE: \Software\bl2.bin  ; BL2 bootloader
-# IMAGE1ADDRESS: 0x10080000
-# IMAGE1FILE: \Software\tfm_s_ns_signed.bin ; TF-M example application binary blob
-qemu_mps2_bl2 = {
-    "templ": "qemu_mps2.jinja2",
-    "job_name": "qemu_mps2",
-    "device_type": "qemu",
-    "job_timeout": 300,
-    "action_timeout": 300,
-    "poweroff_timeout": 20,
-    "platforms": {"AN521": ""},
-    "compilers": ["GNUARM", "ARMCLANG"],
-    "build_types": ["Debug", "Release"],
-    "boot_types": ["BL2"],
-    "tests": {
-        'Default': {
-            "binaries": {
-                "firmware": "tfm_s_ns_signed.bin",
-                "bootloader": "bl2.bin"
-            },
-            "monitors": [
-                {
-                    'name': 'Secure_Test_Suites_Summary',
-                    'start': '[Sec Thread]',
-                    'end': 'system starting',
-                    'pattern': r'\x1b\\[1;34m\\[Sec Thread\\] '
-                               r'(?P<test_case_id>Secure image '
-                               r'initializing)(?P<result>!)',
-                    'fixup': {"PASSED": "pass", "FAILED": "fail"},
-                    'required': ["secure_image_initializing"]
-                }  # Monitors
-            ]
-        },  # Default
-    }
-}
-
-
-# Musca-B1 with BL2 bootloader
-# unified hex file comprising of both bl2.bin and tfm_s_ns_signed.bin
-# srec_cat bin/bl2.bin -Binary -offset 0xA000000 bin/tfm_s_ns_signed.bin -Binary -offset 0xA020000 -o tfm.hex -Intel
 musca_b1_bl2 = {
     "templ": "musca_b1.jinja2",
     "job_name": "musca_b1_bl2",
@@ -2057,6 +1998,39 @@
     },
 }
 
+qemu_mps2 = {
+    "templ": "qemu_mps2.jinja2",
+    "job_name": "qemu_mps2",
+    "device_type": "qemu",
+    "job_timeout": 300,
+    "action_timeout": 300,
+    "poweroff_timeout": 20,
+    "platforms": {"AN521": ""},
+    "compilers": ["GNUARM", "ARMCLANG"],
+    "build_types": ["Debug", "Release"],
+    "boot_types": ["NOBL2"],
+    "tests": {
+        'Default': {
+            "binaries": {
+                "firmware": "tfm_sign.bin",
+                "bootloader": "mcuboot.bin"
+            },
+            "monitors": [
+                {
+                    'name': 'Secure_Test_Suites_Summary',
+                    'start': '[Sec Thread]',
+                    'end': 'system starting',
+                    'pattern': r'\x1b\\[1;34m\\[Sec Thread\\] '
+                               r'(?P<test_case_id>Secure image '
+                               r'initializing)(?P<result>!)',
+                    'fixup': {"PASSED": "pass", "FAILED": "fail"},
+                    'required': ["secure_image_initializing"]
+                }  # Monitors
+            ]
+        },  # Default
+    }
+}
+
 # All configurations should be mapped here
 lava_gen_config_map = {
     "mps2_an521_bl2": tfm_mps2_sse_200,
@@ -2064,8 +2038,8 @@
     "fvp_mps2_an521_nobl2": fvp_mps2_an521_nobl2,
     "fvp_mps2_an519_bl2": fvp_mps2_an519_bl2,
     "fvp_mps2_an519_nobl2": fvp_mps2_an519_nobl2,
-    "qemu_mps2": qemu_mps2_bl2,
     "musca_b1": musca_b1_bl2,
+    "qemu_mps2": qemu_mps2,
 }
 
 lavagen_config_sort_order = [
diff --git a/run-build.sh b/run-build.sh
index d32b452..da571a7 100755
--- a/run-build.sh
+++ b/run-build.sh
@@ -53,3 +53,28 @@
 cd ../trusted-firmware-m/build
 
 eval "set -ex ; $build_commands"
+
+# TODO: Remove the copy logic when LAVA server could read artifacts directly generated by new build system
+set +e
+
+mkdir install/outputs/fvp
+cp -r bin/* install/outputs/fvp/
+
+cd install/outputs
+cp -r CYPRESS/* .
+cp -r MPS2/* .
+cp -r MPS3/* .
+
+for file in `find | grep bl2`
+do
+	newfile=`echo $file | sed "s/bl2/mcuboot/g"`
+	cp $file $newfile
+done
+
+for file in `find | grep s_ns_signed`
+do
+	newfile=`echo $file | sed "s/s_ns_signed/sign/g"`
+	cp $file $newfile
+done
+
+set -e
diff --git a/tfm_ci_pylib/fastmodel_wrapper/config_templates.py b/tfm_ci_pylib/fastmodel_wrapper/config_templates.py
index 760850e..ef87e98 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"] = "bin/fvp"
-    _vdict["data_bin_path"] = "bin/fvp"
+    _vdict["app_bin_path"] = "install/outputs/fvp"
+    _vdict["data_bin_path"] = "install/outputs/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"] = "bin/fvp"
-    _vdict["data_bin_path"] = "bin/fvp"
+    _vdict["app_bin_path"] = "install/outputs/fvp"
+    _vdict["data_bin_path"] = "install/outputs/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"] = "bin/fvp"
-    _vdict["data_bin_path"] = "bin/fvp"
+    _vdict["app_bin_path"] = "install/outputs/fvp"
+    _vdict["data_bin_path"] = "install/outputs/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"] = "bin/fvp"
-    _vdict["data_bin_path"] = "bin/fvp"
+    _vdict["app_bin_path"] = "install/outputs/fvp"
+    _vdict["data_bin_path"] = "install/outputs/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"] = "bin/fvp"
-    _vdict["data_bin_path"] = "bin/fvp"
+    _vdict["app_bin_path"] = "install/outputs/fvp"
+    _vdict["data_bin_path"] = "install/outputs/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"] = "bin/fvp"
-    _vdict["data_bin_path"] = "bin/fvp"
+    _vdict["app_bin_path"] = "install/outputs/fvp"
+    _vdict["data_bin_path"] = "install/outputs/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"] = "bin/fvp"
-    _vdict["data_bin_path"] = "bin/fvp"
+    _vdict["app_bin_path"] = "install/outputs/fvp"
+    _vdict["data_bin_path"] = "install/outputs/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 d70f779..e5dc1fd 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 "bl2.axf"
+                        "app_bin" in override_params else "mcuboot.axf"
                     _vdict["data_bin"] = override_params["data_bin"] if \
                         "data_bin" in override_params \
                         else "tfm_s_ns_signed.bin"