diff --git a/buildiso.sh b/buildiso.sh
index b01c8e8..815bc0b 100755
--- a/buildiso.sh
+++ b/buildiso.sh
@@ -38,7 +38,7 @@ prepare_iso() {
 
 prepare_rootfs() {
     echo -n "Preparing Debian live installation via debootstrap... "
-    SQUASHFS_PKGLIST="mdadm,lvm2,parted,gdisk,debootstrap,grub-pc,linux-image-amd64,sipcalc,live-boot"
+    SQUASHFS_PKGLIST="mdadm,lvm2,parted,gdisk,debootstrap,grub-pc,grub-efi,linux-image-amd64,sipcalc,live-boot,dosfstools"
     test -d debootstrap/ || \
     sudo /usr/sbin/debootstrap \
         --include=${SQUASHFS_PKGLIST} \
diff --git a/install.sh b/install.sh
index 9dde067..7e6d5ce 100755
--- a/install.sh
+++ b/install.sh
@@ -190,7 +190,7 @@ partprobe >&2
 echo "done."
 
 echo -n "Creating LVM PV... "
-pvcreate -ff ${target_disk}3 >&2
+pvcreate -ffy ${target_disk}3 >&2
 echo "done."
 
 echo -n "Creating LVM VG named 'vgx'... "
@@ -199,12 +199,12 @@ echo "done."
 
 echo -n "Creating root logical volume (16GB, ext4)... "
 lvcreate -L 16G -n root vgx >&2
-mkfs.ext4 -f /dev/vgx/root >&2
+mkfs.ext4 /dev/vgx/root >&2
 echo "done."
 
 echo -n "Creating ceph logical volume (16GB, ext4)... "
 lvcreate -L 16G -n ceph vgx >&2
-mkfs.ext4 -f /dev/vgx/ceph >&2
+mkfs.ext4 /dev/vgx/ceph >&2
 echo "done."
 
 echo -n "Creating swap logical volume (8GB)... "
@@ -212,6 +212,14 @@ lvcreate -L 8G -n swap vgx >&2
 mkswap -f /dev/vgx/swap >&2
 echo "done."
 
+echo -n "Creating boot partition filesystem... "
+mkfs.ext2 ${target_disk}2 >&2
+echo "done."
+
+echo -n "Creating ESP partition filesystem... "
+mkdosfs -F32 ${target_disk}1 >&2
+echo "done."
+
 echo -n "Mounting disks on temporary target... "
 target=$( mktemp -d )
 mount /dev/vgx/root ${target} >&2