diff --git a/confluent_server/confluent/discovery/protocols/pxe.py b/confluent_server/confluent/discovery/protocols/pxe.py
index ab454a87..f86ef478 100644
--- a/confluent_server/confluent/discovery/protocols/pxe.py
+++ b/confluent_server/confluent/discovery/protocols/pxe.py
@@ -269,7 +269,7 @@ def proxydhcp():
             if not profile:
                 continue
             myip = socket.inet_ntoa(myipn)
-            bootfile = 'http://{0}/confluent-public/os/{1}/boot/boot.ipxe'.format(myip, profile).encode('utf8')
+            bootfile = 'http://{0}/confluent-public/os/{1}/boot.ipxe'.format(myip, profile).encode('utf8')
         elif disco['arch'] == 'uefi-x64':
             bootfile = b'confluent/x86_64/ipxe.efi'
         elif disco['arch'] == 'bios-x86':
@@ -594,4 +594,4 @@ def consider_discover(info, packet, sock, cfg, reqview):
 if __name__ == '__main__':
     def testsnoop(info):
         print(repr(info))
-    snoop(testsnoop)
\ No newline at end of file
+    snoop(testsnoop)
diff --git a/confluent_server/confluent/osimage.py b/confluent_server/confluent/osimage.py
index 261c1d93..a58b3518 100644
--- a/confluent_server/confluent/osimage.py
+++ b/confluent_server/confluent/osimage.py
@@ -114,14 +114,14 @@ def update_boot_linux(profiledir, profile, label):
     for initramfs in initrds:
         ipxeargs += " initrd=" + initramfs
     oum = os.umask(0o22)
-    ipout = os.open(profiledir + '/boot/boot.ipxe', os.O_WRONLY|os.O_CREAT, 0o644)
+    ipout = os.open(profiledir + '/boot.ipxe', os.O_WRONLY|os.O_CREAT, 0o644)
     ipxeout = os.fdopen(ipout, 'w')
     try:
         os.umask(oum)
         ipxeout.write('#!ipxe\n')
-        ipxeout.write('imgfetch kernel ' + ipxeargs + '\n')
+        ipxeout.write('imgfetch boot/kernel ' + ipxeargs + '\n')
         for initramfs in initrds:
-            ipxeout.write('imgfetch initramfs/{0}\n'.format(initramfs))
+            ipxeout.write('imgfetch boot/initramfs/{0}\n'.format(initramfs))
         ipxeout.write('imgload kernel\nimgexec kernel\n')
     finally:
         ipxeout.close()