diff --git a/reset_uki_cmdline.sh b/reset_uki_cmdline.sh
index e5fe01e..24f123c 100755
--- a/reset_uki_cmdline.sh
+++ b/reset_uki_cmdline.sh
@@ -57,12 +57,29 @@
   local stateful_fs_dir="${tmpdir}/stateful"
   local esp_fs_dir="${tmpdir}/esp"
   local vmlinux="/build/${BOARD}/usr/src/linux/build/vmlinux"
+  local efi_arch=""
+  if [[ "${ARCH}" == "amd64" ]]; then
+    efi_arch="x64"
+  elif [[ "${ARCH}" == "arm64" ]]; then
+    efi_arch="aa64"
+  else
+    error "Unsupported architecture: ${ARCH}"
+    exit 1
+  fi
+  local boot_efi="boot${efi_arch}.efi"
+  local shim_efi="shim${efi_arch}.efi"
 
   trap "check_full_disk ; unmount_image ; rm -r ${tmpdir}" EXIT
   mount_image "${image}" "${root_fs_dir}" "${stateful_fs_dir}" \
     "${esp_fs_dir}" --safe
-
-  sudo mv "${esp_fs_dir}/${kernel}" "${esp_fs_dir}/efi/boot/bootx64.efi"
+  if [[ ! -f "${esp_fs_dir}/${kernel}" ]]; then
+    info "Kernel ${kernel} not found in ${esp_fs_dir}; skipping reset_cmdline"
+    unmount_image
+    rm -r "${tmpdir}"
+    trap - EXIT
+    return 0
+  fi
+  sudo mv "${esp_fs_dir}/${kernel}" "${esp_fs_dir}/efi/boot/${boot_efi}"
 
   unmount_image
   trap - EXIT
@@ -74,9 +91,9 @@
   mount_image "${image}" "${root_fs_dir}" "${stateful_fs_dir}" \
     "${esp_fs_dir}" --safe
 
-  sudo mv "${esp_fs_dir}/efi/boot/bootx64.efi" "${esp_fs_dir}/${kernel}"
-  sudo cp "${esp_fs_dir}/efi/boot/shimx64.efi" \
-    "${esp_fs_dir}/efi/boot/bootx64.efi"
+  sudo mv "${esp_fs_dir}/efi/boot/${boot_efi}" "${esp_fs_dir}/${kernel}"
+  sudo cp "${esp_fs_dir}/efi/boot/${shim_efi}" \
+    "${esp_fs_dir}/efi/boot/${boot_efi}"
 
   unmount_image
   trap - EXIT
diff --git a/set_uki_boot.sh b/set_uki_boot.sh
index 2e87dc7..32e8d1a 100755
--- a/set_uki_boot.sh
+++ b/set_uki_boot.sh
@@ -66,6 +66,17 @@
   local root_fs_dir="${tmpdir}/rootfs"
   local stateful_fs_dir="${tmpdir}/stateful"
   local esp_fs_dir="${tmpdir}/esp"
+  local efi_arch=""
+  if [[ "${ARCH}" == "amd64" ]]; then
+    efi_arch="x64"
+  elif [[ "${ARCH}" == "arm64" ]]; then
+    efi_arch="aa64"
+  else
+    error "Unsupported architecture: ${ARCH}"
+    exit 1
+  fi
+  local boot_efi="boot${efi_arch}.efi"
+  local shim_efi="shim${efi_arch}.efi"
 
   trap "check_full_disk ; unmount_image ; rm -r ${tmpdir}" EXIT
   mount_image "${image}" "${root_fs_dir}" "${stateful_fs_dir}" \
@@ -76,13 +87,13 @@
     exit 0
   fi
 
-  sudo rm -f "${esp_fs_dir}/efi/boot/bootx64.efi"
+  sudo rm -f "${esp_fs_dir}/efi/boot/${boot_efi}"
   sudo mv "${esp_fs_dir}/syslinux/vmlinuz.A" \
-    "${esp_fs_dir}/efi/boot/bootx64.efi"
+    "${esp_fs_dir}/efi/boot/${boot_efi}"
   sudo rm -rf "${esp_fs_dir}/boot"
   sudo rm -f "${esp_fs_dir}/efi/boot/grub.cfg"
   sudo rm -f "${esp_fs_dir}/efi/boot/grub-lakitu.efi"
-  sudo rm -f "${esp_fs_dir}/efi/boot/shimx64.efi"
+  sudo rm -f "${esp_fs_dir}/efi/boot/${shim_efi}"
 
   unmount_image
   rm -r "${tmpdir}"