diff --git a/run_config/fvp-linux.morello b/run_config/fvp-linux.morello
index 1efbcb7..7cb1460 100644
--- a/run_config/fvp-linux.morello
+++ b/run_config/fvp-linux.morello
@@ -11,7 +11,12 @@
 }
 
 generate_lava_job_template() {
-	uart="1" set_primary="1" file="linux-rd-busybox.exp" track_expect
+	uart="1" port="5003" set_primary="1" file="linux-rd-busybox.exp" \
+		track_expect
+
+	set_uart_port "${archive:?}" 0 5001
+	set_uart_port "${archive:?}" 2 5000
+	set_uart_port "${archive:?}" 3 5002
 
 	payload_type="linux" gen_fvp_yaml_template
 }
diff --git a/run_config/fvp-linux.sgi b/run_config/fvp-linux.sgi
index 31c1544..7f6ab24 100644
--- a/run_config/fvp-linux.sgi
+++ b/run_config/fvp-linux.sgi
@@ -17,12 +17,13 @@
 }
 
 generate_lava_job_template() {
-	uart="0" port="5002" file="trusted-firmware-sgi.exp" track_expect
+	uart="0" port="5004" file="trusted-firmware-sgi.exp" track_expect
 	uart="1" port="5003" file="linux-busybox-sgi.exp" timeout="1800" \
 		set_primary="1" track_expect
 
 	set_uart_port "${archive:?}" 2 5000
 	set_uart_port "${archive:?}" 3 5001
+	set_uart_port "${archive:?}" 4 5002
 
 	payload_type="linux" gen_fvp_yaml_template
 }