diff --git a/tools/packaging/scripts/configure-hypervisor.sh b/tools/packaging/scripts/configure-hypervisor.sh
index 31dc4db25f..6bf4c1107e 100755
--- a/tools/packaging/scripts/configure-hypervisor.sh
+++ b/tools/packaging/scripts/configure-hypervisor.sh
@@ -317,31 +317,6 @@ generate_qemu_options() {
 	# Don't build the qemu-io, qemu-nbd and qemu-image tools
 	qemu_options+=(size:--disable-tools)
 
-	# Kata Containers may be configured to use the virtiofs daemon.
-	#
-	# 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.
-	#
-	# 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/virtiofsd/build-static-virtiofsd.sh b/tools/packaging/static-build/virtiofsd/build-static-virtiofsd.sh
index b23fa9a8de..28124fa775 100755
--- a/tools/packaging/static-build/virtiofsd/build-static-virtiofsd.sh
+++ b/tools/packaging/static-build/virtiofsd/build-static-virtiofsd.sh
@@ -52,7 +52,7 @@ init_env() {
        LIBC="gnu"
        ARCH="powerpc64le"
      ;;
-     "s390")
+     "s390x")
        LIBC="gnu"
      ;;
      "x86_64")