diff --git a/run_config/fvp-aemv8r.linux b/run_config/fvp-aemv8r.linux
index 29c9a9c..74598c0 100755
--- a/run_config/fvp-aemv8r.linux
+++ b/run_config/fvp-aemv8r.linux
@@ -7,10 +7,10 @@
 
 post_tf_build() {
 	# Download and archive FVP-R files
-	url="$tfa_downloads/fvp_r/core-image-minimal-fvp-baser-aemv8r64.wic" saveas="rootfs.bin" fetch_file
-	url="$tfa_downloads/fvp_r/fvp-baser-aemv8r64.dtb" saveas="dtb.bin" fetch_file
-	url="$tfa_downloads/fvp_r/Image" saveas="kernel.bin" fetch_file
-	url="$tfa_downloads/fvp_r/u-boot.bin" saveas="uboot.bin" fetch_file
+	url="$tfa_downloads/fvp_r_2023/core-image-minimal-fvp-baser-aemv8r64.wic" saveas="rootfs.bin" fetch_file
+	url="$tfa_downloads/fvp_r_2023/fvp-baser-aemv8r64.dtb" saveas="dtb.bin" fetch_file
+	url="$tfa_downloads/fvp_r_2023/Image" saveas="kernel.bin" fetch_file
+	url="$tfa_downloads/fvp_r_2023/u-boot.bin" saveas="uboot.bin" fetch_file
 
 	archive_file "rootfs.bin"
 	archive_file "dtb.bin"
@@ -28,10 +28,11 @@
 generate_lava_job() {
 	local model="baser-aemv8r"
 
+	uart="0" set_expect_variable "num_cpus" "1"
 	uart="0" file="fvp-r-yocto.exp" track_expect
 
 	model="$model" \
-		dtb_addr="0x03000000" \
+		dtb_addr="0x0fc00000" \
 		fip_addr="0x40000000" \
 		kernel_addr="0x00800000" \
 		gen_model_params