diff --git a/script/gen_fvp_tftf_yaml.sh b/script/gen_fvp_tftf_yaml.sh
index caf1d0a..99295f9 100755
--- a/script/gen_fvp_tftf_yaml.sh
+++ b/script/gen_fvp_tftf_yaml.sh
@@ -17,22 +17,38 @@
 job_name: fvp-tftf-{MODEL}
 
 timeouts:
+  job:
+    minutes: 60
+  action:
+    minutes: 50
+  actions:
+    auto-login-action:
+      seconds: 300
+    lava-test-monitor:
+      minutes: 45
+    lava-test-shell:
+      seconds: 300
+    lava-test-retry:
+      seconds: 300
+    http-download:
+      seconds: 120
+    download-retry:
+      seconds: 120
+    fvp-deploy:
+      seconds: 300
   connection:
     minutes: 3
   connections:
+    lava-test-retry:
+      seconds: 300
     lava-test-monitor:
-      minutes: 10
-  job:
-    minutes: 60
-  actions:
-    auto-login-action:
-      minutes: 5
-    http-download:
-      minutes: 2
-    download-retry:
-      minutes: 2
-    fvp-deploy:
-      minutes: 5
+      seconds: 300
+    lava-test-shell:
+      seconds: 300
+    bootloader-action:
+      seconds: 300
+    bootloader-retry:
+      seconds: 300
 
 priority: medium
 visibility: public
@@ -129,8 +145,6 @@
 {BOOT_ARGUMENTS}
 
 - test:
-    timeout:
-      minutes: 30
 
     monitors:
     - name: TFTF