diff --git a/installer/pxe-network-installer/debian/deb_folder/rules b/installer/pxe-network-installer/debian/deb_folder/rules
index 3e4345ac..fe655a22 100644
--- a/installer/pxe-network-installer/debian/deb_folder/rules
+++ b/installer/pxe-network-installer/debian/deb_folder/rules
@@ -28,7 +28,7 @@ override_dh_install:
 	install -p -D -m 644 pxeboot.cfg.debian $(ROOT)/var/pxeboot/pxelinux.cfg.files/pxeboot.cfg.debian
 	install -p -D -m 644 efi-pxeboot.cfg.debian $(ROOT)/var/pxeboot/pxelinux.cfg.files/efi-pxeboot.cfg.debian
 	install -p -D -m 755 pxeboot_setup.sh  $(ROOT)/usr/sbin/pxeboot_setup.sh
-	install -p -D -m 755 pxeboot-update.sh %{ROOT}/usr/sbin/pxeboot-update-%{platform_release}.sh
+	install -p -D -m 755 pxeboot-update.sh ${ROOT}/usr/sbin/pxeboot-update-${platform_release}.sh
 
 	# Legacy BIOS System Node Install grub menus
 	install -p -D -m 700     debian-pxe-controller-install  $(ROOT)/var/pxeboot/pxelinux.cfg.files/pxe-controller-install-${platform_release}
@@ -45,4 +45,15 @@ override_dh_install:
 	install -p -D -m 700 efi-debian-pxe-worker-install      $(ROOT)/var/pxeboot/pxelinux.cfg.files/efi-pxe-worker-install-${platform_release}
 	install -p -D -m 700 efi-debian-pxe-worker_lowlatency-install $(ROOT)/var/pxeboot/pxelinux.cfg.files/efi-pxe-worker_lowlatency-install-${platform_release}
 	install -p -D -m 700 efi-debian-pxe-smallsystem_lowlatency-install $(ROOT)/var/pxeboot/pxelinux.cfg.files/efi-pxe-smallsystem_lowlatency-install-${platform_release}
+
+	# Package pxeboot utilities in /var/pxeboot
+	install -d -m 755 $(ROOT)/var/pxeboot
+	install -p -D -m 700 pxeboot/grubx64.efi $(ROOT)/var/pxeboot
+	install -p -D -m 700 pxeboot/menu.c32 $(ROOT)/var/pxeboot
+	install -p -D -m 700 pxeboot/ldlinux.c32 $(ROOT)/var/pxeboot
+	install -p -D -m 700 pxeboot/libcom32.c32 $(ROOT)/var/pxeboot
+	install -p -D -m 700 pxeboot/libutil.c32 $(ROOT)/var/pxeboot
+	install -p -D -m 700 pxeboot/pxelinux.0 $(ROOT)/var/pxeboot
+	install -p -D -m 700 pxeboot/vesamenu.c32 $(ROOT)/var/pxeboot
+
 	dh_install
diff --git a/installer/pxe-network-installer/pxe-network-installer/pxeboot/grubx64.efi b/installer/pxe-network-installer/pxe-network-installer/pxeboot/grubx64.efi
new file mode 100644
index 00000000..2ff79bd3
Binary files /dev/null and b/installer/pxe-network-installer/pxe-network-installer/pxeboot/grubx64.efi differ
diff --git a/installer/pxe-network-installer/pxe-network-installer/pxeboot/ldlinux.c32 b/installer/pxe-network-installer/pxe-network-installer/pxeboot/ldlinux.c32
new file mode 100644
index 00000000..3030dc00
Binary files /dev/null and b/installer/pxe-network-installer/pxe-network-installer/pxeboot/ldlinux.c32 differ
diff --git a/installer/pxe-network-installer/pxe-network-installer/pxeboot/libcom32.c32 b/installer/pxe-network-installer/pxe-network-installer/pxeboot/libcom32.c32
new file mode 100644
index 00000000..c4b0e7d3
Binary files /dev/null and b/installer/pxe-network-installer/pxe-network-installer/pxeboot/libcom32.c32 differ
diff --git a/installer/pxe-network-installer/pxe-network-installer/pxeboot/libutil.c32 b/installer/pxe-network-installer/pxe-network-installer/pxeboot/libutil.c32
new file mode 100644
index 00000000..ddad8879
Binary files /dev/null and b/installer/pxe-network-installer/pxe-network-installer/pxeboot/libutil.c32 differ
diff --git a/kickstart/files/menu.c32 b/installer/pxe-network-installer/pxe-network-installer/pxeboot/menu.c32
similarity index 100%
rename from kickstart/files/menu.c32
rename to installer/pxe-network-installer/pxe-network-installer/pxeboot/menu.c32
diff --git a/installer/pxe-network-installer/pxe-network-installer/pxeboot/pxelinux.0 b/installer/pxe-network-installer/pxe-network-installer/pxeboot/pxelinux.0
new file mode 100644
index 00000000..088d31c0
Binary files /dev/null and b/installer/pxe-network-installer/pxe-network-installer/pxeboot/pxelinux.0 differ
diff --git a/installer/pxe-network-installer/pxe-network-installer/pxeboot/vesamenu.c32 b/installer/pxe-network-installer/pxe-network-installer/pxeboot/vesamenu.c32
new file mode 100644
index 00000000..19bab90f
Binary files /dev/null and b/installer/pxe-network-installer/pxe-network-installer/pxeboot/vesamenu.c32 differ
diff --git a/kickstart/debian/deb_folder/platform-kickstarts.install b/kickstart/debian/deb_folder/platform-kickstarts.install
index 344f3f6b..2282e249 100644
--- a/kickstart/debian/deb_folder/platform-kickstarts.install
+++ b/kickstart/debian/deb_folder/platform-kickstarts.install
@@ -1,2 +1 @@
 var/www/pages/feed/*
-var/pxeboot/menu.c32
diff --git a/kickstart/debian/deb_folder/rules b/kickstart/debian/deb_folder/rules
index 76010386..0b97c279 100644
--- a/kickstart/debian/deb_folder/rules
+++ b/kickstart/debian/deb_folder/rules
@@ -15,7 +15,5 @@ override_dh_auto_configure:
 override_dh_install:
 	install -d -m 755 $(ROOT)/var/www/pages/feed/rel-${platform_release}
 	install -p -D -m 700 kickstart.cfg $(ROOT)/var/www/pages/feed/rel-${platform_release}
-	install -d -m 755 $(ROOT)/var/pxeboot
-	install -p -D -m 700 menu.c32 $(ROOT)/var/pxeboot
 	install -p -D -m 700 miniboot.cfg $(ROOT)/var/www/pages/feed/rel-${platform_release}
 	dh_install
diff --git a/kickstart/files/kickstart.cfg b/kickstart/files/kickstart.cfg
index 20862f81..1c24d068 100644
--- a/kickstart/files/kickstart.cfg
+++ b/kickstart/files/kickstart.cfg
@@ -2800,11 +2800,6 @@ if [ "${controller}" = true ] ; then
         cp -a bzImage* ${pxeboot}/rel-${sw_release}
         cp -a initrd* ${pxeboot}/rel-${sw_release}
 
-        ilog "Copy pxeboot utilities from /instboot/pxeboot to ${pxeboot}"
-        for f in pxelinux.0 libcom32.c32 ldlinux.c32 libutil.c32 vesamenu.c32 grubx64.efi; do
-            cp -a /instboot/pxeboot/${f} .
-            cp -a /instboot/pxeboot/${f} ${pxeboot}
-        done
         cp -a /instboot/efi.img ${pxeboot}
         cp -a /instboot/pxeboot/EFI ${pxeboot}
         cp -a /instboot/pxeboot/EFI ${feed}/pxeboot
@@ -2831,24 +2826,6 @@ if [ "${controller}" = true ] ; then
         done
         popd > /dev/null
 
-        ilog "Fetch pxeboot utilities from ${pxeurl}/pxeboot to ${pxeboot}"
-        pushd ${feed}/pxeboot > /dev/null
-        for f in pxelinux.0 libcom32.c32 ldlinux.c32 libutil.c32 vesamenu.c32 grubx64.efi; do
-            if [ ! -e "./${f}" ] ; then
-                ilog "... fetching ${f} to ${feed}/pxeboot"
-                wget ${NOVERIFYSSL_WGET_OPT} ${pxeurl}/pxeboot/${f} -o /${LAT_DIR}/wget.tmp
-                [ $? -ne 0 ] && report_failure_with_msg "Failed to get ${pxeurl}/pxeboot/${f}"
-                cat /${LAT_DIR}/wget.tmp >> /${LAT_DIR}/wget_pxeboot_setup.log
-            fi
-
-            # also copy it to the /var/pxeboot directory
-            if [ -e "./${f}" -a ! -e "${pxeboot}/${f}" ] ; then
-                ilog "... copying  ${f} to ${pxeboot}"
-                cp ${f} ${pxeboot}
-            fi
-        done
-        popd > /dev/null
-
         ilog "Fetch efi.img from ${pxeurl} to ${feed}"
         pushd ${feed} > /dev/null
         for f in efi.img ; do