diff --git a/inventory/group_vars/buildvm-s390x b/inventory/group_vars/buildvm-s390x
new file mode 100644
index 0000000000..bc83a48580
--- /dev/null
+++ b/inventory/group_vars/buildvm-s390x
@@ -0,0 +1,19 @@
+---
+createrepo: False
+host_group: kojibuilder
+fas_client_groups: sysadmin-releng
+sudoers: "{{ private }}/files/sudo/00releng-sudoers"
+
+koji_hub_nfs: "fedora_koji"
+koji_server_url: "https://koji.fedoraproject.org/kojihub"
+koji_weburl: "https://koji.fedoraproject.org/koji"
+koji_topurl: "https://kojipkgs.fedoraproject.org/"
+
+csi_security_category: High
+csi_primary_contact: Fedora Admins - admin@fedoraproject.org
+csi_purpose: Koji service employs a set of machines to build packages for the Fedora project. This playbook builds vm builders.
+csi_relationship: |
+  * VMs built on top of a s390x LPAR
+  * Relies on koji-hub, Packages, PkgDB, apache, fedmsg, fas, virthost, and is monitored by nagios
+  * Several services rely on the builders, including koschei, Bodhi, Tagger, SCM, Darkserver.
+  * Produces automated builds of packages for the architecture listed. Builders can be scaled by adding new
diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml
index 33b959e5e0..610d851d11 100644
--- a/playbooks/groups/buildvm.yml
+++ b/playbooks/groups/buildvm.yml
@@ -6,7 +6,7 @@
 - include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=buildvm:buildvm-stg:buildvm-aarch64:buildvm-ppc64:buildvm-ppc64le:buildppcle:buildppc:buildvm-s390:buildvm-ppc64-stg:buildvm-ppc64le-stg:buildvm-aarch64-stg:buildvm-armv7-stg"
 
 - name: make koji builder(s)
-  hosts: buildvm:buildvm-stg:buildvm-aarch64:buildvm-ppc64:buildvm-ppc64le:buildppcle:buildppc:buildvm-s390:buildvm-ppc64-stg:buildvm-ppc64le-stg:buildvm-aarch64-stg:buildvm-armv7-stg
+  hosts: buildvm:buildvm-stg:buildvm-aarch64:buildvm-ppc64:buildvm-ppc64le:buildppcle:buildppc:buildvm-s390:buildvm-ppc64-stg:buildvm-ppc64le-stg:buildvm-aarch64-stg:buildvm-armv7-stg:buildvm-s390x
   user: root
   gather_facts: True