diff --git a/src/cmd/linuxkit/moby/output.go b/src/cmd/linuxkit/moby/output.go
index 27b569191..0b7cee7e8 100644
--- a/src/cmd/linuxkit/moby/output.go
+++ b/src/cmd/linuxkit/moby/output.go
@@ -19,14 +19,14 @@ var (
 		"iso":         "linuxkit/mkimage-iso:3d81e29b28ddf739becf10758eb6077b198d26d8",
 		"iso-bios":    "linuxkit/mkimage-iso-bios:131849cfc4f3ede87c2ca19b6e2a4ef86354d1ce",
 		"iso-efi":     "linuxkit/mkimage-iso-efi:667bd641fd37062eaf9d2173c768ebfcedad3876",
-		"raw-bios":    "linuxkit/mkimage-raw-bios:3d6a6d932e124a0430e36d232dd51af1deef53c3",
-		"raw-efi":     "linuxkit/mkimage-raw-efi:2d1a0e6e67c967bd4d5a859eb9044571f6844577",
+		"raw-bios":    "linuxkit/mkimage-raw-bios:6a2365f9c90901d7e0c70507e09a0cde23c5f321",
+		"raw-efi":     "linuxkit/mkimage-raw-efi:27de80a2180621d3d772893381a9a1b7c5fb895a",
 		"squashfs":    "linuxkit/mkimage-squashfs:c771872c292081a36333425c12e57393bd79f4e9",
-		"gcp":         "linuxkit/mkimage-gcp:e6cdcf859ab06134c0c37a64ed5f886ec8dae1a1",
-		"qcow2-efi":   "linuxkit/mkimage-qcow2-efi:a69258f0ef3c484096617c2e5bc1b52113fb6b81",
-		"vhd":         "linuxkit/mkimage-vhd:3820219e5c350fe8ab2ec6a217272ae82f4b9242",
-		"dynamic-vhd": "linuxkit/mkimage-dynamic-vhd:743ac9959fe6d3912ebd78b4fd490b117c53f1a6",
-		"vmdk":        "linuxkit/mkimage-vmdk:cee81a3ed9c44ae446ef7ebff8c42c1e77b3e1b5",
+		"gcp":         "linuxkit/mkimage-gcp:a7416d21d4ef642bb2ba560c8f7651250823546d",
+		"qcow2-efi":   "linuxkit/mkimage-qcow2-efi:aeb084ea016689ed97bce3b52e2695591cb02693",
+		"vhd":         "linuxkit/mkimage-vhd:4cc60c4f46b07e11c64ba618e46b81fa0096c91f",
+		"dynamic-vhd": "linuxkit/mkimage-dynamic-vhd:99b9009ed54a793020d3ce8322a42e0cc06da71a",
+		"vmdk":        "linuxkit/mkimage-vmdk:b55ea46297a16d8a4448ce7f5a2df987a9602b27",
 		"rpi3":        "linuxkit/mkimage-rpi3:cb8427df175b61dd6b635e76f0e88bf261e30d8b",
 	}
 )
diff --git a/tools/mkimage-dynamic-vhd/make-dynamic-vhd b/tools/mkimage-dynamic-vhd/make-dynamic-vhd
index 5115cb8ff..2a16b88c1 100755
--- a/tools/mkimage-dynamic-vhd/make-dynamic-vhd
+++ b/tools/mkimage-dynamic-vhd/make-dynamic-vhd
@@ -17,10 +17,9 @@ cd files
 [ -t 0 ] || tar xf -
 
 INITRD="$(find . -name '*.img')"
-KERNEL="$(find . -name kernel -or -name '*bzImage')"
+KERNEL="./kernel"
 CMDLINE="$*"
 
-[ "$KERNEL" = "./kernel" ] || mv "$KERNEL" vmlinuz64
 [ "$INITRD" = "./initrd.img" ] || mv "$INITRD" initrd.img
 
 # clean up subdirectories
diff --git a/tools/mkimage-gcp/make-gcp b/tools/mkimage-gcp/make-gcp
index d8fcd538c..6e8cfe0b3 100755
--- a/tools/mkimage-gcp/make-gcp
+++ b/tools/mkimage-gcp/make-gcp
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 set -e
+# for debugging
+[ -n "$DEBUG" ] && set -x
 
 mkdir -p /tmp/image
 cd /tmp/image
@@ -17,10 +19,9 @@ cd files
 [ -t 0 ] || tar xf -
 
 INITRD="$(find . -name '*.img')"
-KERNEL="$(find . -name kernel -or -name bzImage)"
+KERNEL="./kernel"
 CMDLINE="$*"
 
-[ "$KERNEL" = "./kernel" ] || mv "$KERNEL" kernel
 [ "$INITRD" = "./initrd.img" ] || mv "$INITRD" initrd.img
 
 # clean up subdirectories
diff --git a/tools/mkimage-qcow2-efi/make-efi b/tools/mkimage-qcow2-efi/make-efi
index 244c4ec3b..11a483c24 100755
--- a/tools/mkimage-qcow2-efi/make-efi
+++ b/tools/mkimage-qcow2-efi/make-efi
@@ -40,7 +40,7 @@ cd /tmp/efi
 [ -t 0 ] || bsdtar xzf -
 
 INITRD="$(find . -name '*.img')"
-KERNEL="$(find . -name kernel)"
+KERNEL="./kernel"
 CMDLINE_FILE="$(find . -name cmdline)"
 CMDLINE="$(cat $CMDLINE_FILE )"
 
diff --git a/tools/mkimage-raw-bios/make-bios b/tools/mkimage-raw-bios/make-bios
index abec07d65..c56d586ea 100755
--- a/tools/mkimage-raw-bios/make-bios
+++ b/tools/mkimage-raw-bios/make-bios
@@ -25,7 +25,7 @@ cd /tmp/bios
 [ -t 0 ] || bsdtar xzf -
 
 INITRD="$(find . -name '*.img')"
-KERNEL="$(find . -name kernel)"
+KERNEL="./kernel"
 CMDLINE_FILE="$(find . -name cmdline)"
 CMDLINE="$(cat $CMDLINE_FILE )"
 
diff --git a/tools/mkimage-raw-efi/make-efi b/tools/mkimage-raw-efi/make-efi
index dc5aae33d..f9e0dba74 100755
--- a/tools/mkimage-raw-efi/make-efi
+++ b/tools/mkimage-raw-efi/make-efi
@@ -40,7 +40,7 @@ cd /tmp/efi
 [ -t 0 ] || bsdtar xzf -
 
 INITRD="$(find . -name '*.img')"
-KERNEL="$(find . -name kernel)"
+KERNEL="./kernel"
 CMDLINE_FILE="$(find . -name cmdline)"
 CMDLINE="$(cat $CMDLINE_FILE )"
 
diff --git a/tools/mkimage-vhd/make-vhd b/tools/mkimage-vhd/make-vhd
index 7ce5640ce..55eebca3f 100755
--- a/tools/mkimage-vhd/make-vhd
+++ b/tools/mkimage-vhd/make-vhd
@@ -17,10 +17,9 @@ cd files
 [ -t 0 ] || tar xf -
 
 INITRD="$(find . -name '*.img')"
-KERNEL="$(find . -name kernel -or -name '*bzImage')"
+KERNEL="./kernel"
 CMDLINE="$*"
 
-[ "$KERNEL" = "./kernel" ] || mv "$KERNEL" vmlinuz64
 [ "$INITRD" = "./initrd.img" ] || mv "$INITRD" initrd.img
 
 # clean up subdirectories
diff --git a/tools/mkimage-vmdk/make-vmdk b/tools/mkimage-vmdk/make-vmdk
index 16fe99aa6..1c70a2891 100755
--- a/tools/mkimage-vmdk/make-vmdk
+++ b/tools/mkimage-vmdk/make-vmdk
@@ -17,10 +17,9 @@ cd files
 [ -t 0 ] || tar xf -
 
 INITRD="$(find . -name '*.img')"
-KERNEL="$(find . -name kernel -or -name '*bzImage')"
+KERNEL="./kernel"
 CMDLINE="$*"
 
-[ "$KERNEL" = "./kernel" ] || mv "$KERNEL" vmlinuz64
 [ "$INITRD" = "./initrd.img" ] || mv "$INITRD" initrd.img
 
 # clean up subdirectories