diff --git a/.gitlab/pipelines/daily-pipeline.yml b/.gitlab/pipelines/daily-pipeline.yml
index baf0b1dd86a5ebbc49a738eea116b5b87ce50810..0aa97728d1d9ee46a854b420ac6f55c4ef7f2c24 100644
--- a/.gitlab/pipelines/daily-pipeline.yml
+++ b/.gitlab/pipelines/daily-pipeline.yml
@@ -84,3 +84,4 @@ merge-all-coverage:
   dependencies:
     - check-ut
     - scmi-test
+    - fvp-boot-test
diff --git a/.gitlab/pipelines/deployment-pipeline.yml b/.gitlab/pipelines/deployment-pipeline.yml
index 01cc8109d6465f659887566e9f485e42aa188f4c..8f1b79e71ca77a22b829ff92712bdd9f08bfc829 100644
--- a/.gitlab/pipelines/deployment-pipeline.yml
+++ b/.gitlab/pipelines/deployment-pipeline.yml
@@ -164,3 +164,4 @@ merge-all-coverage:
     - pull-mr
     - check-ut
     - scmi-test
+    - fvp-boot-test
diff --git a/.gitlab/templates/platform-test.yml b/.gitlab/templates/platform-test.yml
index da3ec97e2a7114b315d9adc82f0110229a22efbc..8270e7d83843f17abb0c407013120e35ceac41cc 100644
--- a/.gitlab/templates/platform-test.yml
+++ b/.gitlab/templates/platform-test.yml
@@ -32,19 +32,10 @@
         - sgi575
         - tc2
   artifacts:
-    when: on_failure
+    when: always
     expire_in: 2 days
     paths:
-      - wspace/scp-boot-tests/fvp-*/run/uart*.txt
-      - wspace/scp-boot-tests/fvp-*/run/model_log.txt
-      - wspace/scp-boot-tests/fvp-*/run/run.sh
-      - wspace/scp-boot-tests/fvp-*/artefacts/build.log
-      - wspace/scp-boot-tests/fvp-*/artefacts/debug/model_params
-      - wspace/scp-boot-tests/fvp-*/artefacts/debug/bl*.bin
-      - wspace/scp-boot-tests/fvp-*/artefacts/debug/scp*.bin
-      - wspace/scp-boot-tests/fvp-*/artefacts/debug/fip.bin
-      - wspace/scp-boot-tests/fvp-*/artefacts/debug/initrd.bin
-      - wspace/scp-boot-tests/fvp-*/artefacts/debug/kernel.bin
+      - artifacts
 
 .board-test-build:
   extends: .platform-test