diff --git a/pkg/mkimage/Dockerfile b/pkg/mkimage/Dockerfile
index 47f158175..a5fa368d0 100644
--- a/pkg/mkimage/Dockerfile
+++ b/pkg/mkimage/Dockerfile
@@ -20,4 +20,4 @@ WORKDIR /
 COPY --from=mirror /out/ /
 COPY mkimage.sh /usr/bin/
 CMD ["mkimage.sh"]
-LABEL org.mobyproject.config='{"readonly": true, "capabilities": ["CAP_SYS_ADMIN", "CAP_MKNOD"], "binds": ["/dev:/dev", "/data:/data"]}'
+LABEL org.mobyproject.config='{"readonly": true, "capabilities": ["CAP_SYS_ADMIN", "CAP_MKNOD"], "binds": ["/dev:/dev"]}'
diff --git a/pkg/mkimage/mkimage.sh b/pkg/mkimage/mkimage.sh
index 16d2ed813..140cda4b1 100755
--- a/pkg/mkimage/mkimage.sh
+++ b/pkg/mkimage/mkimage.sh
@@ -27,10 +27,13 @@ do_mkfs()
 }
 
 DEV="$(find /dev -maxdepth 1 -type b ! -name 'loop*' | grep -v '[0-9]$' | sed 's@.*/dev/@@' | sort | head -1 )"
+DEV2="$(find /dev -maxdepth 1 -type b ! -name 'loop*' | grep -v '[0-9]$' | sed 's@.*/dev/@@' | sort | head -2 | tail -1)"
 
 [ -z "${DEV}" ] && exit 1
+[ -z "${DEV2}" ] && exit 1
 
 DRIVE="/dev/${DEV}"
+DRIVE2="/dev/${DEV2}"
 
 # format
 do_mkfs "$DRIVE"
@@ -40,11 +43,20 @@ PARTITION="${DRIVE}1"
 # mount
 mount "$PARTITION" /mnt
 
-# copy kernel, initrd
-cp -a /data/kernel /data/initrd.img /mnt/
+# copy kernel, initrd from tarball on second disk
+tar xf "${DRIVE2}" -C /mnt
+
+# rename if they do not have canonical names
+(
+	cd /mnt
+	[ -f kernel ] || mv *-kernel kernel
+	[ -f initrd.img ] || mv *-initrd.img initrd.img
+	[ -f cmdline ] || mv *-cmdline cmdline
+)
 
 # create syslinux.cfg
-CMDLINE="$(cat /data/cmdline)"
+CMDLINE="$(cat /mnt/cmdline)"
+rm -f /mnt/cmdline
 
 CFG="DEFAULT linux
 LABEL linux