diff --git a/model/fvp_common.sh b/model/fvp_common.sh
index f1e126a..608fc66 100644
--- a/model/fvp_common.sh
+++ b/model/fvp_common.sh
@@ -82,22 +82,14 @@
 
 EOF
 
+# OpenCI uses LAVA to launch models, the latter requiring (uart) unbuffered output,
+# otherwise these may get full and models hang.
 if ! is_arm_jenkins_env && not_upon "$local_ci"; then
 	cat <<EOF >>"$model_param_file"
--C bp.pl011_uart0.untimed_fifos=1
--C bp.pl011_uart1.untimed_fifos=1
--C bp.pl011_uart2.untimed_fifos=1
--C bp.pl011_uart3.untimed_fifos=1
-
 -C bp.pl011_uart0.unbuffered_output=1
 -C bp.pl011_uart1.unbuffered_output=1
 -C bp.pl011_uart2.unbuffered_output=1
 -C bp.pl011_uart3.unbuffered_output=1
-
--C bp.terminal_0.start_telnet=1
--C bp.terminal_1.start_telnet=0
--C bp.terminal_2.start_telnet=0
--C bp.terminal_3.start_telnet=0
 EOF
 fi
 
diff --git a/script/gen_fvp_linux_yaml.sh b/script/gen_fvp_linux_yaml.sh
index 903c48d..76a2032 100755
--- a/script/gen_fvp_linux_yaml.sh
+++ b/script/gen_fvp_linux_yaml.sh
@@ -84,6 +84,10 @@
     image: {BOOT_IMAGE_DIR}/{BOOT_IMAGE_BIN}
     version_string: {BOOT_VERSION_STRING}
     console_string: 'terminal_0: Listening for serial connection on port (?P<PORT>\d+)'
+    feedbacks:
+      - '(?P<NAME>terminal_1): Listening for serial connection on port (?P<PORT>\d+)'
+      - '(?P<NAME>terminal_2): Listening for serial connection on port (?P<PORT>\d+)'
+      - '(?P<NAME>terminal_3): Listening for serial connection on port (?P<PORT>\d+)'
     timeout:
       minutes: 30
     arguments:
diff --git a/script/gen_fvp_tftf_yaml.sh b/script/gen_fvp_tftf_yaml.sh
index e5a0c72..b74c20f 100755
--- a/script/gen_fvp_tftf_yaml.sh
+++ b/script/gen_fvp_tftf_yaml.sh
@@ -87,9 +87,10 @@
     image: {BOOT_IMAGE_DIR}/{BOOT_IMAGE_BIN}
     version_string: {BOOT_VERSION_STRING}
     console_string: 'terminal_0: Listening for serial connection on port (?P<PORT>\d+)'
-    timeout:
-      minutes: 30
-
+    feedbacks:
+      - '(?P<NAME>terminal_1): Listening for serial connection on port (?P<PORT>\d+)'
+      - '(?P<NAME>terminal_2): Listening for serial connection on port (?P<PORT>\d+)'
+      - '(?P<NAME>terminal_3): Listening for serial connection on port (?P<PORT>\d+)'
     arguments:
 {BOOT_ARGUMENTS}