diff --git a/tools/c-compile/Makefile b/tools/c-compile/Makefile
index 88f8b0abd..2a143821f 100644
--- a/tools/c-compile/Makefile
+++ b/tools/c-compile/Makefile
@@ -11,15 +11,15 @@ hash: Dockerfile compile.sh
 	docker run --rm --entrypoint=/bin/sh $(IMAGE):build -c 'cat /lib/apk/db/installed /usr/bin/compile.sh | sha1sum' | sed 's/ .*//' > hash
 
 push: hash
-	docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
-		(docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \
-		 docker push mobylinux/$(IMAGE):$(shell cat hash))
+	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
+		(docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash) && \
+		 docker push linuxkit/$(IMAGE):$(shell cat hash))
 	docker rmi $(IMAGE):build
 	rm -f hash
 
 tag: hash
-	docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
-		docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash)
+	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
+		docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash)
 	docker rmi $(IMAGE):build
 	rm -f hash
 
diff --git a/tools/go-compile/Makefile b/tools/go-compile/Makefile
index fa9f40f1b..3ca4406fb 100644
--- a/tools/go-compile/Makefile
+++ b/tools/go-compile/Makefile
@@ -11,15 +11,15 @@ hash: Dockerfile compile.sh
 	docker run --rm --entrypoint=/bin/sh $(IMAGE):build -c "cat $^ /lib/apk/db/installed /go/bin/golint | sha1sum" | sed 's/ .*//' > hash
 
 push: hash
-	docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
-		(docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \
-		 docker push mobylinux/$(IMAGE):$(shell cat hash))
+	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
+		(docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash) && \
+		 docker push linuxkit/$(IMAGE):$(shell cat hash))
 	docker rmi $(IMAGE):build
 	rm -f hash
 
 tag: hash
-	docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
-		docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash)
+	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
+		docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash)
 	docker rmi $(IMAGE):build
 	rm -f hash
 
diff --git a/tools/guestfs/Makefile b/tools/guestfs/Makefile
index bc0425dc9..b823108d9 100644
--- a/tools/guestfs/Makefile
+++ b/tools/guestfs/Makefile
@@ -11,15 +11,15 @@ hash: Dockerfile
 	docker run --rm $(IMAGE):build sh -c 'apt list --installed 2>/dev/null | sha1sum' | sed 's/ .*//' > hash
 
 push: hash
-	docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
-		(docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \
-		 docker push mobylinux/$(IMAGE):$(shell cat hash))
+	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
+		(docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash) && \
+		 docker push linuxkit/$(IMAGE):$(shell cat hash))
 	docker rmi $(IMAGE):build
 	rm -f hash
 
 tag: hash
-	docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
-		docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash)
+	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
+		docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash)
 	docker rmi $(IMAGE):build
 	rm -f hash
 
diff --git a/tools/mkimage-base/Makefile b/tools/mkimage-base/Makefile
index 1c7e43e69..08056661f 100644
--- a/tools/mkimage-base/Makefile
+++ b/tools/mkimage-base/Makefile
@@ -11,15 +11,15 @@ hash: Dockerfile mkimage.sh
 	docker run --entrypoint=/bin/sh --rm $(IMAGE):build -c "cat $^ /lib/apk/db/installed | sha1sum" | sed 's/ .*//' > $@
 
 push: hash
-	docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
-		 (docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \
-		  docker push mobylinux/$(IMAGE):$(shell cat hash))
+	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
+		 (docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash) && \
+		  docker push linuxkit/$(IMAGE):$(shell cat hash))
 	docker rmi $(IMAGE):build
 	rm -f hash
 
 tag: hash
-	docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
-		docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash)
+	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
+		docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash)
 	docker rmi $(IMAGE):build
 	rm -f hash
 
diff --git a/tools/mkimage-base/mkimage.sh b/tools/mkimage-base/mkimage.sh
index a9ec15c4b..635a89897 100755
--- a/tools/mkimage-base/mkimage.sh
+++ b/tools/mkimage-base/mkimage.sh
@@ -39,7 +39,7 @@ nameserver 2001:4860:4860::8888
 nameserver 2001:4860:4860::8844
 EOF
 
-printf 'moby' > etc/hostname
+printf 'linuxkit' > etc/hostname
 
 ln -s /proc/mounts etc/mtab
 
diff --git a/tools/mkimage-gcp/Dockerfile b/tools/mkimage-gcp/Dockerfile
index 0ee52d285..6a241f530 100644
--- a/tools/mkimage-gcp/Dockerfile
+++ b/tools/mkimage-gcp/Dockerfile
@@ -1,4 +1,4 @@
-FROM mobylinux/guestfs:69698aca5bfcb8c4d3a3bbe6d8656be155bf8cd6@sha256:703a7372ada5b3db64a11bc8c60eec06659a1052d9296fa0c556ed3faf75c182
+FROM linuxkit/guestfs:2657580764d5791e103647237dac5a0276533e2e@sha256:8f99eba6720df17bce8893052d7ca9a07cdc9cd09b335a5a9c57ebd5a44934be
 
 COPY . .
 
diff --git a/tools/mkimage-gcp/Makefile b/tools/mkimage-gcp/Makefile
index e3734df3a..868ea39fe 100644
--- a/tools/mkimage-gcp/Makefile
+++ b/tools/mkimage-gcp/Makefile
@@ -9,15 +9,15 @@ hash: Dockerfile make-gcp
 	docker run --entrypoint sh --rm $(IMAGE):build -c "(cat $^; apt list --installed 2>/dev/null) | sha1sum" | sed 's/ .*//' > hash
 
 push: hash
-	docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
-		(docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \
-		 docker push mobylinux/$(IMAGE):$(shell cat hash))
+	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
+		(docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash) && \
+		 docker push linuxkit/$(IMAGE):$(shell cat hash))
 	docker rmi $(IMAGE):build
 	rm -f hash
 
 tag: hash
-	docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
-		docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash)
+	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
+		docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash)
 	docker rmi $(IMAGE):build
 	rm -f hash
 
diff --git a/tools/mkimage-iso-bios/Makefile b/tools/mkimage-iso-bios/Makefile
index fa5163374..02622fc7f 100644
--- a/tools/mkimage-iso-bios/Makefile
+++ b/tools/mkimage-iso-bios/Makefile
@@ -11,15 +11,15 @@ hash: Dockerfile make-iso
 	docker run --rm --entrypoint /bin/sh $(IMAGE):build -c 'cat $^ /lib/apk/db/installed | sha1sum' | sed 's/ .*//' > $@
 
 push: hash
-	docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
-		(docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \
-		 docker push mobylinux/$(IMAGE):$(shell cat hash))
+	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
+		(docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash) && \
+		 docker push linuxkit/$(IMAGE):$(shell cat hash))
 	docker rmi $(IMAGE):build
 	rm -f hash
 
 tag: hash
-	docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
-		docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash)
+	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
+		docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash)
 	docker rmi $(IMAGE):build
 	rm -f hash
 
diff --git a/tools/mkimage-iso-bios/make-iso b/tools/mkimage-iso-bios/make-iso
index 54daf237d..fe92635bd 100755
--- a/tools/mkimage-iso-bios/make-iso
+++ b/tools/mkimage-iso-bios/make-iso
@@ -35,12 +35,12 @@ LABEL linux
 
 printf "$CFG" > isolinux/isolinux.cfg
 
-genisoimage -o ../mobylinux-bios.iso -l -J -R \
+genisoimage -o ../linuxkit-bios.iso -l -J -R \
                 -c isolinux/boot.cat  \
                 -b isolinux/isolinux.bin \
                    -no-emul-boot -boot-load-size 4 -boot-info-table \
-                -V MobyLinux .
+                -V LinuxKit .
 
-isohybrid ../mobylinux-bios.iso
+isohybrid ../linuxkit-bios.iso
 
-cat ../mobylinux-bios.iso
+cat ../linuxkit-bios.iso
diff --git a/tools/mkimage-iso-efi/Makefile b/tools/mkimage-iso-efi/Makefile
index ab26fc263..08438ed0f 100644
--- a/tools/mkimage-iso-efi/Makefile
+++ b/tools/mkimage-iso-efi/Makefile
@@ -11,15 +11,15 @@ hash: Dockerfile make-efi
 	docker run --rm --entrypoint /bin/sh $(IMAGE):build -c 'cat $^ /lib/apk/db/installed | sha1sum' | sed 's/ .*//' > $@
 
 push: hash
-	docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
-		(docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \
-		 docker push mobylinux/$(IMAGE):$(shell cat hash))
+	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
+		(docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash) && \
+		 docker push linuxkit/$(IMAGE):$(shell cat hash))
 	docker rmi $(IMAGE):build
 	rm -f hash
 
 tag: hash
-	docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
-		docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash)
+	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
+		docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash)
 	docker rmi $(IMAGE):build
 	rm -f hash
 
diff --git a/tools/mkimage-iso-efi/make-efi b/tools/mkimage-iso-efi/make-efi
index a5fe3b255..2d0069138 100755
--- a/tools/mkimage-iso-efi/make-efi
+++ b/tools/mkimage-iso-efi/make-efi
@@ -33,23 +33,23 @@ objcopy \
 	--add-section .linux=./vmlinuz64 --change-section-vma .linux=0x40000 \
 	--add-section .initrd=initrd.img --change-section-vma .initrd=0x3000000 \
 	./linuxx64.efi.stub \
-	mobylinux.efi
+	linuxkit.efi
 
 # create a ISO with a EFI boot partition
 mkdir -p iso
 # Stuff it into a FAT filesystem, making it as small as possible.  511KiB
 # headroom seems to be enough; (x+31)/32*32 rounds up to multiple of 32.
 mkfs.vfat -v -C iso/efi.raw \
-        $(( ($(stat -c %s "mobylinux.efi") / 1024 + 511) \
+        $(( ($(stat -c %s "linuxkit.efi") / 1024 + 511) \
 		/ 32 * 32 )) > /dev/null
 echo "mtools_skip_check=1" >> /etc/mtools.conf && \
 mmd -i iso/efi.raw ::/EFI
 mmd -i iso/efi.raw ::/EFI/BOOT
-mcopy -i iso/efi.raw mobylinux.efi ::/EFI/BOOT/BOOTX64.EFI
+mcopy -i iso/efi.raw linuxkit.efi ::/EFI/BOOT/BOOTX64.EFI
 xorriso -as mkisofs \
-	-R -f -e efi.raw -no-emul-boot -o mobylinux-efi.iso iso
+	-R -f -e efi.raw -no-emul-boot -o linuxkit-efi.iso iso
 
-cat mobylinux-efi.iso
+cat linuxkit-efi.iso
 
 # How to build a VHDX. Commented out because we are currently not using it
 # Don't delete: It took too long to figure out how to do this...
@@ -66,7 +66,7 @@ cat mobylinux-efi.iso
 #     echo "drive c: file=\"/dev/loop/1\" mtools_skip_check=1" > /etc/mtools.conf && \
 #     mmd c:/EFI && \
 #     mmd c:/EFI/BOOT && \
-#     mcopy mobylinux.efi c:/EFI/BOOT/BOOTX64.EFI && \
+#     mcopy linuxkit.efi c:/EFI/BOOT/BOOTX64.EFI && \
 #     losetup -d /dev/loop/1 && \
-#     qemu-img convert -O vhdx disk.raw mobylinux-boot.vhdx && \
-#     cp /tmp/efi/mobylinux.efi /tmp/efi/mobylinuxefi.iso /tmp/efi/mobylinux-boot.vhdx /mnt/
+#     qemu-img convert -O vhdx disk.raw linuxkit-boot.vhdx && \
+#     cp /tmp/efi/linuxkit.efi /tmp/efi/linuxkitefi.iso /tmp/efi/linuxkit-boot.vhdx /mnt/
diff --git a/tools/mkimage-qcow/Dockerfile b/tools/mkimage-qcow/Dockerfile
index c646f2bc5..323bba4c7 100644
--- a/tools/mkimage-qcow/Dockerfile
+++ b/tools/mkimage-qcow/Dockerfile
@@ -1,4 +1,4 @@
-FROM mobylinux/guestfs:69698aca5bfcb8c4d3a3bbe6d8656be155bf8cd6@sha256:703a7372ada5b3db64a11bc8c60eec06659a1052d9296fa0c556ed3faf75c182
+FROM linuxkit/guestfs:2657580764d5791e103647237dac5a0276533e2e@sha256:8f99eba6720df17bce8893052d7ca9a07cdc9cd09b335a5a9c57ebd5a44934be
 
 COPY . .
 
diff --git a/tools/mkimage-qcow/Makefile b/tools/mkimage-qcow/Makefile
index 5e84442ed..33b86d2ba 100644
--- a/tools/mkimage-qcow/Makefile
+++ b/tools/mkimage-qcow/Makefile
@@ -9,15 +9,15 @@ hash: Dockerfile make-qcow
 	docker run --entrypoint sh --rm $(IMAGE):build -c "(cat $^; apt list --installed 2>/dev/null) | sha1sum" | sed 's/ .*//' > hash
 
 push: hash
-	docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
-		(docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \
-		 docker push mobylinux/$(IMAGE):$(shell cat hash))
+	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
+		(docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash) && \
+		 docker push linuxkit/$(IMAGE):$(shell cat hash))
 	docker rmi $(IMAGE):build
 	rm -f hash
 
 tag: hash
-	docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
-		docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash)
+	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
+		docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash)
 	docker rmi $(IMAGE):build
 	rm -f hash
 
diff --git a/tools/mkimage-vhd/Dockerfile b/tools/mkimage-vhd/Dockerfile
index 21080d983..09e114eba 100644
--- a/tools/mkimage-vhd/Dockerfile
+++ b/tools/mkimage-vhd/Dockerfile
@@ -1,4 +1,4 @@
-FROM mobylinux/guestfs:69698aca5bfcb8c4d3a3bbe6d8656be155bf8cd6@sha256:703a7372ada5b3db64a11bc8c60eec06659a1052d9296fa0c556ed3faf75c182
+FROM linuxkit/guestfs:2657580764d5791e103647237dac5a0276533e2e@sha256:8f99eba6720df17bce8893052d7ca9a07cdc9cd09b335a5a9c57ebd5a44934be
 
 COPY . .
 
diff --git a/tools/mkimage-vhd/Makefile b/tools/mkimage-vhd/Makefile
index 5107b33e8..d5b7c14cd 100644
--- a/tools/mkimage-vhd/Makefile
+++ b/tools/mkimage-vhd/Makefile
@@ -9,15 +9,15 @@ hash: Dockerfile make-vhd
 	docker run --entrypoint sh --rm $(IMAGE):build -c "(cat $^; apt list --installed 2>/dev/null) | sha1sum" | sed 's/ .*//' > hash
 
 push: hash
-	docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
-		(docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \
-		 docker push mobylinux/$(IMAGE):$(shell cat hash))
+	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
+		(docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash) && \
+		 docker push linuxkit/$(IMAGE):$(shell cat hash))
 	docker rmi $(IMAGE):build
 	rm -f hash
 
 tag: hash
-	docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
-		docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash)
+	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
+		docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash)
 	docker rmi $(IMAGE):build
 	rm -f hash
 
diff --git a/tools/mkimage-vmdk/Dockerfile b/tools/mkimage-vmdk/Dockerfile
index 5359772ad..c132fb975 100644
--- a/tools/mkimage-vmdk/Dockerfile
+++ b/tools/mkimage-vmdk/Dockerfile
@@ -1,4 +1,4 @@
-FROM mobylinux/guestfs:69698aca5bfcb8c4d3a3bbe6d8656be155bf8cd6@sha256:703a7372ada5b3db64a11bc8c60eec06659a1052d9296fa0c556ed3faf75c182
+FROM linuxkit/guestfs:2657580764d5791e103647237dac5a0276533e2e@sha256:8f99eba6720df17bce8893052d7ca9a07cdc9cd09b335a5a9c57ebd5a44934be
 
 COPY . .
 
diff --git a/tools/mkimage-vmdk/Makefile b/tools/mkimage-vmdk/Makefile
index eed83e1ee..70a369f5d 100644
--- a/tools/mkimage-vmdk/Makefile
+++ b/tools/mkimage-vmdk/Makefile
@@ -9,15 +9,15 @@ hash: Dockerfile make-vmdk
 	docker run --entrypoint sh --rm $(IMAGE):build -c "(cat $^; apt list --installed 2>/dev/null) | sha1sum" | sed 's/ .*//' > hash
 
 push: hash
-	docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
-		(docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \
-		 docker push mobylinux/$(IMAGE):$(shell cat hash))
+	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
+		(docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash) && \
+		 docker push linuxkit/$(IMAGE):$(shell cat hash))
 	docker rmi $(IMAGE):build
 	rm -f hash
 
 tag: hash
-	docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
-		docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash)
+	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
+		docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash)
 	docker rmi $(IMAGE):build
 	rm -f hash
 
diff --git a/tools/qemu/Makefile b/tools/qemu/Makefile
index 20e6756f6..d28f5c113 100644
--- a/tools/qemu/Makefile
+++ b/tools/qemu/Makefile
@@ -11,15 +11,15 @@ hash: Dockerfile qemu.sh repositories
 	docker run --rm --entrypoint /bin/sh $(IMAGE):build -c 'cat Dockerfile qemu.sh /lib/apk/db/installed | sha1sum' | sed 's/ .*//' > $@
 
 push: hash
-	docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
-		(docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \
-		 docker push mobylinux/$(IMAGE):$(shell cat hash))
+	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
+		(docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash) && \
+		 docker push linuxkit/$(IMAGE):$(shell cat hash))
 	docker rmi $(IMAGE):build
 	rm -f hash
 
 tag: hash
-	docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
-		docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash)
+	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
+		docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash)
 	docker rmi $(IMAGE):build
 	rm -f hash