diff --git a/templates/common-boot-tpl-reboot.yaml b/templates/common-boot-tpl-reboot.yaml
index ff4c2d1a7981f88ba32f975b623403db71b394fd..3f0db6e500d1a850fcad8542c9a42a70a1e99aab 100644
--- a/templates/common-boot-tpl-reboot.yaml
+++ b/templates/common-boot-tpl-reboot.yaml
@@ -17,8 +17,6 @@
         login_commands:
           - sudo su
       prompts:
-        - 'user@apertis:'
         - '\$ '
-        - ' # '
-
-
+        - '/home/user #'
+        - '/tmp #'
diff --git a/templates/common-boot-tpl.yaml b/templates/common-boot-tpl.yaml
index db369a2e7a64d309df0711ef0adb19f2dc4c1279..7a876ce35dae9d9289bb84d6045499fe0ca3e703 100644
--- a/templates/common-boot-tpl.yaml
+++ b/templates/common-boot-tpl.yaml
@@ -118,9 +118,9 @@ actions:
         login_commands:
           - sudo su
       prompts:
-        - 'user@apertis:'
         - '\$ '
-        - ' # '
+        - '/home/user #'
+        - '/tmp #'
 
   - test:
       timeout:
diff --git a/templates/common-minnowboard-boot-tpl.yaml b/templates/common-minnowboard-boot-tpl.yaml
index 203cb928174642cb63eebbb58e139c6323032087..a053a39d40bdf7a1d09b49f1580204ed9e2fc103 100644
--- a/templates/common-minnowboard-boot-tpl.yaml
+++ b/templates/common-minnowboard-boot-tpl.yaml
@@ -119,9 +119,9 @@ actions:
         login_commands:
           - sudo su
       prompts:
-        - 'user@apertis:'
         - '\$ '
-        - ' # '
+        - '/home/user #'
+        - '/tmp #'
 
   - test:
       timeout:
diff --git a/templates/common-qemu-boot-tpl.yaml b/templates/common-qemu-boot-tpl.yaml
index 86a3c743a462a53e0c56891de48eac09cd73fd2a..8cf332423243d08f60aac40db818b02cc226fef6 100644
--- a/templates/common-qemu-boot-tpl.yaml
+++ b/templates/common-qemu-boot-tpl.yaml
@@ -67,8 +67,7 @@ actions:
           - sudo su
       prompts:
         - 'user@apertis:'
-        - '\$ '
-        - ' # '
+        - 'root@apertis:'
 
   - test:
       timeout: