diff --git a/run-build.sh b/run-build.sh
index 45c54db..fffe82c 100755
--- a/run-build.sh
+++ b/run-build.sh
@@ -55,20 +55,27 @@
 
 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
-mv bin/* install/outputs/fvp/
+cp -r bin/* install/outputs/fvp/
 
 cd install/outputs
-mv CYPRESS/* .
-mv MPS2/* .
-mv MPS3/* .
+cp -r CYPRESS/* .
+cp -r MPS2/* .
+cp -r MPS3/* .
 
 for file in `find | grep bl2`
 do
 	newfile=`echo $file | sed "s/bl2/mcuboot/g"`
-	mv $file $newfile
+	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