android x15-v2: update boot prompt

from shell@am57xevm: to am57xevm:

Change-Id: If0c848ba895dd0f9b033515d0dda7473becdb7bc
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
diff --git a/android/x15-v2/template-andebenchpro2015.yaml b/android/x15-v2/template-andebenchpro2015.yaml
index 709d4a7..1732484 100644
--- a/android/x15-v2/template-andebenchpro2015.yaml
+++ b/android/x15-v2/template-andebenchpro2015.yaml
@@ -40,7 +40,7 @@
     namespace: tlxc
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 5
     method: lxc
@@ -91,7 +91,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/x15-v2/template-antutu6.yaml b/android/x15-v2/template-antutu6.yaml
index 003c0fa..5e10902 100644
--- a/android/x15-v2/template-antutu6.yaml
+++ b/android/x15-v2/template-antutu6.yaml
@@ -40,7 +40,7 @@
     namespace: tlxc
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 5
     method: lxc
@@ -91,7 +91,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/x15-v2/template-benchmarkpi.yaml b/android/x15-v2/template-benchmarkpi.yaml
index 7f0c9b8..d78c47e 100644
--- a/android/x15-v2/template-benchmarkpi.yaml
+++ b/android/x15-v2/template-benchmarkpi.yaml
@@ -40,7 +40,7 @@
     namespace: tlxc
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 5
     method: lxc
@@ -91,7 +91,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/x15-v2/template-boottime.yaml b/android/x15-v2/template-boottime.yaml
index ba12ed3..5bf7aa6 100644
--- a/android/x15-v2/template-boottime.yaml
+++ b/android/x15-v2/template-boottime.yaml
@@ -40,7 +40,7 @@
     namespace: tlxc
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 5
     method: lxc
@@ -91,7 +91,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
@@ -119,7 +119,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
@@ -143,7 +143,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
@@ -167,7 +167,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
@@ -191,7 +191,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
@@ -215,7 +215,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
@@ -239,7 +239,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
@@ -263,7 +263,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
@@ -287,7 +287,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
@@ -318,7 +318,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/x15-v2/template-caffeinemark.yaml b/android/x15-v2/template-caffeinemark.yaml
index 3c08ddc..ff77dd5 100644
--- a/android/x15-v2/template-caffeinemark.yaml
+++ b/android/x15-v2/template-caffeinemark.yaml
@@ -40,7 +40,7 @@
     namespace: tlxc
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 5
     method: lxc
@@ -91,7 +91,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/x15-v2/template-cf-bench.yaml b/android/x15-v2/template-cf-bench.yaml
index 5f966c7..0e43421 100644
--- a/android/x15-v2/template-cf-bench.yaml
+++ b/android/x15-v2/template-cf-bench.yaml
@@ -40,7 +40,7 @@
     namespace: tlxc
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 5
     method: lxc
@@ -91,7 +91,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/x15-v2/template-cts-focused1-v7a.yaml b/android/x15-v2/template-cts-focused1-v7a.yaml
index bbdc659..a42f5e6 100644
--- a/android/x15-v2/template-cts-focused1-v7a.yaml
+++ b/android/x15-v2/template-cts-focused1-v7a.yaml
@@ -40,7 +40,7 @@
     namespace: tlxc
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 5
     method: lxc
@@ -91,7 +91,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/x15-v2/template-cts-focused2-v7a.yaml b/android/x15-v2/template-cts-focused2-v7a.yaml
index 8049072..8bdeabe 100644
--- a/android/x15-v2/template-cts-focused2-v7a.yaml
+++ b/android/x15-v2/template-cts-focused2-v7a.yaml
@@ -40,7 +40,7 @@
     namespace: tlxc
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 5
     method: lxc
@@ -91,7 +91,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/x15-v2/template-cts-media-v7a.yaml b/android/x15-v2/template-cts-media-v7a.yaml
index ec25d97..a25c089 100644
--- a/android/x15-v2/template-cts-media-v7a.yaml
+++ b/android/x15-v2/template-cts-media-v7a.yaml
@@ -42,7 +42,7 @@
     namespace: tlxc
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 5
     method: lxc
@@ -93,7 +93,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/x15-v2/template-cts-media2-v7a.yaml b/android/x15-v2/template-cts-media2-v7a.yaml
index b6d06f6..47d65e6 100644
--- a/android/x15-v2/template-cts-media2-v7a.yaml
+++ b/android/x15-v2/template-cts-media2-v7a.yaml
@@ -40,7 +40,7 @@
     namespace: tlxc
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 5
     method: lxc
@@ -91,7 +91,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/x15-v2/template-cts-opengl-v7a.yaml b/android/x15-v2/template-cts-opengl-v7a.yaml
index e3bd486..d372738 100644
--- a/android/x15-v2/template-cts-opengl-v7a.yaml
+++ b/android/x15-v2/template-cts-opengl-v7a.yaml
@@ -40,7 +40,7 @@
     namespace: tlxc
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 5
     method: lxc
@@ -91,7 +91,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/x15-v2/template-cts-part1-v7a.yaml b/android/x15-v2/template-cts-part1-v7a.yaml
index f638829..1c6028a 100644
--- a/android/x15-v2/template-cts-part1-v7a.yaml
+++ b/android/x15-v2/template-cts-part1-v7a.yaml
@@ -40,7 +40,7 @@
     namespace: tlxc
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 5
     method: lxc
@@ -91,7 +91,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/x15-v2/template-cts-part2-v7a.yaml b/android/x15-v2/template-cts-part2-v7a.yaml
index cabb03c..a932a5c 100644
--- a/android/x15-v2/template-cts-part2-v7a.yaml
+++ b/android/x15-v2/template-cts-part2-v7a.yaml
@@ -42,7 +42,7 @@
     namespace: tlxc
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 5
     method: lxc
@@ -93,7 +93,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/x15-v2/template-cts-part3-v7a.yaml b/android/x15-v2/template-cts-part3-v7a.yaml
index da4a6ba..221c570 100644
--- a/android/x15-v2/template-cts-part3-v7a.yaml
+++ b/android/x15-v2/template-cts-part3-v7a.yaml
@@ -40,7 +40,7 @@
     namespace: tlxc
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 5
     method: lxc
@@ -91,7 +91,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/x15-v2/template-cts-part4-v7a.yaml b/android/x15-v2/template-cts-part4-v7a.yaml
index fa5e1f7..3ccd5fa 100644
--- a/android/x15-v2/template-cts-part4-v7a.yaml
+++ b/android/x15-v2/template-cts-part4-v7a.yaml
@@ -40,7 +40,7 @@
     namespace: tlxc
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 5
     method: lxc
@@ -91,7 +91,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/x15-v2/template-cts-part5-v7a.yaml b/android/x15-v2/template-cts-part5-v7a.yaml
index 2d01f01..3bb12e1 100644
--- a/android/x15-v2/template-cts-part5-v7a.yaml
+++ b/android/x15-v2/template-cts-part5-v7a.yaml
@@ -40,7 +40,7 @@
     namespace: tlxc
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 5
     method: lxc
@@ -91,7 +91,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/x15-v2/template-gearses2eclair.yaml b/android/x15-v2/template-gearses2eclair.yaml
index dae0131..eba0c0e 100644
--- a/android/x15-v2/template-gearses2eclair.yaml
+++ b/android/x15-v2/template-gearses2eclair.yaml
@@ -40,7 +40,7 @@
     namespace: tlxc
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 5
     method: lxc
@@ -91,7 +91,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/x15-v2/template-geekbench3.yaml b/android/x15-v2/template-geekbench3.yaml
index a0714e5..ad2df9e 100644
--- a/android/x15-v2/template-geekbench3.yaml
+++ b/android/x15-v2/template-geekbench3.yaml
@@ -40,7 +40,7 @@
     namespace: tlxc
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 5
     method: lxc
@@ -91,7 +91,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/x15-v2/template-glbenchmark25.yaml b/android/x15-v2/template-glbenchmark25.yaml
index ccd967c..b605155 100644
--- a/android/x15-v2/template-glbenchmark25.yaml
+++ b/android/x15-v2/template-glbenchmark25.yaml
@@ -40,7 +40,7 @@
     namespace: tlxc
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 5
     method: lxc
@@ -91,7 +91,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/x15-v2/template-javawhetstone.yaml b/android/x15-v2/template-javawhetstone.yaml
index d4cfe9d..b63a37a 100644
--- a/android/x15-v2/template-javawhetstone.yaml
+++ b/android/x15-v2/template-javawhetstone.yaml
@@ -40,7 +40,7 @@
     namespace: tlxc
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 5
     method: lxc
@@ -91,7 +91,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/x15-v2/template-jbench.yaml b/android/x15-v2/template-jbench.yaml
index cc29bfb..af5a4db 100644
--- a/android/x15-v2/template-jbench.yaml
+++ b/android/x15-v2/template-jbench.yaml
@@ -40,7 +40,7 @@
     namespace: tlxc
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 5
     method: lxc
@@ -91,7 +91,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/x15-v2/template-linpack.yaml b/android/x15-v2/template-linpack.yaml
index 8b87da3..3208214 100644
--- a/android/x15-v2/template-linpack.yaml
+++ b/android/x15-v2/template-linpack.yaml
@@ -40,7 +40,7 @@
     namespace: tlxc
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 5
     method: lxc
@@ -91,7 +91,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/x15-v2/template-quadrantpro.yaml b/android/x15-v2/template-quadrantpro.yaml
index bb56f56..2cc2fce 100644
--- a/android/x15-v2/template-quadrantpro.yaml
+++ b/android/x15-v2/template-quadrantpro.yaml
@@ -40,7 +40,7 @@
     namespace: tlxc
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 5
     method: lxc
@@ -91,7 +91,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/x15-v2/template-rl-sqlite.yaml b/android/x15-v2/template-rl-sqlite.yaml
index b3a7926..2d9cd47 100644
--- a/android/x15-v2/template-rl-sqlite.yaml
+++ b/android/x15-v2/template-rl-sqlite.yaml
@@ -40,7 +40,7 @@
     namespace: tlxc
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 5
     method: lxc
@@ -91,7 +91,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/x15-v2/template-scimark.yaml b/android/x15-v2/template-scimark.yaml
index 0647f13..1d8c686 100644
--- a/android/x15-v2/template-scimark.yaml
+++ b/android/x15-v2/template-scimark.yaml
@@ -40,7 +40,7 @@
     namespace: tlxc
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 5
     method: lxc
@@ -91,7 +91,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/x15-v2/template-vellamo3.yaml b/android/x15-v2/template-vellamo3.yaml
index b3b177a..5a01ee6 100644
--- a/android/x15-v2/template-vellamo3.yaml
+++ b/android/x15-v2/template-vellamo3.yaml
@@ -40,7 +40,7 @@
     namespace: tlxc
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 5
     method: lxc
@@ -91,7 +91,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/x15-v2/template-vts-part1.yaml b/android/x15-v2/template-vts-part1.yaml
index 9cdea6a..b09c454 100644
--- a/android/x15-v2/template-vts-part1.yaml
+++ b/android/x15-v2/template-vts-part1.yaml
@@ -40,7 +40,7 @@
     namespace: tlxc
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 5
     method: lxc
@@ -91,7 +91,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/x15-v2/template-vts-part2.yaml b/android/x15-v2/template-vts-part2.yaml
index 0de2af3..caea036 100644
--- a/android/x15-v2/template-vts-part2.yaml
+++ b/android/x15-v2/template-vts-part2.yaml
@@ -40,7 +40,7 @@
     namespace: tlxc
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 5
     method: lxc
@@ -91,7 +91,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/x15-v2/template-vts-part3.yaml b/android/x15-v2/template-vts-part3.yaml
index 9234d1e..dbc1b25 100644
--- a/android/x15-v2/template-vts-part3.yaml
+++ b/android/x15-v2/template-vts-part3.yaml
@@ -40,7 +40,7 @@
     namespace: tlxc
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 5
     method: lxc
@@ -91,7 +91,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/x15-v2/template-vts-part4.yaml b/android/x15-v2/template-vts-part4.yaml
index 3f0520e..408f693 100644
--- a/android/x15-v2/template-vts-part4.yaml
+++ b/android/x15-v2/template-vts-part4.yaml
@@ -40,7 +40,7 @@
     namespace: tlxc
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 5
     method: lxc
@@ -91,7 +91,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/x15-v2/template-vts-part5.yaml b/android/x15-v2/template-vts-part5.yaml
index 178bce3..297fd69 100644
--- a/android/x15-v2/template-vts-part5.yaml
+++ b/android/x15-v2/template-vts-part5.yaml
@@ -40,7 +40,7 @@
     namespace: tlxc
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 5
     method: lxc
@@ -91,7 +91,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/x15-v2/template-vts-part6.yaml b/android/x15-v2/template-vts-part6.yaml
index b6c249d..0c5fb5f 100644
--- a/android/x15-v2/template-vts-part6.yaml
+++ b/android/x15-v2/template-vts-part6.yaml
@@ -40,7 +40,7 @@
     namespace: tlxc
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 5
     method: lxc
@@ -91,7 +91,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/x15-v2/template-weekly.yaml b/android/x15-v2/template-weekly.yaml
index 6097084..3c17877 100644
--- a/android/x15-v2/template-weekly.yaml
+++ b/android/x15-v2/template-weekly.yaml
@@ -40,7 +40,7 @@
     namespace: tlxc
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 5
     method: lxc
@@ -91,7 +91,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/x15-v2/template.yaml b/android/x15-v2/template.yaml
index 1fa402f..ff9b656 100644
--- a/android/x15-v2/template.yaml
+++ b/android/x15-v2/template.yaml
@@ -40,7 +40,7 @@
     namespace: tlxc
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 5
     method: lxc
@@ -91,7 +91,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'shell@am57xevm:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot
@@ -128,7 +128,7 @@
     connection: serial
     prompts:
     - 'root@(.*):/#'
-    - 'hikey:/'
+    - 'am57xevm:/'
     timeout:
       minutes: 15
     method: fastboot