diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile
index f3fdcb7a4..a1c9a4ee3 100644
--- a/pkg/containerd/Dockerfile
+++ b/pkg/containerd/Dockerfile
@@ -4,7 +4,7 @@ FROM linuxkit/alpine:8c02670fd2e5c28d03fd39db0bddc1379b3af6b2 as alpine
 RUN apk add tzdata binutils
 RUN mkdir -p /etc/init.d && ln -s /usr/bin/service /etc/init.d/020-containerd
 
-FROM linuxkit/containerd-dev:cb4427eaacaa64a5de9bff9ade5d929de887e280 as containerd-dev
+FROM linuxkit/containerd-dev:8fe97ddfe55ed40190cdc19e50497289d28a9270 as containerd-dev
 
 FROM scratch
 ENTRYPOINT []
diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile
index f01d45ce0..87739340e 100644
--- a/pkg/init/Dockerfile
+++ b/pkg/init/Dockerfile
@@ -1,5 +1,5 @@
 # Dockerfile to build linuxkit/init for linuxkit
-FROM linuxkit/containerd-dev:cb4427eaacaa64a5de9bff9ade5d929de887e280 AS containerd-dev
+FROM linuxkit/containerd-dev:8fe97ddfe55ed40190cdc19e50497289d28a9270 AS containerd-dev
 FROM linuxkit/alpine:8c02670fd2e5c28d03fd39db0bddc1379b3af6b2 AS build
 RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-headers
 
diff --git a/src/cmd/linuxkit/moby/build/images.yaml b/src/cmd/linuxkit/moby/build/images.yaml
index 090e40a46..7db08f231 100644
--- a/src/cmd/linuxkit/moby/build/images.yaml
+++ b/src/cmd/linuxkit/moby/build/images.yaml
@@ -1,12 +1,12 @@
- iso:            linuxkit/mkimage-iso:1051e5f694456b696fde6aeb26f1cbf25182f4e2
- iso-bios:       linuxkit/mkimage-iso-bios:889198b65d933b4029ccf76ac5c89853c6bb189f
- iso-efi:        linuxkit/mkimage-iso-efi:d5d47fb370a7614513ea57906845554ba471db97
- iso-efi-initrd: linuxkit/mkimage-iso-efi-initrd:96b0315fd85fbf3a8f095ba151246da96f30416b
- raw-bios:       linuxkit/mkimage-raw-bios:391590b9f691cd81fc5e4cbc4197eb62ff1f54d5
- raw-efi:        linuxkit/mkimage-raw-efi:1281c7a26b9a61aba630ecb5618a04f7a1c7ac3b
- squashfs:       linuxkit/mkimage-squashfs:078fbec6bb8fd4769cfb48ad42896b1a6c6fff18
+ iso:            linuxkit/mkimage-iso:fbc7d7dff99d2a66967d6e2b509941d35213fde3
+ iso-bios:       linuxkit/mkimage-iso-bios:ff832d8001c34a9ba9c9ba78185d62117516d19c
+ iso-efi:        linuxkit/mkimage-iso-efi:a2acd1a4cc2e7ae651e9e5ffa972b64c4c4b545d
+ iso-efi-initrd: linuxkit/mkimage-iso-efi-initrd:e9be7f33394bec1f9f7d17d56ab789f9f44aac19
+ raw-bios:       linuxkit/mkimage-raw-bios:c64318cfc28b39010b05c7cd48673f397c45c8df
+ raw-efi:        linuxkit/mkimage-raw-efi:8fdb597b5dd0bc3186dbe58bd2bf30b2fc4c438d
+ squashfs:       linuxkit/mkimage-squashfs:d9de62071bed575377e35e944004bcb23c50afab
  gcp:            linuxkit/mkimage-gcp:035c2c2b4b958060c0b6bdd41d9cbc886a335098
- qcow2-efi:      linuxkit/mkimage-qcow2-efi:1f4f348c0b894276c62493de4bc8bf20747cc2e9
+ qcow2-efi:      linuxkit/mkimage-qcow2-efi:cb7e7128b1327f2b82abf8b22e68da8898896d53
  vhd:            linuxkit/mkimage-vhd:91bcc7a6475f46a3d5d84cf6161f07c583dd9c21
  dynamic-vhd:    linuxkit/mkimage-dynamic-vhd:b755f8ff82c8631d18decaebb09867e7b88c2533
  vmdk:           linuxkit/mkimage-vmdk:20a370a55bd8d58c2ae9d634c297a955bb006efd
diff --git a/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile
index 8ec4c590e..4281ba8b0 100644
--- a/test/pkg/containerd/Dockerfile
+++ b/test/pkg/containerd/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/containerd-dev:cb4427eaacaa64a5de9bff9ade5d929de887e280 as containerd-dev
+FROM linuxkit/containerd-dev:8fe97ddfe55ed40190cdc19e50497289d28a9270 as containerd-dev
 FROM linuxkit/alpine:8c02670fd2e5c28d03fd39db0bddc1379b3af6b2 AS mirror
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 # btrfs-progfs is required for btrfs test (mkfs.btrfs)
diff --git a/tools/grub/Dockerfile b/tools/grub/Dockerfile
index 299e5c50f..3a63840bd 100644
--- a/tools/grub/Dockerfile
+++ b/tools/grub/Dockerfile
@@ -1,6 +1,6 @@
-FROM --platform=linux/amd64 linuxkit/grub-dev:7bcb9d21eb1d817a40fe2f1a84fdbf8655ad2f40 AS grub-build-amd64
-FROM --platform=linux/arm64 linuxkit/grub-dev:7bcb9d21eb1d817a40fe2f1a84fdbf8655ad2f40 AS grub-build-arm64
-FROM --platform=linux/riscv64 linuxkit/grub-dev:7bcb9d21eb1d817a40fe2f1a84fdbf8655ad2f40 AS grub-build-riscv64
+FROM --platform=linux/amd64 linuxkit/grub-dev:4e6e8ee698d553583951f5ae3eddbce52b612001 AS grub-build-amd64
+FROM --platform=linux/arm64 linuxkit/grub-dev:4e6e8ee698d553583951f5ae3eddbce52b612001 AS grub-build-arm64
+FROM --platform=linux/riscv64 linuxkit/grub-dev:4e6e8ee698d553583951f5ae3eddbce52b612001 AS grub-build-riscv64
 
 FROM scratch
 ENTRYPOINT []
diff --git a/tools/mkimage-iso-efi-initrd/Dockerfile b/tools/mkimage-iso-efi-initrd/Dockerfile
index b61a54244..62e1dc583 100644
--- a/tools/mkimage-iso-efi-initrd/Dockerfile
+++ b/tools/mkimage-iso-efi-initrd/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/grub:b498542e496dc2301ac1718d9096c2b26f041635 AS grub
+FROM linuxkit/grub:c8864b3c16a130c808a90ae937c3aa726a907b85 AS grub
 
 FROM linuxkit/alpine:e9313150d2cf07ad92b0adb86799dedd9a0476e4 AS mirror
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
diff --git a/tools/mkimage-iso-efi/Dockerfile b/tools/mkimage-iso-efi/Dockerfile
index f6c4fffd1..1c205bbc1 100644
--- a/tools/mkimage-iso-efi/Dockerfile
+++ b/tools/mkimage-iso-efi/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/grub:b498542e496dc2301ac1718d9096c2b26f041635 AS grub
+FROM linuxkit/grub:c8864b3c16a130c808a90ae937c3aa726a907b85 AS grub
 
 FROM linuxkit/alpine:e9313150d2cf07ad92b0adb86799dedd9a0476e4 AS mirror
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
diff --git a/tools/mkimage-qcow2-efi/Dockerfile b/tools/mkimage-qcow2-efi/Dockerfile
index 0bbe6162d..1a854c44e 100644
--- a/tools/mkimage-qcow2-efi/Dockerfile
+++ b/tools/mkimage-qcow2-efi/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/grub:b498542e496dc2301ac1718d9096c2b26f041635 AS grub
+FROM linuxkit/grub:c8864b3c16a130c808a90ae937c3aa726a907b85 AS grub
 
 FROM linuxkit/alpine:e9313150d2cf07ad92b0adb86799dedd9a0476e4 AS mirror
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
diff --git a/tools/mkimage-raw-efi/Dockerfile b/tools/mkimage-raw-efi/Dockerfile
index b78a80b76..e9dc1e60b 100644
--- a/tools/mkimage-raw-efi/Dockerfile
+++ b/tools/mkimage-raw-efi/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/grub:b498542e496dc2301ac1718d9096c2b26f041635 AS grub
+FROM linuxkit/grub:c8864b3c16a130c808a90ae937c3aa726a907b85 AS grub
 
 FROM linuxkit/alpine:e9313150d2cf07ad92b0adb86799dedd9a0476e4 AS mirror
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/