diff --git a/run_config/juno-linux.optee b/run_config/juno-linux.optee
index 84f9b47..485220b 100644
--- a/run_config/juno-linux.optee
+++ b/run_config/juno-linux.optee
@@ -6,9 +6,11 @@
 #
 
 post_tf_build() {
-	get_scp_bl2_bin
+	url="${scp_bl2_url}" filename="scp_bl2.bin" fetch_and_archive
 	get_ml_uboot_bin
-	get_optee_bin
+	url="${optee_fip_url}" image="tos-fw.bin" output_name="bl32.bin" \
+		get_boot_image_from_fip
+
 	build_fip BL33="$archive/uboot.bin" BL32="$archive/bl32.bin" SCP_BL2="$archive/scp_bl2.bin"
 }