diff --git a/rootfs-builder/rootfs.sh b/rootfs-builder/rootfs.sh
index a281f07d7e..f9ac213902 100755
--- a/rootfs-builder/rootfs.sh
+++ b/rootfs-builder/rootfs.sh
@@ -162,6 +162,9 @@ generate_dockerfile()
 		"aarch64")
 			goarch=arm64
 			;;
+		"s390x")
+			goarch=s390x
+			;;
 
 		*)
 			goarch=amd64
diff --git a/rootfs-builder/ubuntu/config.sh b/rootfs-builder/ubuntu/config.sh
index 4c9c081a7e..40263c12e3 100644
--- a/rootfs-builder/ubuntu/config.sh
+++ b/rootfs-builder/ubuntu/config.sh
@@ -20,6 +20,7 @@ case $(arch) in
 	x86_64) ARCHITECTURE="amd64";;
 	ppc64le) ARCHITECTURE="ppc64el";;
 	aarch64) ARCHITECTURE="arm64";;
+	s390x)	ARCHITECTURE="s390x";;
 	(*) die "$(arch) not supported "
 esac