diff --git a/static-build/qemu/Dockerfile b/static-build/qemu/Dockerfile
index cdac599165..34ab29805f 100644
--- a/static-build/qemu/Dockerfile
+++ b/static-build/qemu/Dockerfile
@@ -36,12 +36,15 @@ RUN apt-get install -y \
 RUN cd  .. && git clone "${QEMU_REPO}" qemu
 RUN git checkout "${QEMU_VERSION}"
 RUN git clone https://github.com/qemu/capstone.git capstone
-RUN git clone  https://github.com/qemu/keycodemapdb.git ui/keycodemapdb
+RUN git clone https://github.com/qemu/keycodemapdb.git ui/keycodemapdb
 
-ADD configure-hypervisor.sh /root/configure-hypervisor.sh
+ADD scripts/configure-hypervisor.sh /root/configure-hypervisor.sh
+ADD qemu/patches/* /root/kata_qemu_patches
+
+RUN for patch in /root/kata_qemu_patches/*.patch; do git apply "$patch"; done
 
 RUN PREFIX="${PREFIX}" /root/configure-hypervisor.sh -s kata-qemu | xargs ./configure \
-       --with-pkgversion=kata-static
+	--with-pkgversion=kata-static
 
 RUN make -j$(nproc)
 RUN make install DESTDIR=/tmp/qemu-static
diff --git a/static-build/qemu/build-static-qemu.sh b/static-build/qemu/build-static-qemu.sh
index 00439951d0..d2986897cd 100755
--- a/static-build/qemu/build-static-qemu.sh
+++ b/static-build/qemu/build-static-qemu.sh
@@ -12,7 +12,7 @@ script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 source "${script_dir}/../../scripts/lib.sh"
 
-config_dir="${script_dir}/../../scripts/"
+packaging_dir="${script_dir}/../.."
 qemu_tar="kata-qemu-static.tar.gz"
 
 qemu_repo="${qemu_repo:-}"
@@ -44,7 +44,7 @@ sudo docker build \
 	--build-arg QEMU_REPO="${qemu_repo}" \
 	--build-arg QEMU_VERSION="${qemu_version}" \
 	--build-arg PREFIX="${prefix}" \
-	"${config_dir}" \
+	"${packaging_dir}" \
 	-f "${script_dir}/Dockerfile" \
 	-t qemu-static