diff --git a/run_config/fvp-linux.sgi b/run_config/fvp-linux.sgi
index cdc1104..31c1544 100644
--- a/run_config/fvp-linux.sgi
+++ b/run_config/fvp-linux.sgi
@@ -17,8 +17,12 @@
 }
 
 generate_lava_job_template() {
-	uart="0" file="trusted-firmware-sgi.exp" track_expect
-	uart="1" timeout="1800" set_primary="1" file="linux-busybox-sgi.exp" track_expect
+	uart="0" port="5002" 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
 
 	payload_type="linux" gen_fvp_yaml_template
 }
diff --git a/run_config/fvp-linux.tc b/run_config/fvp-linux.tc
index b309a32..c4109c4 100644
--- a/run_config/fvp-linux.tc
+++ b/run_config/fvp-linux.tc
@@ -110,8 +110,12 @@
 
 generate_lava_job_template() {
 	# Hold scp terminal_s0
-	uart="0" file="hold_uart.exp" track_expect
-	uart="1" set_primary="1" file="linux-rd-busybox.exp" track_expect
+	uart="0" port="5002" file="hold_uart.exp" track_expect
+	uart="1" port="5003" file="linux-rd-busybox.exp" set_primary="1" \
+		track_expect
+
+	set_uart_port "${archive:?}" 2 5000
+	set_uart_port "${archive:?}" 3 5001
 
 	payload_type="linux" gen_fvp_yaml_template
 }