diff --git a/run_config/fvp-aemv8a.memprotect b/run_config/fvp-aemv8a.memprotect
index efaa0c9..b9b3450 100644
--- a/run_config/fvp-aemv8a.memprotect
+++ b/run_config/fvp-aemv8a.memprotect
@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2019-2022, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2023, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
 post_tf_build() {
-	get_uboot_bin
+	url="$uboot_url" filename="uboot.bin" fetch_and_archive
 }
 
 generate_lava_job() {
diff --git a/run_config/fvp-aemv8a.rst31 b/run_config/fvp-aemv8a.rst31
index dcf81d5..1d71848 100644
--- a/run_config/fvp-aemv8a.rst31
+++ b/run_config/fvp-aemv8a.rst31
@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2019-2022, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2023, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
 post_tf_build() {
-	get_uboot_bin
+	url="$uboot_url" filename="uboot.bin" fetch_and_archive
 }
 
 generate_lava_job() {
diff --git a/run_config/fvp-cortexa57x4a53x4.rst31 b/run_config/fvp-cortexa57x4a53x4.rst31
index f1bfab8..cb132be 100644
--- a/run_config/fvp-cortexa57x4a53x4.rst31
+++ b/run_config/fvp-cortexa57x4a53x4.rst31
@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2019-2022, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2023, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
 post_tf_build() {
-	get_uboot_bin
+	url="$uboot_url" filename="uboot.bin" fetch_and_archive
 }
 
 generate_lava_job() {
diff --git a/run_config/fvp-fip.morello b/run_config/fvp-fip.morello
index 31e6a98..60090c2 100644
--- a/run_config/fvp-fip.morello
+++ b/run_config/fvp-fip.morello
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2021-2022 Arm Limited. All rights reserved.
+# Copyright (c) 2021-2023 Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -35,7 +35,7 @@
 	archive_file "mcp_fw.bin"
 
 	# Fetch BL33 [uefi.bin] for Morello
-	uefi_ci_bin_url="$morello_prebuilts/uefi.bin" get_uefi_bin
+	url="$morello_prebuilts/uefi.bin" filename="uefi.bin" fetch_and_archive
 
 	# Create FIP for BL2, BL31, and BL33
 	build_fip BL31="$bl31" BL2="$bl2" BL33="$archive/uefi.bin"
diff --git a/run_config/fvp-fip.uboot b/run_config/fvp-fip.uboot
index 62957a9..562fa2a 100644
--- a/run_config/fvp-fip.uboot
+++ b/run_config/fvp-fip.uboot
@@ -6,6 +6,6 @@
 #
 
 post_tf_build() {
-	get_uboot_bin
+	url="$uboot_url" filename="uboot.bin" fetch_and_archive
 	build_fip BL33="$archive/uboot.bin"
 }
diff --git a/run_config/fvp-fip.uboot+bl32 b/run_config/fvp-fip.uboot+bl32
index 3c74921..d32a65a 100644
--- a/run_config/fvp-fip.uboot+bl32
+++ b/run_config/fvp-fip.uboot+bl32
@@ -6,7 +6,7 @@
 #
 
 post_tf_build() {
-	get_uboot_bin
-	get_optee_bin
+	url="$uboot_url" filename="uboot.bin" fetch_and_archive
+	url="$tfa_downloads/optee/tee.bin" filename="bl32.bin" fetch_and_archive
 	build_fip BL33="$archive/uboot.bin" BL32="$archive/bl32.bin"
 }
diff --git a/run_config/fvp-fip.uboot32 b/run_config/fvp-fip.uboot32
index 98259ef..e03b8fc 100644
--- a/run_config/fvp-fip.uboot32
+++ b/run_config/fvp-fip.uboot32
@@ -6,6 +6,7 @@
 #
 
 post_tf_build() {
-	get_uboot32_bin
+	url="${uboot32_fip_url}" image="nt-fw.bin" output_name="uboot.bin" \
+	 get_boot_image_from_fip
 	build_fip BL33="$archive/uboot.bin"
 }
diff --git a/run_config/fvp-fip.uefi b/run_config/fvp-fip.uefi
index a7c3441..1257df8 100644
--- a/run_config/fvp-fip.uefi
+++ b/run_config/fvp-fip.uefi
@@ -6,8 +6,7 @@
 #
 
 post_tf_build() {
-
-	uefi_build_type="RELEASE" get_uefi_bin
+	url="$uefi_ci_bin_url" filename="uefi.bin" fetch_and_archive
 
 	build_fip BL33="$archive/uefi.bin"
 }
diff --git a/run_config/fvp-fip.uefi.debug b/run_config/fvp-fip.uefi.debug
index f7e0a79..1257df8 100644
--- a/run_config/fvp-fip.uefi.debug
+++ b/run_config/fvp-fip.uefi.debug
@@ -6,8 +6,7 @@
 #
 
 post_tf_build() {
-
-	get_uefi_bin
+	url="$uefi_ci_bin_url" filename="uefi.bin" fetch_and_archive
 
 	build_fip BL33="$archive/uefi.bin"
 }
diff --git a/run_config/fvp-linux b/run_config/fvp-linux
index 9c5f8bf..dd4391b 100644
--- a/run_config/fvp-linux
+++ b/run_config/fvp-linux
@@ -6,8 +6,8 @@
 #
 
 fetch_tf_resource() {
-	kernel_type="fvp-busybox-uboot" get_kernel
-	initrd_type="default" get_initrd
+	image="kernel" type="fvp-busybox-uboot" get_boot_image
+	image="initrd" type="default" get_boot_image
 }
 
 generate_lava_job_template() {
diff --git a/run_config/fvp-linux.bl33 b/run_config/fvp-linux.bl33
index 07ec712..f023adc 100644
--- a/run_config/fvp-linux.bl33
+++ b/run_config/fvp-linux.bl33
@@ -6,7 +6,7 @@
 #
 
 fetch_tf_resource() {
-	kernel_type="fvp-busybox-uboot" get_kernel
+	image="kernel" type="fvp-busybox-uboot" get_boot_image
 }
 
 generate_lava_job_template() {
diff --git a/run_config/fvp-linux.quad b/run_config/fvp-linux.quad
index 860a395..5d275ea 100644
--- a/run_config/fvp-linux.quad
+++ b/run_config/fvp-linux.quad
@@ -6,8 +6,8 @@
 #
 
 fetch_tf_resource() {
-	kernel_type="fvp-quad-busybox-uboot" get_kernel
-	initrd_type="default" get_initrd
+	image="kernel" type="fvp-quad-busybox-uboot" get_boot_image
+	image="initrd" type="default" get_boot_image
 }
 
 generate_lava_job_template() {
diff --git a/run_config/fvp-linux.rootfs b/run_config/fvp-linux.rootfs
index c5cf3c0..4a32b61 100644
--- a/run_config/fvp-linux.rootfs
+++ b/run_config/fvp-linux.rootfs
@@ -6,8 +6,8 @@
 #
 
 fetch_tf_resource() {
-	kernel_type="fvp-oe-uboot" get_kernel
-	initrd_type="dummy-ramdisk" get_initrd
+	image="kernel" type="fvp-oe-uboot" get_boot_image
+	image="initrd" type="dummy-ramdisk" get_boot_image
 	get_rootfs
 }
 
diff --git a/run_config/fvp-linux.rootfs+rst31 b/run_config/fvp-linux.rootfs+rst31
index 87c63c5..49283a0 100644
--- a/run_config/fvp-linux.rootfs+rst31
+++ b/run_config/fvp-linux.rootfs+rst31
@@ -6,8 +6,8 @@
 #
 
 fetch_tf_resource() {
-	kernel_type="fvp-oe-uboot" get_kernel
-	initrd_type="dummy-ramdisk" get_initrd
+	image="kernel" type="fvp-oe-uboot" get_boot_image
+	image="initrd" type="dummy-ramdisk" get_boot_image
 	get_rootfs
 }
 
diff --git a/run_config/fvp-linux.rst31 b/run_config/fvp-linux.rst31
index 268916b..bb42fd7 100644
--- a/run_config/fvp-linux.rst31
+++ b/run_config/fvp-linux.rst31
@@ -6,8 +6,8 @@
 #
 
 fetch_tf_resource() {
-	kernel_type="fvp-busybox-uboot" get_kernel
-	initrd_type="default" get_initrd
+	image="kernel" type="fvp-busybox-uboot" get_boot_image
+	image="initrd" type="default" get_boot_image
 }
 
 generate_lava_job_template() {
diff --git a/run_config/fvp-linux.sgi b/run_config/fvp-linux.sgi
index 24502cf..467602b 100644
--- a/run_config/fvp-linux.sgi
+++ b/run_config/fvp-linux.sgi
@@ -6,8 +6,8 @@
 #
 
 fetch_tf_resource() {
-	kernel_type="fvp-sgi-busybox" get_kernel
-	initrd_type="fvp-sgi-ramdisk" get_initrd
+	image="kernel" type="sgi-busybox" get_boot_image
+	image="initrd" type="sgi-ramdisk" get_boot_image
 
 	url="$sgi_prebuilts/grub-busybox.img" saveas="busybox.bin" fetch_file
 	url="$sgi_prebuilts/ramdisk-busybox.img" saveas="ramdisk.bin" fetch_file
diff --git a/run_config/fvp-linux.stress b/run_config/fvp-linux.stress
index 01a23a3..803235d 100644
--- a/run_config/fvp-linux.stress
+++ b/run_config/fvp-linux.stress
@@ -6,8 +6,8 @@
 #
 
 fetch_tf_resource() {
-	kernel_type="fvp-oe-uboot" get_kernel
-	initrd_type="dummy-ramdisk" get_initrd
+	image="kernel" type="fvp-oe-uboot" get_boot_image
+	image="initrd" type="dummy-ramdisk" get_boot_image
 
 	tmp_dir="$(mktempdir)"
 	ln -s "${img_file:?}" "$archive/rootfs.bin"
diff --git a/run_config/fvp-linux.tc b/run_config/fvp-linux.tc
index 6f18b36..206edcd 100644
--- a/run_config/fvp-linux.tc
+++ b/run_config/fvp-linux.tc
@@ -100,8 +100,8 @@
 }
 
 fetch_tf_resource() {
-	kernel_type="fvp-tc-kernel" get_kernel
-	initrd_type="fvp-tc-ramdisk" get_initrd
+	image="kernel" type="tc-kernel" get_boot_image
+	image="initrd" type="tc-ramdisk" get_boot_image
 
 	# Use SCP binary from SCP build if it exists, or fetch pre-built ones.
 	if [ ! -f "$archive/scp_rom.bin" ]; then
diff --git a/run_config/fvp-linux32 b/run_config/fvp-linux32
index ded67c5..a138b47 100644
--- a/run_config/fvp-linux32
+++ b/run_config/fvp-linux32
@@ -6,8 +6,8 @@
 #
 
 fetch_tf_resource() {
-	kernel_type="fvp-aarch32-zimage" get_kernel
-	initrd_type="aarch32-ramdisk" get_initrd
+	image="kernel" type="fvp-aarch32-zimage" get_boot_image
+	image="initrd" type="aarch32-ramdisk" get_boot_image
 }
 
 generate_lava_job_template() {
diff --git a/run_config/fvp-linux32.rstspmin b/run_config/fvp-linux32.rstspmin
index a71fb63..99d6fda 100644
--- a/run_config/fvp-linux32.rstspmin
+++ b/run_config/fvp-linux32.rstspmin
@@ -6,8 +6,8 @@
 #
 
 fetch_tf_resource() {
-	kernel_type="fvp-aarch32-zimage" get_kernel
-	initrd_type="aarch32-ramdisk" get_initrd
+	image="kernel" type="fvp-aarch32-zimage" get_boot_image
+	image="initrd" type="aarch32-ramdisk" get_boot_image
 }
 
 generate_lava_job_template() {
diff --git a/run_config/fvp-linux32.stress b/run_config/fvp-linux32.stress
index 8f623cf..8bda1c1 100644
--- a/run_config/fvp-linux32.stress
+++ b/run_config/fvp-linux32.stress
@@ -6,8 +6,8 @@
 #
 
 fetch_tf_resource() {
-	kernel_type="fvp-oe-uboot32" get_kernel
-	initrd_type="dummy-ramdisk32" get_initrd
+	image="kernel" type="fvp-oe-uboot32" get_boot_image
+	image="initrd" type="dummy-ramdisk32" get_boot_image
 
 	tmp_dir="$(mktempdir)"
 	ln -s "${img_file:?}" "$archive/rootfs.bin"
diff --git a/run_config/fvp-optee b/run_config/fvp-optee
index 4419064..85e71c3 100644
--- a/run_config/fvp-optee
+++ b/run_config/fvp-optee
@@ -6,5 +6,5 @@
 #
 
 post_tf_build() {
-	get_optee_bin
+	url="$tfa_downloads/optee/tee.bin" filename="bl32.bin" fetch_and_archive
 }