diff --git a/Makefile b/Makefile
index df2f71f0c..30230027e 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ all: default
 VERSION="v0.2+"
 GIT_COMMIT=$(shell git rev-list -1 HEAD)
 
-GO_COMPILE=linuxkit/go-compile:8235f703735672509a16fb626d25c6ffb0d1c21d
+GO_COMPILE=linuxkit/go-compile:7392985c6f55aba61201514174b45ba755fb386e
 
 LINUXKIT?=bin/linuxkit
 GOOS?=$(shell uname -s | tr '[:upper:]' '[:lower:]')
diff --git a/docs/vendoring.md b/docs/vendoring.md
index 883baa8a5..d5d779974 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:8235f703735672509a16fb626d25c6ffb0d1c21d
+linuxkit/go-compile:7392985c6f55aba61201514174b45ba755fb386e
 ```
 
 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:8235f703735672509a16fb626d25c6ffb0d1c21d
+linuxkit/go-compile:7392985c6f55aba61201514174b45ba755fb386e
 github.com/docker/docker
 ```
 
diff --git a/tools/alpine/versions.x86_64 b/tools/alpine/versions.x86_64
index 363fb3c95..8c8c6cb97 100644
--- a/tools/alpine/versions.x86_64
+++ b/tools/alpine/versions.x86_64
@@ -1,4 +1,4 @@
-# linuxkit/alpine:8ad3a04b70f1e93e6159143e3792e379a9b0519d-amd64
+# linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee-amd64
 # automatically generated list of installed packages
 abuild-3.1.0-r3
 alpine-baselayout-3.0.5-r2
@@ -275,7 +275,7 @@ vim-8.0.1359-r0
 wayland-libs-client-1.14.0-r2
 wayland-libs-cursor-1.14.0-r2
 wayland-libs-server-1.14.0-r2
-wireguard-tools-0.0.20180218-r0
+wireguard-tools-0.0.20180304-r0
 wireless-tools-30_pre9-r0
 wpa_supplicant-2.6-r8
 xfsprogs-4.14.0-r0
diff --git a/tools/go-compile/Dockerfile b/tools/go-compile/Dockerfile
index 182b1a122..bd43a990d 100644
--- a/tools/go-compile/Dockerfile
+++ b/tools/go-compile/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS mirror
+FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror
 
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 RUN apk add --no-cache --initdb -p /out \
diff --git a/tools/mkimage-dynamic-vhd/build.yml b/tools/mkimage-dynamic-vhd/build.yml
index 5fef466bf..8a606e6af 100644
--- a/tools/mkimage-dynamic-vhd/build.yml
+++ b/tools/mkimage-dynamic-vhd/build.yml
@@ -1 +1,4 @@
 image: mkimage-dynamic-vhd
+arches:
+  - amd64
+  - arm64
diff --git a/tools/mkimage-gcp/build.yml b/tools/mkimage-gcp/build.yml
index 29e878945..b0e0a6a85 100644
--- a/tools/mkimage-gcp/build.yml
+++ b/tools/mkimage-gcp/build.yml
@@ -1 +1,3 @@
 image: mkimage-gcp
+arches:
+  - amd64
diff --git a/tools/mkimage-iso-bios/Dockerfile b/tools/mkimage-iso-bios/Dockerfile
index a8e552938..1cf0af122 100644
--- a/tools/mkimage-iso-bios/Dockerfile
+++ b/tools/mkimage-iso-bios/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7
+FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee
 
 RUN \
   apk update && apk upgrade && \
diff --git a/tools/mkimage-iso-efi/Dockerfile b/tools/mkimage-iso-efi/Dockerfile
index ab2db363e..048832154 100644
--- a/tools/mkimage-iso-efi/Dockerfile
+++ b/tools/mkimage-iso-efi/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS grub-build
+FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS grub-build
 
 RUN apk add \
   automake \
@@ -39,7 +39,7 @@ RUN mkdir /grub-lib && \
     ;; \
   esac
 
-FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS make-img
+FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS make-img
 
 RUN \
   apk update && apk upgrade && \
diff --git a/tools/mkimage-iso-efi/build.yml b/tools/mkimage-iso-efi/build.yml
index 1ea72881e..f9cc476ea 100644
--- a/tools/mkimage-iso-efi/build.yml
+++ b/tools/mkimage-iso-efi/build.yml
@@ -1,2 +1,5 @@
 image: mkimage-iso-efi
 network: true
+arches:
+  - amd64
+  - arm64
diff --git a/tools/mkimage-qcow2-efi/Dockerfile b/tools/mkimage-qcow2-efi/Dockerfile
index 6d3f0b190..385cd368b 100644
--- a/tools/mkimage-qcow2-efi/Dockerfile
+++ b/tools/mkimage-qcow2-efi/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS grub-build
+FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS grub-build
 
 RUN apk add \
   automake \
@@ -40,7 +40,7 @@ RUN mkdir /grub-lib && \
     ;; \
   esac
 
-FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS make-img
+FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS make-img
 
 RUN \
   apk update && apk upgrade && \
diff --git a/tools/mkimage-qcow2-efi/build.yml b/tools/mkimage-qcow2-efi/build.yml
index 555b2859e..0049392be 100644
--- a/tools/mkimage-qcow2-efi/build.yml
+++ b/tools/mkimage-qcow2-efi/build.yml
@@ -1,2 +1,5 @@
 image: mkimage-qcow2-efi
 network: true
+arches:
+  - amd64
+  - arm64
diff --git a/tools/mkimage-raw-bios/Dockerfile b/tools/mkimage-raw-bios/Dockerfile
index b12a7ca19..7ed0ba42d 100644
--- a/tools/mkimage-raw-bios/Dockerfile
+++ b/tools/mkimage-raw-bios/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7
+FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee
 
 RUN \
   apk update && apk upgrade && \
diff --git a/tools/mkimage-raw-bios/build.yml b/tools/mkimage-raw-bios/build.yml
index 54126ac8e..0eedc8d0a 100644
--- a/tools/mkimage-raw-bios/build.yml
+++ b/tools/mkimage-raw-bios/build.yml
@@ -1,2 +1,3 @@
 image: mkimage-raw-bios
-arches: ["amd64"]
+arches:
+  - amd64
diff --git a/tools/mkimage-raw-efi/Dockerfile b/tools/mkimage-raw-efi/Dockerfile
index 74dfb6beb..4fb564989 100644
--- a/tools/mkimage-raw-efi/Dockerfile
+++ b/tools/mkimage-raw-efi/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS grub-build
+FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS grub-build
 
 RUN apk add \
   automake \
@@ -40,7 +40,7 @@ RUN mkdir /grub-lib && \
     ;; \
   esac
 
-FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS make-img
+FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS make-img
 
 RUN \
   apk update && apk upgrade && \
diff --git a/tools/mkimage-raw-efi/build.yml b/tools/mkimage-raw-efi/build.yml
index 5647b2574..e71272378 100644
--- a/tools/mkimage-raw-efi/build.yml
+++ b/tools/mkimage-raw-efi/build.yml
@@ -1,2 +1,5 @@
 image: mkimage-raw-efi
 network: true
+arches:
+  - amd64
+  - arm64
diff --git a/tools/mkimage-rpi3/Dockerfile b/tools/mkimage-rpi3/Dockerfile
index 188d4260e..ac63435b0 100644
--- a/tools/mkimage-rpi3/Dockerfile
+++ b/tools/mkimage-rpi3/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 as build
+FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee as build
 RUN apk add \
     bc \
     dtc \
diff --git a/tools/mkimage-vhd/build.yml b/tools/mkimage-vhd/build.yml
index 8b00b4fda..a516f4bf3 100644
--- a/tools/mkimage-vhd/build.yml
+++ b/tools/mkimage-vhd/build.yml
@@ -1 +1,4 @@
 image: mkimage-vhd
+arches:
+  - amd64
+  - arm64
diff --git a/tools/mkimage-vmdk/build.yml b/tools/mkimage-vmdk/build.yml
index cfad11d0b..b55510a50 100644
--- a/tools/mkimage-vmdk/build.yml
+++ b/tools/mkimage-vmdk/build.yml
@@ -1 +1,4 @@
 image: mkimage-vmdk
+arches:
+  - amd64
+  - arm64
diff --git a/tools/qemu/Dockerfile b/tools/qemu/Dockerfile
index a392575ff..88978be9a 100644
--- a/tools/qemu/Dockerfile
+++ b/tools/qemu/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS mirror
+FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 RUN apk add --no-cache --initdb -p /out \
     alpine-baselayout \