diff --git a/README.md b/README.md
index ca36f85..1d802b1 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,8 @@ pxe-service=X86-64_EFI,"PXE (UEFI)","grubx64.efi"
       + Ensure the syslinux-common package is installed, then `cp /usr/lib/syslinux/modules/bios/ldlinux.c32 /srv/tftp/`
     - pxelinux.cfg/default (checked into this repo)
   + efi (follow https://ubuntu.com/server/docs/how-to/installation/how-to-netboot-the-server-installer-on-amd64/#set-up-the-files-for-uefi-booting)
-    - grub.cfg/default (checked into this repo)
+    - grub/grub.cfg (checked into this repo)
     - bootx64.efi
     - grubx64.efi 
     - unicode.pf
+
diff --git a/config_files/etc/dnsmasq.d/pxe.conf b/config_files/etc/dnsmasq.d/pxe.conf
index ed137f6..d6aad73 100644
--- a/config_files/etc/dnsmasq.d/pxe.conf
+++ b/config_files/etc/dnsmasq.d/pxe.conf
@@ -2,6 +2,7 @@ interface=enx9cbf0d007794
 domain=yourdomain.com
 dhcp-range=192.168.0.3,192.168.0.253,255.255.255.0,1h
 pxe-service=x86PC, "PXELINUX (BIOS)", "pxelinux.0"
-pxe-service=X86-64_EFI,"PXE (UEFI)","grubx64.efi"
+dhcp-match=set:efi-x86_64,option:client-arch,7
+dhcp-boot=tag:efi-x86_64,bootx64.efi
 enable-tftp
 tftp-root=/srv/tftp