diff --git a/tools/packaging/static-build/qemu/Dockerfile b/tools/packaging/static-build/qemu/Dockerfile
index b06c345504..1e4441daec 100644
--- a/tools/packaging/static-build/qemu/Dockerfile
+++ b/tools/packaging/static-build/qemu/Dockerfile
@@ -56,6 +56,9 @@ ARG QEMU_REPO
 # commit/tag/branch
 ARG QEMU_VERSION
 ARG PREFIX
+# BUILD_SUFFIX is used by the qemu-build-post.sh script to
+# properly rename non vanilla versions of the QEMU
+ARG BUILD_SUFFIX
 ARG HYPERVISOR_NAME
 ARG PKGVERSION
 ARG QEMU_DESTDIR
diff --git a/tools/packaging/static-build/qemu/build-base-qemu.sh b/tools/packaging/static-build/qemu/build-base-qemu.sh
index 7d95f02332..0657503f17 100755
--- a/tools/packaging/static-build/qemu/build-base-qemu.sh
+++ b/tools/packaging/static-build/qemu/build-base-qemu.sh
@@ -39,6 +39,7 @@ CACHE_TIMEOUT=$(date +"%Y-%m-%d")
 
 sudo "${container_engine}" build \
 	--build-arg CACHE_TIMEOUT="${CACHE_TIMEOUT}" \
+	--build-arg BUILD_SUFFIX=${build_suffix} \
 	--build-arg HYPERVISOR_NAME="${HYPERVISOR_NAME}" \
 	--build-arg PKGVERSION="${PKGVERSION}" \
 	--build-arg http_proxy="${http_proxy}" \