diff --git a/src/cmd/linuxkit/moby/images.yaml b/src/cmd/linuxkit/moby/images.yaml
index 936ac3826..18a71a61c 100644
--- a/src/cmd/linuxkit/moby/images.yaml
+++ b/src/cmd/linuxkit/moby/images.yaml
@@ -5,9 +5,9 @@
  raw-bios:       linuxkit/mkimage-raw-bios:6185592a62b860b01491d7f1661e79f62e6fc902
  raw-efi:        linuxkit/mkimage-raw-efi:6dff9623fb4fecff05ca02123aa8bc345ab7c707
  squashfs:       linuxkit/mkimage-squashfs:92dbcfe5ef69dc93276403b09a9f892f25654ed7
- gcp:            linuxkit/mkimage-gcp:a7416d21d4ef642bb2ba560c8f7651250823546d
+ gcp:            linuxkit/mkimage-gcp:035c2c2b4b958060c0b6bdd41d9cbc886a335098
  qcow2-efi:      linuxkit/mkimage-qcow2-efi:67d5e16228dfb434ac5418bafac720bf23bbaf42
- vhd:            linuxkit/mkimage-vhd:4cc60c4f46b07e11c64ba618e46b81fa0096c91f
- dynamic-vhd:    linuxkit/mkimage-dynamic-vhd:99b9009ed54a793020d3ce8322a42e0cc06da71a
- vmdk:           linuxkit/mkimage-vmdk:b55ea46297a16d8a4448ce7f5a2df987a9602b27
+ vhd:            linuxkit/mkimage-vhd:91bcc7a6475f46a3d5d84cf6161f07c583dd9c21
+ dynamic-vhd:    linuxkit/mkimage-dynamic-vhd:b755f8ff82c8631d18decaebb09867e7b88c2533
+ vmdk:           linuxkit/mkimage-vmdk:20a370a55bd8d58c2ae9d634c297a955bb006efd
  rpi3:           linuxkit/mkimage-rpi3:d76bb890e1d55c2d9395e0ca58523ee076571c21
diff --git a/tools/guestfs/Dockerfile b/tools/guestfs/Dockerfile
index 9592aba2f..1c3123e07 100644
--- a/tools/guestfs/Dockerfile
+++ b/tools/guestfs/Dockerfile
@@ -1,4 +1,21 @@
-FROM debian:stretch
+FROM debian:bullseye-slim as base
+
+ARG TARGETARCH
 
 ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && apt-get -yq upgrade && apt-get install -yq libguestfs-tools syslinux linux-image-amd64 vim
+
+FROM base as syslinux-amd64
+# syslinux package is only available on amd64; for arm64, use
+# the limited subset of syslinux-common
+ENV SYSLINUX="syslinux"
+
+FROM base as syslinux-arm64
+ENV SYSLINUX_arm64="syslinux-common"
+
+FROM syslinux-${TARGETARCH} as syslinux
+RUN apt-get update && \
+    apt-get -yq upgrade && \
+    apt-get install -yq libguestfs-tools \
+        ${SYSLINUX} \
+        linux-image-${TARGETARCH} \
+        vim
diff --git a/tools/guestfs/Makefile b/tools/guestfs/Makefile
deleted file mode 100644
index 67779888f..000000000
--- a/tools/guestfs/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-.PHONY: build push
-
-IMAGE=guestfs
-
-default: push
-
-iid: Dockerfile
-	tar cf - $^ | docker build --no-cache --iidfile iid -
-
-hash: Makefile iid
-	docker run --rm $(shell cat iid) sh -c 'apt list --installed 2>/dev/null | sha1sum' | sed 's/ .*//' > hash
-
-push: hash iid
-	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
-		(docker tag $(shell cat iid) linuxkit/$(IMAGE):$(shell cat hash) && \
-		 docker push linuxkit/$(IMAGE):$(shell cat hash))
-	rm -f iid
-
-build: hash iid
-	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
-		docker tag $(shell cat iid) linuxkit/$(IMAGE):$(shell cat hash)
-	rm -f iid
-
-clean:
-	rm -f hash iid
-
-.DELETE_ON_ERROR:
diff --git a/tools/guestfs/build.yml b/tools/guestfs/build.yml
new file mode 100644
index 000000000..a88f04a73
--- /dev/null
+++ b/tools/guestfs/build.yml
@@ -0,0 +1,5 @@
+image: guestfs
+network: true
+arches:
+  - arm64
+  - amd64
diff --git a/tools/mkimage-dynamic-vhd/Dockerfile b/tools/mkimage-dynamic-vhd/Dockerfile
index fe10313be..22532e396 100644
--- a/tools/mkimage-dynamic-vhd/Dockerfile
+++ b/tools/mkimage-dynamic-vhd/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/guestfs:a4067f4bd5b81548195a35c71638a3d857415817
+FROM linuxkit/guestfs:f85d370f7a3b0749063213c2dd451020e3a631ab
 
 COPY . .
 
diff --git a/tools/mkimage-gcp/Dockerfile b/tools/mkimage-gcp/Dockerfile
index 84523d46c..a9b3ba54a 100644
--- a/tools/mkimage-gcp/Dockerfile
+++ b/tools/mkimage-gcp/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/guestfs:a4067f4bd5b81548195a35c71638a3d857415817
+FROM linuxkit/guestfs:f85d370f7a3b0749063213c2dd451020e3a631ab
 
 COPY . .
 
diff --git a/tools/mkimage-vhd/Dockerfile b/tools/mkimage-vhd/Dockerfile
index 8f1dc5777..73d96e102 100644
--- a/tools/mkimage-vhd/Dockerfile
+++ b/tools/mkimage-vhd/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/guestfs:a4067f4bd5b81548195a35c71638a3d857415817
+FROM linuxkit/guestfs:f85d370f7a3b0749063213c2dd451020e3a631ab
 
 COPY . .
 
diff --git a/tools/mkimage-vmdk/Dockerfile b/tools/mkimage-vmdk/Dockerfile
index 3d245563c..aa43d7f3b 100644
--- a/tools/mkimage-vmdk/Dockerfile
+++ b/tools/mkimage-vmdk/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/guestfs:a4067f4bd5b81548195a35c71638a3d857415817
+FROM linuxkit/guestfs:f85d370f7a3b0749063213c2dd451020e3a631ab
 
 COPY . .