diff --git a/src/cmd-build b/src/cmd-build
index 63724017ff..fcdf629534 100755
--- a/src/cmd-build
+++ b/src/cmd-build
@@ -242,10 +242,21 @@ img_base=tmp/${imageprefix}-base.qcow2
 # forgive me for this sin
 checksum_location=$(find /usr/lib/coreos-assembler-anaconda/ -name '*CHECKSUM' | head -1)
 
+# Hack to force qemu to default to config drive based install on s390x
+# See these PRs for relevant discussion:
+#   Long term feature request          - https://github.com/coreos/ignition/issues/825
+#   Short term workaround in ignition  - https://github.com/coreos/ignition/pull/905
+#   Related/Alternative Hack to dracut - https://github.com/coreos/ignition-dracut/pull/145
+#   Multi-Arch 4.2 CoreOS workaround   - https://github.com/coreos/coreos-assembler/pull/1004
+platformid=qemu
+if [ "$arch" == "s390x" ]; then
+  platformid=openstack
+fi
+
 if [ -n "${build_qemu}" ]; then
     img_qemu=${imageprefix}-qemu.qcow2
     run_virtinstall "${tmprepo}" "${ref}" "${PWD}"/"${img_base}" --variant=cloud
-    /usr/lib/coreos-assembler/gf-platformid "$(pwd)"/"${img_base}" "$(pwd)"/"${img_qemu}" qemu
+    /usr/lib/coreos-assembler/gf-platformid "$(pwd)"/"${img_base}" "$(pwd)"/"${img_qemu}" ${platformid}
 fi
 
 "${dn}"/write-commit-object "${tmprepo}" "${commit}" "$(pwd)"