diff --git a/embed.ipxe b/embed.ipxe
index e9d66bc..31b906b 100644
--- a/embed.ipxe
+++ b/embed.ipxe
@@ -143,13 +143,15 @@ iseq ${platform} efi && goto is_efi || goto not_efi
 :is_efi
 # hack, see https://github.com/coreos/fedora-coreos-tracker/issues/390#issuecomment-588328137
 set squashfs squashfs.cpio.gz
-set initrd boot-initrd,squashfs.cpio.gz
+set initrd1 initrd=boot-initrd
+set initrd2 initrd=squashfs.cpio.gz
 goto get_arch
 
 # this sets different attributes for non-EFI (legacy PC) boot
 :not_efi
 set squashfs squashfs
-set initrd boot-initrd
+set initrd1 initrd=boot-initrd
+clear initrd2
 goto get_arch
 
 
@@ -233,7 +235,7 @@ echo ip-info ${ip-info}
 
 sleep 1
 
-boot boot-kernel initrd=${initrd} rootfstype=squashfs root=/squashfs ip=${ip-info} overlayroot=tmpfs:recurse=0 systemd.clock-usec=${unixtime:int32}000000 ds=nocloud-net;s=https://cloud-init.sysdeploy.org/ || goto error_handler
+boot boot-kernel ${initrd1} ${initrd2} rootfstype=squashfs root=/squashfs ip=${ip-info} overlayroot=tmpfs:recurse=0 systemd.clock-usec=${unixtime:int32}000000 ds=nocloud-net;s=https://cloud-init.sysdeploy.org/ || goto error_handler
 
 # unixtime variable must be used with int32, because that's the only way it
 #   will display as decimal digits. unit32 and string both display as hex.