diff --git a/usr/lib/archboot/cpio/hooks/init b/usr/lib/archboot/cpio/hooks/init
index 93b37a84a..1265c6b49 100644
--- a/usr/lib/archboot/cpio/hooks/init
+++ b/usr/lib/archboot/cpio/hooks/init
@@ -62,7 +62,7 @@ _run ()
     echo "root::0:0:root:/root:/bin/bash" > "${_ROOTFS}/etc/passwd"
     _file_rename "/usr/share/archboot/base/etc/profile.d/custom-bash-options.sh" \
              "/etc/profile.d/custom-bash-options.sh"
-    _file /system-init.sh
+    _file /usr/lib/archboot/cpio/init.sh
     _file_rename /usr/share/archboot/base/etc/systemd/system/archboot-init.service /etc/systemd/system/archboot-init.service
     _file_rename /usr/share/archboot/base/etc/systemd/system/initrd-cleanup.service /etc/systemd/system/initrd-cleanup.service
 }
diff --git a/usr/share/archboot/base/etc/systemd/system/initrd-cleanup.service b/usr/share/archboot/base/etc/systemd/system/initrd-cleanup.service
index 4111e49e7..59ac8dbb7 100644
--- a/usr/share/archboot/base/etc/systemd/system/initrd-cleanup.service
+++ b/usr/share/archboot/base/etc/systemd/system/initrd-cleanup.service
@@ -13,7 +13,7 @@ DefaultDependencies=no
 AssertPathExists=/etc/initrd-release
 OnFailure=emergency.target
 OnFailureJobMode=replace-irreversibly
-Requires=system-init.service
+Requires=archboot-init.service
 After=initrd-root-fs.target initrd-fs.target initrd.target archboot-init.service
 
 [Service]