diff --git a/tools/mkimage-iso-efi/Dockerfile b/tools/mkimage-iso-efi/Dockerfile
index ab586709c..7c55144a0 100644
--- a/tools/mkimage-iso-efi/Dockerfile
+++ b/tools/mkimage-iso-efi/Dockerfile
@@ -1,5 +1,4 @@
 FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS grub-build
-
 RUN apk add \
   automake \
   make \
@@ -39,19 +38,22 @@ RUN mkdir /grub-lib && \
     ;; \
   esac
 
-FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS make-img
-
-RUN \
-  apk update && apk upgrade && \
-  apk add --no-cache \
+FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc 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 \
+  binutils \
+  busybox \
   dosfstools \
   libarchive-tools \
-  binutils \
   mtools \
   xorriso \
   && true
+RUN mv /out/etc/apk/repositories.upstream /out/etc/apk/repositories
 
-COPY . .
+FROM scratch
+WORKDIR /
+COPY --from=mirror /out/ /
 COPY --from=grub-build /grub-lib/BOOT*.EFI /usr/local/share/
-
+COPY . .
 ENTRYPOINT [ "/make-efi" ]