diff --git a/create_pxeinitrd.sh b/create_pxeinitrd.sh
index 2010f31..6af4e2d 100755
--- a/create_pxeinitrd.sh
+++ b/create_pxeinitrd.sh
@@ -220,6 +220,8 @@ if [[ $ARCH = amd64 ]]
     grub-mknetdir --net-directory=$RESULT_DIR/
 fi
 
+rm -rf $RESULT_DIR/boot/grub/locale/ $RESULT_DIR/boot/grub/fonts/
+
 ls -la $RESULT_DIR/
 
 
diff --git a/debian-amd64/wit-pxeboot-amd64.install b/debian-amd64/wit-pxeboot-amd64.install
index 35dfa12..d2b3901 100644
--- a/debian-amd64/wit-pxeboot-amd64.install
+++ b/debian-amd64/wit-pxeboot-amd64.install
@@ -1,3 +1,3 @@
 files/kernel/* /srv/tftp/wit-pxeboot/
 files/boot/* /srv/tftp/boot/
-files/grub.cfg /srv/tftp/boot/grub/
+files/grub-addon-amd64.cfg /srv/tftp/boot/grub/
diff --git a/debian-arm64/wit-pxeboot-arm64.install b/debian-arm64/wit-pxeboot-arm64.install
index 35dfa12..6891d9b 100644
--- a/debian-arm64/wit-pxeboot-arm64.install
+++ b/debian-arm64/wit-pxeboot-arm64.install
@@ -1,3 +1,3 @@
 files/kernel/* /srv/tftp/wit-pxeboot/
 files/boot/* /srv/tftp/boot/
-files/grub.cfg /srv/tftp/boot/grub/
+files/grub-addon-arm64.cfg /srv/tftp/boot/grub/
diff --git a/drone-not-working.sh b/drone-not-working.sh
index 4db6118..065eafb 100755
--- a/drone-not-working.sh
+++ b/drone-not-working.sh
@@ -9,6 +9,7 @@ sudo ARCH=$ARCH TMP_DIR=$TMP_DIR ./create_pxeinitrd.sh
 cd $TMP_DIR
 sudo dpkg-buildpackage --no-sign
 ls -lha ../wit-pxeboot-${ARCH}_*_all.deb
-echo scp -i ~/.ssh/packager -o StrictHostKeyChecking=no -P 22022 ../wit-pxeboot-${ARCH}_*_all.deb root@cloud-api.v2.stack.wit.com:/data/incoming
-#cd -
-#sudo rm -fr $TMP_DIR
+scp -i ~/.ssh/packager -o StrictHostKeyChecking=no -P 22022 ../wit-pxeboot-${ARCH}_*_all.deb root@cloud-api.v2.stack.wit.com:/data/incoming
+cd -
+sudo rm -fr $TMP_DIR
+sudo rm -fr ../wit-pxeboot-${ARCH}*
diff --git a/files/grub.cfg b/files/grub.cfg
index d2e2046..50927c8 100644
--- a/files/grub.cfg
+++ b/files/grub.cfg
@@ -5,28 +5,5 @@ menuentry "localboot" {
     exit
 }
 
-menuentry "debcore-x86_64" {
-  linux /wit-pxeboot/vmlinuz-amd64 console=tty0 console=ttyS1,115200n8 size=5000
-  initrd /wit-pxeboot/initramfs-amd64.gz
-}
-
-menuentry "debcore-arm64" {
-  linux /wit-pxeboot/vmlinuz-arm64 console=tty0 console=ttyAMA0,115200n8 size=5000
-  initrd /wit-pxeboot/initramfs-arm64.gz
-}
-
-menuentry "install-x86_64" {
-  linux /wit-pxeboot/vmlinuz-amd64 console=tty0 console=ttyS1,115200n8 size=5000 execstartup='sleep 60; export LANG=C; export DEBIAN_FRONTEND=noninteractive; export INSTALLEXTRA=wit-config; apt-get update && apt-get install -y wit-localinstaller && /usr/bin/create_local_install.sh || exit 1'
-  initrd /wit-pxeboot/initramfs-amd64.gz
-}
-
-menuentry "install-arm64" {
-  linux /wit-pxeboot/vmlinuz-arm64 console=tty0 console=ttyAMA0,115200n8 size=5000 execstartup='sleep 60; export LANG=C; export DEBIAN_FRONTEND=noninteractive; export INSTALLEXTRA=wit-config; apt-get update && apt-get install -y wit-localinstaller && /usr/bin/create_local_install.sh || exit 1'
-  initrd /wit-pxeboot/initramfs-arm64.gz
-}
-
-#
-#label installbastion
-#  kernel wit-pxeboot/vmlinuz
-#  append initrd=wit-pxeboot/initramfs.gz acpi=off console=tty0 console=ttyS1,115200n8 size=5000 execstartup='sleep 60; export LANG=C; export DEBIAN_FRONTEND=noninteractive; export ANSIBLEPULL="--extra-vars=bastion_bootstrap=true --accept-host-key --key-file=/tmp/id_rsa  --url=git@git.wit.com:netops/ansible.git bastion-usw3-temp.yaml"; export INSTALLEXTRA="git ansible"; apt-get update && apt-get install -y wit-localinstaller && /usr/bin/create_local_install.sh || exit 1' ---
-#
+source /boot/grub/grub-addon-amd64.cfg
+source /boot/grub/grub-addon-arm64.cfg