diff --git a/.gitlab/lava/n1sdp/acs_suite.yml.j2 b/.gitlab/lava/n1sdp/acs_suite.yml.j2
index 83a10dc6fa6180e05080d5a8fa8612f33831582c..7282f9b2e4d3f9c65fcab14eda3403a19652ef43 100644
--- a/.gitlab/lava/n1sdp/acs_suite.yml.j2
+++ b/.gitlab/lava/n1sdp/acs_suite.yml.j2
@@ -43,9 +43,10 @@ actions:
 # enables an EFI network driver, allowing us to force a TFTP boot from GRUB (assuming cobbler is setup)
 #
 - deploy:
-    timeout:
-      seconds: 120
     namespace: recovery
+    timeout:
+      minutes: 5
+    failure_retry: 2
     to: flasher
     images:
       recovery_image:
@@ -213,6 +214,9 @@ actions:
 #
 - deploy:
     namespace: recovery
+    timeout:
+      minutes: 5
+    failure_retry: 2
     to: flasher
     images:
       recovery_image:
@@ -236,6 +240,9 @@ actions:
 
 - deploy:
     namespace: recovery
+    timeout:
+      minutes: 5
+    failure_retry: 2
     to: flasher
     images:
       recovery_image:
diff --git a/.gitlab/lava/n1sdp/ptest.yml.j2 b/.gitlab/lava/n1sdp/ptest.yml.j2
index 3646c7b96af3eae57e2f6b374f11b675841d64fc..6f666c994989d91d7f1b2e1dcdac75f2bfa252c3 100644
--- a/.gitlab/lava/n1sdp/ptest.yml.j2
+++ b/.gitlab/lava/n1sdp/ptest.yml.j2
@@ -41,7 +41,7 @@ actions:
 - deploy:
     namespace: recovery
     timeout:
-      minutes: 10
+      minutes: 5
     failure_retry: 2
     to: flasher
     images:
@@ -123,9 +123,10 @@ actions:
 #
 - deploy:
     namespace: recovery
-    to: flasher
     timeout:
-      minutes: 2
+      minutes: 5
+    failure_retry: 2
+    to: flasher
     images:
       recovery_image:
         url: "{{ FIRMWARE_ARTIFACT }}"
diff --git a/.gitlab/lava/n1sdp/sanity_job.yml.j2 b/.gitlab/lava/n1sdp/sanity_job.yml.j2
index a56d7d6682d282534261e6e4d0cf8ca0bb795fa7..d409b6922796cf4fec6791d74d40e331105c6e66 100644
--- a/.gitlab/lava/n1sdp/sanity_job.yml.j2
+++ b/.gitlab/lava/n1sdp/sanity_job.yml.j2
@@ -41,7 +41,7 @@ actions:
 - deploy:
     namespace: recovery
     timeout:
-      minutes: 10
+      minutes: 5
     failure_retry: 2
     to: flasher
     images:
@@ -123,9 +123,10 @@ actions:
 #
 - deploy:
     namespace: recovery
-    to: flasher
     timeout:
-      minutes: 2
+      minutes: 5
+    failure_retry: 2
+    to: flasher
     images:
       recovery_image:
         url: "{{ FIRMWARE_ARTIFACT }}"