diff --git a/build_library/create_legacy_bootloader_templates.sh b/build_library/create_legacy_bootloader_templates.sh
index 884f8e9647..3b8ff39694 100755
--- a/build_library/create_legacy_bootloader_templates.sh
+++ b/build_library/create_legacy_bootloader_templates.sh
@@ -55,7 +55,7 @@ verity_common="${verity_common} dm_verity.dev_wait=${dev_wait}"
 # Populate the x86 rootfs to support legacy and EFI bios config templates.
 # The templates are used by the installer to populate partition 12 with
 # the correct bootloader configuration.
-if [[ "${FLAGS_arch}" == "x86" ]]; then
+if [ "${FLAGS_arch}" = "x86" -o "${FLAGS_arch}" = "amd64"  ]; then
   # TODO: For some reason the /dev/disk/by-uuid is not being generated by udev
   # in the initramfs. When we figure that out, switch to root=UUID=${UUID}.
   sudo mkdir -p ${FLAGS_to}