diff --git a/pkg/kvm-tools/Dockerf.5.1 b/pkg/kvm-tools/Dockerf.5.1
deleted file mode 100644
index ff5d7cd798..0000000000
--- a/pkg/kvm-tools/Dockerf.5.1
+++ /dev/null
@@ -1,68 +0,0 @@
-FROM alpine:3.12 as build
-
-ENV KVMTOOL_VERSION=90b2d3adadf218dfc6bdfdfcefe269843360223c
-
-ADD  https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/snapshot/kvmtool-${KVMTOOL_VERSION}.tar.gz /kvmtool.tar.gz
-COPY 0001-Makefile-Update-bfd-detection.patch /
-
-RUN apk add --no-cache       \
-      gcc=9.3.0-r2           \
-      make=4.3-r0            \
-      libc-dev=0.7.2-r3      \
-      binutils-dev=2.34-r1   \
-      patch=2.7.6-r6         \
-      libaio-dev=0.3.112-r1  \
-      zlib-dev=1.2.11-r3     \
-      zlib-static=1.2.11-r3  \
-      linux-headers=5.4.5-r1 \
-      libvncserver-dev=0.9.13-r1
-
-RUN tar xzvf kvmtool.tar.gz > /dev/null 2>&1 ;\
-    mv kvmtool-${KVMTOOL_VERSION} kvmtool
-
-WORKDIR /kvmtool
-
-RUN patch -p1 < /0001-Makefile-Update-bfd-detection.patch ;\
-    make && make install DESTDIR=/usr HOME=
-
-# Building qemu in strip-down mirovm only mode
-RUN apk add python3 glib-dev pixman-dev
-
-WORKDIR /qemu-5.1.0
-RUN apk add curl
-RUN curl https://download.qemu.org/qemu-5.1.0.tar.xz | tar -C / -xJvf -
-
-COPY i386-softmmu.mak default-configs/i386-softmmu.mak
-
-# x86_64-softmmu i386-softmmu
-# --block-drv-whitelist=L --block-drv-rw-whitelist=L --block-drv-ro-whitelist=L
-# --enable-trace-backends
-# --with-coroutine
-# --disable-system
-# --audio-drv-list=none
-# ? --disable-vxhs
-RUN ./configure --enable-kvm --without-default-devices --disable-tcg --target-list=x86_64-softmmu --disable-slirp --disable-user --disable-linux-user --disable-bsd-user --disable-docs --disable-guest-agent --disable-guest-agent-msi --disable-pie --disable-modules --disable-module-upgrades --disable-debug-tcg --disable-debug-info --disable-sparse --disable-gnutls --disable-nettle --disable-gcrypt --disable-auth-pam --disable-sdl --disable-sdl-image --disable-gtk --disable-vte --disable-curses --disable-iconv --disable-vnc --disable-vnc-sasl --disable-vnc-jpeg --disable-vnc-png --disable-cocoa --disable-virtfs --disable-mpath --disable-xen --disable-xen-pci-passthrough --disable-brlapi --disable-curl --disable-membarrier --disable-fdt --disable-hax --disable-hvf --disable-whpx --disable-rdma --disable-pvrdma --disable-vde --disable-netmap --disable-linux-aio --disable-linux-io-uring --disable-cap-ng --disable-attr --disable-vhost-net --disable-vhost-vsock --disable-vhost-scsi --disable-vhost-crypto --disable-vhost-kernel --disable-vhost-user --disable-spice --disable-rbd --disable-libiscsi --disable-libnfs --disable-smartcard --disable-libusb --disable-live-block-migration --disable-usb-redir --disable-lzo --disable-snappy --disable-bzip2 --disable-lzfse --disable-zstd --disable-seccomp --disable-coroutine-pool --disable-glusterfs --disable-tpm --disable-libssh --disable-numa --disable-libxml2 --disable-tcmalloc --disable-jemalloc --disable-avx2 --disable-avx512f --disable-replication --disable-opengl --disable-virglrenderer --disable-xfsctl --disable-qom-cast-debug --disable-tools --disable-bochs --disable-cloop --disable-dmg --disable-qcow1 --disable-vdi --disable-vvfat --disable-qed --disable-parallels --disable-sheepdog --disable-crypto-afalg --disable-capstone --disable-debug-mutex --disable-libpmem --disable-xkbcommon
-
-# qemu's configure script takes presence of as sys/signal.h as
-# a hint to set HAVE_SYS_SIGNAL_H=y, meanwhile the only reason
-# musl has sys/signal.h to begin with is to warn not to use it
-RUN sed -ie '/^HAVE_SYS_SIGNAL_H=y/d' config-host.mak
-
-RUN make -j "$(getconf _NPROCESSORS_ONLN)" V=1
-RUN strip qemu-5.1.0/x86_64-softmmu/qemu-system-x86_64
-
-FROM alpine:3.12
-
-RUN apk add --no-cache \
-            pixman glib \
-            libvncserver=0.9.13-r1 \
-            libaio=0.3.112-r1
-
-COPY --from=build /usr/bin/lkvm /usr/bin/lkvm
-COPY --from=build /qemu/qemu-5.1.0/x86_64-softmmu/qemu-system-x86_64 /usr/bin/qemu-system-x86_64
-RUN ln -sf lkvm /usr/bin/vm
-RUN ldd /usr/bin/lkvm
-
-#ENTRYPOINT []
-#CMD ["/usr/sbin/vm",]
-
diff --git a/pkg/kvm-tools/Dockerfile b/pkg/kvm-tools/Dockerfile
index 2fdd2228ce..f679b51fd4 100644
--- a/pkg/kvm-tools/Dockerfile
+++ b/pkg/kvm-tools/Dockerfile
@@ -13,11 +13,10 @@ RUN eve-alpine-deploy.sh
 
 ENV KVMTOOL_VERSION=90b2d3adadf218dfc6bdfdfcefe269843360223c
 
-ADD  https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/snapshot/kvmtool-${KVMTOOL_VERSION}.tar.gz /kvmtool.tar.gz
+ADD https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool.git/+archive/${KVMTOOL_VERSION}.tar.gz /kvmtool.tar.gz
 COPY *.patch /
 
-RUN tar xzvf kvmtool.tar.gz > /dev/null 2>&1 ;\
-    mv kvmtool-${KVMTOOL_VERSION} kvmtool
+RUN mkdir -p /kvmtool && tar xzvf kvmtool.tar.gz -C /kvmtool > /dev/null 2>&1
 
 WORKDIR /kvmtool