diff --git a/.ci/lib.sh b/.ci/lib.sh
index 200fd71957..d8a1b2d880 100644
--- a/.ci/lib.sh
+++ b/.ci/lib.sh
@@ -43,6 +43,10 @@ install_yq() {
 		goarch=ppc64le
 		;;
 
+	"s390x")
+		goarch=s390x
+		;;
+
 	"*")
 		echo "Arch $(arch) not supported"
 		exit
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 40e47a1815..fb24768cc1 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -210,6 +210,10 @@ parts:
           config="arm64_kata_kvm_${x_version}"
         ;;
 
+        "s390x")
+          config="s390_kata_kvm_${x_version}"
+        ;;
+
         *)
           echo "ERROR: Unsupported architecture $(arch)"
           exit 1