diff --git a/multi-arch-builders/README.md b/multi-arch-builders/README.md
index 45ff6101f..79c1926ca 100644
--- a/multi-arch-builders/README.md
+++ b/multi-arch-builders/README.md
@@ -98,7 +98,7 @@ cat builder-common.bu | butane --pretty --strict > builder-common.ign
 cat coreos-ppc64le-builder.bu | butane --pretty --strict --files-dir=. > coreos-ppc64le-builder.ign
 ```
 
-To connect to this machine first add 
+To connect to this machine first add
 [custom ssh configuration](https://docs.fedoraproject.org/en-US/infra/sysadmin_guide/sshaccess/#_ssh_configuration)
 for connecting to machines via Fedora bastion hosts.
 
@@ -132,8 +132,8 @@ container where ibmcloud is running:
 
 ```bash
 cat builder-common.bu | butane --pretty --strict > builder-common.ign
-cat coreos-s390x-builder.bu | butane --pretty --strict --files-dir=. > coreos-s390x-builder.ign
-podman cp coreos-s390x-builder.ign ibmcloud:/root/coreos-s390x-builder.ign
+cat coreos-s390x-fcos-builder.bu | butane --pretty --strict --files-dir=. > coreos-s390x-fcos-builder.ign
+podman cp coreos-s390x-fcos-builder.ign ibmcloud:/root/coreos-s390x-fcos-builder.ign
 ```
 
 Now we can start the instance:
@@ -147,7 +147,7 @@ IMAGE='r038-369d6b9c-f0d1-4daf-bda4-252df3aa4728'
 SUBNET='02q7-1df6496a-b363-4f3b-9204-0a2b06855a2f'
 ibmcloud is instance-create $NAME $VPC $ZONE $PROFILE $SUBNET --output json --image-id $IMAGE \
      --boot-volume '{"name": "my-boot-vol-1", "volume": {"capacity": 200, "profile": {"name": "general-purpose"}}}' \
-     --user-data @coreos-s390x-builder.ign > out.json
+     --user-data @coreos-s390x-fcos-builder.ign > out.json
 ```
 
 
diff --git a/multi-arch-builders/coreos-s390x-builder.bu b/multi-arch-builders/coreos-s390x-fcos-builder.bu
similarity index 100%
rename from multi-arch-builders/coreos-s390x-builder.bu
rename to multi-arch-builders/coreos-s390x-fcos-builder.bu
diff --git a/multi-arch-builders/coreos-s390x-rhcos-builder.bu b/multi-arch-builders/coreos-s390x-rhcos-builder.bu
new file mode 100644
index 000000000..f751569ab
--- /dev/null
+++ b/multi-arch-builders/coreos-s390x-rhcos-builder.bu
@@ -0,0 +1,32 @@
+# This butane config will do the following:
+#
+# - Merge in the builder-common.ign Ignition file
+# - Allow the builder user to log in with the associated ssh key
+# - Set a hostname
+#
+variant: fcos
+version: 1.4.0
+ignition:
+  config:
+    merge:
+      - source: http://foo/bar/builder-common.ign
+passwd:
+  users:
+    - name: builder
+      ssh_authorized_keys:
+        - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBYuN4Crt4kwszp25BPpNGc8xPiVyXwXAGILQmBOOvCq builder@fcos-pipeline-s390x
+        - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEA9fEPuFwffqoqOFa9R0mIbUCaeHB03ql/QcTQ5Bqlx builder@rhcos-pipeline-s390x
+    - name: core
+      ssh_authorized_keys:
+        - ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAgEAkNiuIximCsbukdOoG99V8dZB3FexJC6CHLuuRUT3xYYXqtcKQXcvb7Nj02zHOiHk34mFpAKNKISFV2pM9qd3TE1Iv7iFkfZanYf4USzHhb5Lm7ZU16H7RyPiCF/YkZ7obmIRb6MOqClGwPTqtYQtOuMR8d35/fJcOijXun1Mt07QG2AHrRVt3Z1gtyxaFz5hln9UUW1Wqby9FKANw3OIZ1xwn/qEZr5dKxGea0mE2PVC5hEerzrC5xIGO00zivKvwtyKnKB5dFCLtvQrPhaYAHKHJBTpMmzjQWgs4MdD6JwFrUSICuiiaVLd8bMGjJgSKsM0t3CJS7J2v9l0ZO0yRd1UdTau6JEbYOjMdE5MRutBUfCLhxkFIfOEQgLf0lE1UxU2XsJQ/zdnMXtExwhSMKfYlOyw1PgP7j8tUuEElY9Pr1pDEm0th4SAwq3+hnFGyP00gddhHY9qYUHi+lwj82lvjPQccSBso+nuJ8L2485e8WUultAUAYQ2MGscPYihkSJXxs0O17k7aLVzz+E8e1UgSuUAcQlrdxson6+P/O9qFnLAKQ+fYJHfoET+RVht4f94lbhr15M9IJGHZGQexwqshuABhsE2DKtT1/nizsl+85CpF1Esj3w1mEGhuDEiuCmC7wI0i12+YMuuYMdGcM75mhWFD0QjIjwcQjmmZyk= jan.schintag@de.ibm.com
+kernel_arguments:
+  should_exist:
+    # enables Secure Execution Host
+    - prot_virt=1
+storage:
+  files:
+    - path: /etc/hostname
+      mode: 0644
+      overwrite: true
+      contents:
+        inline: rdu-z15-l21