diff --git a/src/cmd-buildextend-live b/src/cmd-buildextend-live
index b075c3c01ebbd5bc54c4d21d770ab14e24286ca2..861100a7db3287a6d8561268c529220cfe35a738 100755
--- a/src/cmd-buildextend-live
+++ b/src/cmd-buildextend-live
@@ -532,7 +532,7 @@ def generate_iso():
             # will give you the right path, but there are exceptions.
             with open(os.path.join(tmpimageefidir, "BOOT", "grub.cfg"), "w") as fh:
                 fh.write(f'''search --label "{volid}" --set root --no-floppy
-set prefix=($root)/EFI/anolis
+set prefix=($root)/EFI/lifsea
 configfile $prefix/grub.cfg
 boot
 ''')
diff --git a/src/cmd-buildextend-metal b/src/cmd-buildextend-metal
index 10a782b97d33e00bfda3c5ffaab4c87147d91a18..8790719e345469f6801ccca07841e205c3642dbc 100755
--- a/src/cmd-buildextend-metal
+++ b/src/cmd-buildextend-metal
@@ -64,7 +64,7 @@ if [ $# -ne 0 ]; then
 fi
 
 case "$basearch" in
-    "x86_64") ;;
+    "x86_64"|"aarch64") ;;
     *) fatal "$basearch is not supported for this command" ;;
 esac
 
diff --git a/src/cmdlib.sh b/src/cmdlib.sh
index d30835837342c44e3db95ea09ed6fe10021528ac..41621f3af5bd14a13ef454c41ab6768c6411964e 100755
--- a/src/cmdlib.sh
+++ b/src/cmdlib.sh
@@ -43,7 +43,7 @@ arch=$(uname -m)
 export arch
 
 case $arch in
-    "x86_64")  DEFAULT_TERMINAL="ttyS0"   ;;
+    "x86_64"|"aarch64")  DEFAULT_TERMINAL="ttyS0"   ;;
     *)         fatal "Architecture $(arch) not supported"
 esac
 export DEFAULT_TERMINAL
diff --git a/src/vmdeps-aarch64.txt b/src/vmdeps-aarch64.txt
new file mode 100644
index 0000000000000000000000000000000000000000..24392543766842c307a2487993634aced4f6e04b
--- /dev/null
+++ b/src/vmdeps-aarch64.txt
@@ -0,0 +1,6 @@
+# For grub install when creating images without anaconda
+grub2
+bootupd
+
+# For creating bootable UEFI media on x86_64
+shim-aa64 grub2-efi-aa64