diff --git a/src/cmd/linuxkit/moby/build/images.yaml b/src/cmd/linuxkit/moby/build/images.yaml
index 20338489f..63a1c7549 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:8c45e3a3b5609bcd382a15c4fcd8168a1d5ab663
  iso-bios:       linuxkit/mkimage-iso-bios:a3b0fba84cb679c9225e568d3f158c77c9e61d33
- iso-efi:        linuxkit/mkimage-iso-efi:8f236be3db79ac1bf1e356efa97860f6c99bc367
- iso-efi-initrd: linuxkit/mkimage-iso-efi-initrd:fbe42dd74527af8b7b1b804eb3afefcbf9663c67
+ iso-efi:        linuxkit/mkimage-iso-efi:c3e2084af951f8d5914e7f455c975ebfd7e3df89
+ iso-efi-initrd: linuxkit/mkimage-iso-efi-initrd:35fa0d91ebdc163a1d2eb82991e563e1ab30ea1b
  raw-bios:       linuxkit/mkimage-raw-bios:a11bbe671863a75c68c58e9454d3246ab406567c
- raw-efi:        linuxkit/mkimage-raw-efi:60415b45ea87afd47bb61ef5409b1320882d7e56
+ raw-efi:        linuxkit/mkimage-raw-efi:2bbcc8d38a9c44a50378ec6de9e3100e9901ac34
  squashfs:       linuxkit/mkimage-squashfs:3433e24dbecc28d1b70469bc36d91c152355841c
  gcp:            linuxkit/mkimage-gcp:7f220881aed6336708b62afea9820e436b573cea
- qcow2-efi:      linuxkit/mkimage-qcow2-efi:203809755424fb601f63700f13f17dc65cef69b5
+ qcow2-efi:      linuxkit/mkimage-qcow2-efi:5fc6ed9d82591c26e5eab75e680da49aeba5a2b5
  vhd:            linuxkit/mkimage-vhd:c6f7696575081986bdda9a6b48ead70498e2aeee
  dynamic-vhd:    linuxkit/mkimage-dynamic-vhd:f76ac6c6803e9e25d09f22f7fe431e5386885a85
  vmdk:           linuxkit/mkimage-vmdk:e2f2973907ca1ad412344cebd11bfa6d47dd6099
diff --git a/tools/grub-dev/Dockerfile b/tools/grub-dev/Dockerfile
index 8ce0da6f7..6982d84fc 100644
--- a/tools/grub-dev/Dockerfile
+++ b/tools/grub-dev/Dockerfile
@@ -1,6 +1,6 @@
 FROM linuxkit/alpine:35b33c6b03c40e51046c3b053dd131a68a26c37a AS build
 ENV GRUB_MODULES="part_gpt fat ext2 iso9660 gzio linux acpi normal cpio crypto disk boot crc64 \
-search_fs_uuid tftp xzio xfs video"
+search_fs_uuid tftp xzio xfs video efi_gop"
 
 RUN apk add \
   grub \
diff --git a/tools/grub/Dockerfile b/tools/grub/Dockerfile
index fe53f3fba..724f6c42a 100644
--- a/tools/grub/Dockerfile
+++ b/tools/grub/Dockerfile
@@ -1,6 +1,6 @@
-FROM --platform=linux/amd64 linuxkit/grub-dev:4184bd7644a0edf73d4fe8a55171fe06f4b4d738 AS grub-build-amd64
-FROM --platform=linux/arm64 linuxkit/grub-dev:4184bd7644a0edf73d4fe8a55171fe06f4b4d738 AS grub-build-arm64
-FROM --platform=linux/riscv64 linuxkit/grub-dev:4184bd7644a0edf73d4fe8a55171fe06f4b4d738 AS grub-build-riscv64
+FROM --platform=linux/amd64 linuxkit/grub-dev:7a0ddb328a3a611efed60e2ccb0098dab7558149 AS grub-build-amd64
+FROM --platform=linux/arm64 linuxkit/grub-dev:7a0ddb328a3a611efed60e2ccb0098dab7558149 AS grub-build-arm64
+FROM --platform=linux/riscv64 linuxkit/grub-dev:7a0ddb328a3a611efed60e2ccb0098dab7558149 AS grub-build-riscv64
 
 FROM scratch
 ENTRYPOINT []
diff --git a/tools/mkimage-iso-efi-initrd/Dockerfile b/tools/mkimage-iso-efi-initrd/Dockerfile
index ce2395469..71678eb72 100644
--- a/tools/mkimage-iso-efi-initrd/Dockerfile
+++ b/tools/mkimage-iso-efi-initrd/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/grub:71cdeee8a0821d1c69ad2750d010377d81316c5d AS grub
+FROM linuxkit/grub:5adb6fee45facb51f3f3b51af382fd21620d4f76 AS grub
 
 FROM linuxkit/alpine:35b33c6b03c40e51046c3b053dd131a68a26c37a 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 1cd8bf65c..6c9848fc8 100644
--- a/tools/mkimage-iso-efi/Dockerfile
+++ b/tools/mkimage-iso-efi/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/grub:71cdeee8a0821d1c69ad2750d010377d81316c5d AS grub
+FROM linuxkit/grub:5adb6fee45facb51f3f3b51af382fd21620d4f76 AS grub
 
 FROM linuxkit/alpine:35b33c6b03c40e51046c3b053dd131a68a26c37a 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 aa42f1358..7cf09ac40 100644
--- a/tools/mkimage-qcow2-efi/Dockerfile
+++ b/tools/mkimage-qcow2-efi/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/grub:71cdeee8a0821d1c69ad2750d010377d81316c5d AS grub
+FROM linuxkit/grub:5adb6fee45facb51f3f3b51af382fd21620d4f76 AS grub
 
 FROM linuxkit/alpine:35b33c6b03c40e51046c3b053dd131a68a26c37a 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 98f31d83a..54461d641 100644
--- a/tools/mkimage-raw-efi/Dockerfile
+++ b/tools/mkimage-raw-efi/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/grub:71cdeee8a0821d1c69ad2750d010377d81316c5d AS grub
+FROM linuxkit/grub:5adb6fee45facb51f3f3b51af382fd21620d4f76 AS grub
 
 FROM linuxkit/alpine:35b33c6b03c40e51046c3b053dd131a68a26c37a AS mirror
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/