diff --git a/cmd/pixiecore/main.go b/cmd/pixiecore/main.go
index 6849193..e76bee3 100644
--- a/cmd/pixiecore/main.go
+++ b/cmd/pixiecore/main.go
@@ -23,6 +23,7 @@ import (
 func main() {
 	cli.Ipxe[pixiecore.FirmwareX86PC] = ipxe.MustAsset("undionly.kpxe")
 	cli.Ipxe[pixiecore.FirmwareEFI32] = ipxe.MustAsset("ipxe-i386.efi")
+  cli.Ipxe[pixiecore.FirmwareEFIBC] = ipxe.MustAsset("ipxe-x86_64.efi")
 	cli.Ipxe[pixiecore.FirmwareEFI64] = ipxe.MustAsset("ipxe-x86_64.efi")
 	cli.CLI()
 }
diff --git a/pixiecore/cli/cli.go b/pixiecore/cli/cli.go
index 1a71b19..06dc197 100644
--- a/pixiecore/cli/cli.go
+++ b/pixiecore/cli/cli.go
@@ -156,9 +156,11 @@ func serverFromFlags(cmd *cobra.Command) *pixiecore.Server {
 		ret.Ipxe[pixiecore.FirmwareEFI32] = mustFile(ipxeEFI32)
 	}
 	if ipxeEFI64 != "" {
-		ret.Ipxe[pixiecore.FirmwareEFI64] = mustFile(ipxeEFI64)
 		ret.Ipxe[pixiecore.FirmwareEFIBC] = mustFile(ipxeEFI64)
 	}
+	if ipxeEFI64 != "" {
+		ret.Ipxe[pixiecore.FirmwareEFI64] = mustFile(ipxeEFI64)
+	}
 
 	if timestamps {
 		ret.Log = logWithStdLog