diff --git a/tools/packaging/scripts/configure-hypervisor.sh b/tools/packaging/scripts/configure-hypervisor.sh
index 1e3e2f6088..31dc4db25f 100755
--- a/tools/packaging/scripts/configure-hypervisor.sh
+++ b/tools/packaging/scripts/configure-hypervisor.sh
@@ -322,7 +322,26 @@ generate_qemu_options() {
 	# But since QEMU 5.2 the daemon is built as part of the tools set
 	# (disabled with --disable-tools) thus it needs to be explicitely
 	# enabled.
-	qemu_options+=(functionality:--enable-virtiofsd)
+	#
+	# From Kata Containers 2.5.0-alpha2 x86_64 has been using the new
+	# implementation of virtiofs daemon, which is not part of QEMU.
+	# For the other arches, at least for now, keep building from while
+	# building QEMU.
+	#
+	# IOW, other arches are still using the C version of the virtiofsd.
+	case "$arch" in
+	aarch64)
+		qemu_options+=(functionality:--enable-virtiofsd)
+		;;
+	x86_64)
+		;;
+	ppc64le)
+		qemu_options+=(functionality:--enable-virtiofsd)
+		;;
+	s390x)
+		qemu_options+=(functionality:--enable-virtiofsd)
+		;;
+	esac
 	qemu_options+=(functionality:--enable-virtfs)
 
 	# Don't build linux-user bsd-user
diff --git a/tools/packaging/static-build/scripts/qemu-build-post.sh b/tools/packaging/static-build/scripts/qemu-build-post.sh
index da4c5d6d27..1b10b2aa0a 100755
--- a/tools/packaging/static-build/scripts/qemu-build-post.sh
+++ b/tools/packaging/static-build/scripts/qemu-build-post.sh
@@ -26,7 +26,9 @@ done
 if [[ -n "${BUILD_SUFFIX}" ]]; then
 	echo "Rename binaries using $BUILD_SUFFIX"
 	find -name 'qemu-system-*' -exec mv {} {}-experimental \;
-	find -name 'virtiofsd' -exec mv {} {}-experimental \;
+	if [[ ${ARCH} != "x86_64" ]]; then
+		find -name 'virtiofsd' -exec mv {} {}-experimental \;
+	fi
 fi
 
 echo "INFO: create the tarball"