diff --git a/overlay.d/05core/usr/libexec/coreos-ignition-firstboot-complete b/overlay.d/05core/usr/libexec/coreos-ignition-firstboot-complete
index 3973d11e04..930928252c 100755
--- a/overlay.d/05core/usr/libexec/coreos-ignition-firstboot-complete
+++ b/overlay.d/05core/usr/libexec/coreos-ignition-firstboot-complete
@@ -3,10 +3,6 @@ set -euo pipefail
 
 mount -o remount,rw /boot
 
-if [[ $(uname -m) = s390x ]]; then
-    zipl
-fi
-
 # We're done provisioning. Remove the whole /boot/ignition directory if present,
 # which may include a baked Ignition config. See
 # https://github.com/coreos/fedora-coreos-tracker/issues/889.
@@ -16,3 +12,7 @@ rm -rf /boot/ignition
 # this file. Fail if we are unable to remove it, rather than risking rerunning
 # Ignition at next boot.
 rm /boot/ignition.firstboot
+
+if [[ $(uname -m) = s390x ]]; then
+    /usr/lib/dracut/modules.d/50rdcore/rdcore zipl --boot-mount=/boot
+fi