diff --git a/Makefile b/Makefile
index 2d2113b7d..24d70d36a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION="v0.4+"
 GIT_COMMIT=$(shell git rev-list -1 HEAD)
 
-GO_COMPILE=linuxkit/go-compile:a8bffe875268a973ea82e5937b0fb23a5b08cc79
+GO_COMPILE=linuxkit/go-compile:a8031514cbd017cd10207de56be3434b9d7c6fd7
 
 ifeq ($(OS),Windows_NT)
 LINUXKIT?=bin/linuxkit.exe
diff --git a/docs/vendoring.md b/docs/vendoring.md
index 02f524c49..04ee3f626 100644
--- a/docs/vendoring.md
+++ b/docs/vendoring.md
@@ -28,7 +28,7 @@ docker run -it --rm \
 -v $(pwd):/go/src/github.com/linuxkit/linuxkit \
 -w /go/src/github.com/linuxkit/linuxkit/src/cmd/linuxkit \
 --entrypoint /go/bin/vndr \
-linuxkit/go-compile:a8bffe875268a973ea82e5937b0fb23a5b08cc79
+linuxkit/go-compile:a8031514cbd017cd10207de56be3434b9d7c6fd7
 ```
 
 To update a single dependency:
@@ -38,7 +38,7 @@ docker run -it --rm \
 -v $(pwd):/go/src/github.com/linuxkit/linuxkit \
 -w /go/src/github.com/linuxkit/linuxkit/src/cmd/linuxkit \
 --entrypoint /go/bin/vndr \
-linuxkit/go-compile:a8bffe875268a973ea82e5937b0fb23a5b08cc79
+linuxkit/go-compile:a8031514cbd017cd10207de56be3434b9d7c6fd7
 github.com/docker/docker
 ```
 
diff --git a/src/cmd/linuxkit/main.go b/src/cmd/linuxkit/main.go
index b4cf2dfe6..110da96d2 100644
--- a/src/cmd/linuxkit/main.go
+++ b/src/cmd/linuxkit/main.go
@@ -19,17 +19,17 @@ func init() {
 	// This allows us to overwrite the hashes locally without having
 	// to re-vendor the 'github.com/moby/tool' when we update 'mkimage-*'
 	imgs := map[string]string{
-		"iso-bios":    "linuxkit/mkimage-iso-bios:86981371921813019ea0f12c778b348a9a3d40ed",
-		"iso-efi":     "linuxkit/mkimage-iso-efi:1cebc76eab89254f3e288526890bbc7cddf0ffaf",
-		"raw-bios":    "linuxkit/mkimage-raw-bios:3b1a68b2d652180ccb57ef9d2580af7e7d966d35",
-		"raw-efi":     "linuxkit/mkimage-raw-efi:6743fc2b475dcb7da510ea2b6029dbcaadf94805",
-		"squashfs":    "linuxkit/mkimage-squashfs:99efca8bc93737fcb56880c444b9142a2166a79e",
+		"iso-bios":    "linuxkit/mkimage-iso-bios:fea1990f9703f24fc3c71ecd33695b60ca11043c",
+		"iso-efi":     "linuxkit/mkimage-iso-efi:6948ef717ff8b0ca5831ff6b281404ae7f61d36c",
+		"raw-bios":    "linuxkit/mkimage-raw-bios:89577baee3bf6e4b7c6669e9e7d16181a0aefbbf",
+		"raw-efi":     "linuxkit/mkimage-raw-efi:276b61f502a7e4667e4a343df15e379f451e4cc3",
+		"squashfs":    "linuxkit/mkimage-squashfs:3c5db8c90dfa828f9cfcf90f050c1db5ef177420",
 		"gcp":         "linuxkit/mkimage-gcp:e6cdcf859ab06134c0c37a64ed5f886ec8dae1a1",
-		"qcow2-efi":   "linuxkit/mkimage-qcow2-efi:2525659ffe71502f4307766c2321075350c3448e",
+		"qcow2-efi":   "linuxkit/mkimage-qcow2-efi:fa3756a291319d0250a9eac1471296d8e4cae0f8",
 		"vhd":         "linuxkit/mkimage-vhd:3820219e5c350fe8ab2ec6a217272ae82f4b9242",
 		"dynamic-vhd": "linuxkit/mkimage-dynamic-vhd:743ac9959fe6d3912ebd78b4fd490b117c53f1a6",
 		"vmdk":        "linuxkit/mkimage-vmdk:cee81a3ed9c44ae446ef7ebff8c42c1e77b3e1b5",
-		"rpi3":        "linuxkit/mkimage-rpi3:0cedb2da51efe25309bef391e5c904cef645b5ea",
+		"rpi3":        "linuxkit/mkimage-rpi3:c0645c61c71f7233a4a7cde2afecf41011668417",
 	}
 	if err := moby.UpdateOutputImages(imgs); err != nil {
 		log.Fatalf("Failed to register mkimage-*. %v", err)
diff --git a/src/cmd/linuxkit/run_qemu.go b/src/cmd/linuxkit/run_qemu.go
index 872eeaa7a..34b195e52 100644
--- a/src/cmd/linuxkit/run_qemu.go
+++ b/src/cmd/linuxkit/run_qemu.go
@@ -20,7 +20,7 @@ import (
 
 // QemuImg is the version of qemu container
 const (
-	QemuImg       = "linuxkit/qemu:e85ce22b5c133eafbd3e6f110512e53d2e1e1596"
+	QemuImg       = "linuxkit/qemu:4e47c416a9176029a45514d1fd911c0e995a0b84"
 	defaultFWPath = "/usr/share/ovmf/bios.bin"
 )