diff --git a/.gitlab/lava/corstone1000-mps3/ptest.yml.j2 b/.gitlab/lava/corstone1000-mps3/ptest.yml.j2
index 9a702f62a0f421da05fc119184486663fa5b5668..96c376fb32fe13f1cc6f8623b37d50cf66bb4d7f 100644
--- a/.gitlab/lava/corstone1000-mps3/ptest.yml.j2
+++ b/.gitlab/lava/corstone1000-mps3/ptest.yml.j2
@@ -131,13 +131,14 @@ actions:
     timeout:
       minutes: 480
     auto_login:
-      login_prompt: 'CASSINI unstable corstone1000-mps3 ttyAMA0'
+      login_prompt: 'corstone1000-mps3 login:.*'
       username: cassini
       login_commands:
       - cassini123
       - cassini123
       - sudo su
     prompts:
+      - 'Password: '
       - 'New password: '
       - 'Re-enter new password: '
       - '(.*)corstone1000-mps3:'
diff --git a/.gitlab/lava/corstone1000-mps3/sanity_job.yml.j2 b/.gitlab/lava/corstone1000-mps3/sanity_job.yml.j2
index 4a1493879cf089b7a08bc878c67633691bb1a8c9..feadfc9289277f38a1204ff87bebe29c060896dd 100644
--- a/.gitlab/lava/corstone1000-mps3/sanity_job.yml.j2
+++ b/.gitlab/lava/corstone1000-mps3/sanity_job.yml.j2
@@ -6,7 +6,7 @@ device_type: mps3
 job_name: {{ CI_JOB_NAME }}
 timeouts:
   job:
-    minutes: 560
+    minutes: 680
 
 metadata:
   source: {{ CI_PROJECT_URL }}
@@ -128,9 +128,9 @@ actions:
     namespace: secondary_media
     method: minimal
     timeout:
-      minutes: 480
+      minutes: 580
     auto_login:
-      login_prompt: 'CASSINI unstable corstone1000-mps3 ttyAMA0'
+      login_prompt: 'corstone1000-mps3 login:.*'
       username: cassini
       login_commands:
       - cassini123