diff --git a/Makefile b/Makefile
index d58f0363305ab5d88db12db7b8b125ddb465920d..ad1dcd4f0926d46ba9721ac213c21f8ccbebe7e4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+SHELL := /bin/bash
 MAKEFLAGS += "-j 4"
 
 DOCKER_BUILDKIT_BUILD = DOCKER_BUILDKIT=1 docker build --progress=plain
diff --git a/Vagrantfile b/Vagrantfile
index 394f34d64898746011e5ea8ce403d3168aea1ae4..ebbc9c33f57fed85dcba9a3a10a54be24c7c5823 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -47,12 +47,12 @@ Vagrant.configure("2") do |config|
     mv /vagrant/tftp/tftpboot /tftpboot
     systemctl restart tftpd-hpa
 
-    # Install and configure DHCP server
+    # Install and configure NFS server
     apt-get install -y nfs-kernel-server
     cp /vagrant/nfs/exports /etc/exports
     rm -rf /nfsroot
     mkdir /nfsroot
-    tar -xJvf /vagrant/nfs/nfsroot.tar.xz -C /nfsroot --strip-components=1
+    tar -xJf /vagrant/nfs/nfsroot.tar.xz -C /nfsroot --strip-components=1
     systemctl restart nfs-server
 
   SHELL
diff --git a/deployer/Dockerfile b/deployer/Dockerfile
index 22f45b4991457286c6dd8e35039393d634f9a0bb..54f37dc33be63b4be269eb87e7e2b81869edb170 100644
--- a/deployer/Dockerfile
+++ b/deployer/Dockerfile
@@ -10,7 +10,7 @@ ADD ./hostname ./rootfs/etc/hostname
 ADD ./hosts ./rootfs/etc/hosts
 ADD ./fstab ./rootfs/etc/fstab
 ADD ./initramfs.conf ./rootfs/etc/initramfs-tools/initramfs.conf
-ADD ./init ./rootfs/sbin/init
+#ADD ./init ./rootfs/sbin/init
 ADD ./bootiful-deploy ./rootfs/usr/bin
 ADD ./bootiful-deploy-log ./rootfs/usr/bin
 
diff --git a/deployer/multistrap.config b/deployer/multistrap.config
index 39b8763026c945cdc0cdb69a25dda697cb7ff23e..3d8e194e430a6215470d7ab44cefedc5bd23dc87 100644
--- a/deployer/multistrap.config
+++ b/deployer/multistrap.config
@@ -2,10 +2,12 @@
 unpack=true
 bootstrap=Debian
 aptsources=Debian
+addimportant=true
 
 [Debian]
-packages=nfs-common clonezilla linux-image-amd64
+packages=nfs-common clonezilla linux-image-amd64 parted systemd udev
 source=http://http.debian.net/debian
 keyring=debian-archive-keyring
 suite=buster
+components=main contrib non-free
 
diff --git a/dhcp/dhcpd.conf b/dhcp/dhcpd.conf
index 0592976ee402c8e25afbf01a8d9f913ac5554c69..6e8a8fa03f8ab867cdf1cc33b3c952cddcb76c4a 100755
--- a/dhcp/dhcpd.conf
+++ b/dhcp/dhcpd.conf
@@ -16,9 +16,6 @@ subnet 192.168.56.0 netmask 255.255.255.0 {
         if substring (option vendor-class-identifier, 15, 5) = "00000" {
             option bootfile-name   "/boot/grub/i386-pc/core.0";
         }
-        elsif substring (option vendor-class-identifier, 15, 5) = "00002" {
-            option bootfile-name "/boot/grub/i386-efi/core.efi";
-        }
         elsif substring (option vendor-class-identifier, 15, 5) = "00006" {
             option bootfile-name "/boot/grub/i386-efi/core.efi";
         }
diff --git a/doc/trimstart.py b/doc/trimstart.py
index 1e887842d065ae0b415244e3cf30f60a44ef52e2..1da3fdcdf8c45d734b2b28f832f3069df040608c 100755
--- a/doc/trimstart.py
+++ b/doc/trimstart.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import sys
 
diff --git a/nfs/nfsroot.tar.xz b/nfs/nfsroot.tar.xz
index c3ac79a63eb60f3a99c959d770df406dddd3731a..de6e3cc93d485928c3b04a4fd7257fd1c0e3a00a 100644
--- a/nfs/nfsroot.tar.xz
+++ b/nfs/nfsroot.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:65f62898013bc8bfd86350be16a12d086a97565e8a8c277fac098db6cf92d7c8
-size 89274896
+oid sha256:c7c1bb87f6f4a8be3985bc6f2f8286bffda09e3ae47178a919ddf574b1eb27a8
+size 101508908
diff --git a/tftp/tftpboot/boot/deployer/initrd.img b/tftp/tftpboot/boot/deployer/initrd.img
index 2181e6cacda62a524f6508be297ee0d92e8f62a5..68e9eb4b8674fd931f58fb4eb5ddccd967bd2786 100644
--- a/tftp/tftpboot/boot/deployer/initrd.img
+++ b/tftp/tftpboot/boot/deployer/initrd.img
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:28ea68228a915fc07e9a962eb4c27aad6ff266b8bfba8712dfbfa38214a427be
-size 17973101
+oid sha256:de41897060c1cfe00bb6cfe43195b145b83be8180d041a2cacc7c2c7a8a53040
+size 17974794