diff --git a/bootstrap/kernel.sh b/bootstrap/00-kernel
similarity index 100%
rename from bootstrap/kernel.sh
rename to bootstrap/00-kernel
diff --git a/bootstrap/system.sh b/bootstrap/01-system
similarity index 100%
rename from bootstrap/system.sh
rename to bootstrap/01-system
diff --git a/bootstrap/users.sh b/bootstrap/02-users
similarity index 100%
rename from bootstrap/users.sh
rename to bootstrap/02-users
diff --git a/bootstrap/networking.sh b/bootstrap/03-networking
similarity index 100%
rename from bootstrap/networking.sh
rename to bootstrap/03-networking
diff --git a/bootstrap/services.sh b/bootstrap/04-services
similarity index 100%
rename from bootstrap/services.sh
rename to bootstrap/04-services
diff --git a/bootstrap/first-boot.sh b/bootstrap/99-first-boot
similarity index 100%
rename from bootstrap/first-boot.sh
rename to bootstrap/99-first-boot
diff --git a/make-image b/make-image
index 88c9517..e3948fc 100755
--- a/make-image
+++ b/make-image
@@ -47,21 +47,13 @@ apt-get update
 curl https://raw.githubusercontent.com/alpinelinux/alpine-chroot-install/master/alpine-chroot-install | sh
 
 cp -R bootstrap/ /alpine/
-
-/alpine/enter-chroot /bootstrap/kernel.sh
-/alpine/enter-chroot /bootstrap/system.sh
-/alpine/enter-chroot /bootstrap/users.sh
-/alpine/enter-chroot /bootstrap/networking.sh
-/alpine/enter-chroot /bootstrap/services.sh
-/alpine/enter-chroot /bootstrap/first-boot.sh
+/alpine/enter-chroot run-parts /bootstrap/
 
 rm -rf /alpine/var/lib/apt/lists/*
 rm -rf /alpine/var/cache/apk/*
 rm -rf /alpine/root/*
 rm -rf /alpine/bootstrap/
-rm /alpine/enter-chroot
-rm /alpine/etc/resolv.conf
-rm /alpine/env.sh
+rm  /alpine/env.sh /alpine/etc/resolv.conf /alpine/enter-chroot /alpine/destroy
 find /alpine -iname "*-" -delete
 find /alpine -iname "*~" -delete
 
@@ -78,7 +70,12 @@ resize2fs -p "$ROOT_DEV" $ROOT_MIN_SIZE
 
 # shrink partition
 PART_END=$(($ROOT_PART_START + ($ROOT_MIN_SIZE * $ROOT_BLOCK_SIZE)))
-parted ---pretend-input-tty "$OUTPUT_IMG" unit B resizepart 2 $PART_END yes
+parted ---pretend-input-tty "$OUTPUT_IMG" <<EOF
+unit B
+resizepart 2 $PART_END
+yes
+quit
+EOF
 
 losetup -d "$LOOP_DEV"
 
diff --git a/runner/Dockerfile b/runner/Dockerfile
index 5b80a76..766f2da 100644
--- a/runner/Dockerfile
+++ b/runner/Dockerfile
@@ -1,2 +1,2 @@
-FROM ubuntu:bionic
-RUN apt-get update && apt-get install -y e2fsprogs dosfstools xxd parted udev wget curl qemu-user-static binfmt-support subversion zerofree
+FROM ubuntu:hirsute
+RUN apt-get update && apt-get install -y e2fsprogs dosfstools xxd parted udev wget curl qemu-user-static binfmt-support zerofree fdisk