diff --git a/share/live/aarch64.tmpl b/share/live/aarch64.tmpl
index c7b4e84a..d4a3e385 100644
--- a/share/live/aarch64.tmpl
+++ b/share/live/aarch64.tmpl
@@ -54,7 +54,7 @@ mkdir ${KERNELDIR}
         %>
         treeinfo images-${basearch} ${img|basename} ${img}
     %endfor
-    <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch=efiarch, isolabel=isolabel"/>
+    <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch32=None, efiarch64=efiarch, isolabel=isolabel"/>
 %endif
 
 # Create optional product.img and updates.img
diff --git a/share/live/efi.tmpl b/share/live/efi.tmpl
index 096137e7..fcd9e9ad 100644
--- a/share/live/efi.tmpl
+++ b/share/live/efi.tmpl
@@ -11,7 +11,7 @@ mkdir ${EFIBOOTDIR}/fonts/
 %if exists("usr/share/shim/lockdown.efi"):
 	install usr/share/shim/lockdown.efi ${EFIBOOTDIR}/
 %endif
-%if efiarch64
+%if efiarch64:
 install boot/efi/EFI/*/shim${efiarch64|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch64}.EFI
 install boot/efi/EFI/*/mm${efiarch64|lower}.efi ${EFIBOOTDIR}/
 install boot/efi/EFI/*/gcd${efiarch64|lower}.efi ${EFIBOOTDIR}/grub${efiarch64|lower}.efi