diff --git a/src/boot/ostree-prepare-root.service b/src/boot/ostree-prepare-root.service
index e0659d10..52cf8863 100644
--- a/src/boot/ostree-prepare-root.service
+++ b/src/boot/ostree-prepare-root.service
@@ -20,7 +20,7 @@ Description=OSTree Prepare OS/
 DefaultDependencies=no
 ConditionKernelCommandLine=ostree
 ConditionPathExists=/etc/initrd-release
-OnFailure=emergency.service
+OnFailure=emergency.target
 After=initrd-switch-root.target
 Before=initrd-switch-root.service
 Before=plymouth-switch-root.service
diff --git a/src/boot/ostree-remount.service b/src/boot/ostree-remount.service
index 8439b495..68209f96 100644
--- a/src/boot/ostree-remount.service
+++ b/src/boot/ostree-remount.service
@@ -19,7 +19,7 @@
 Description=OSTree Remount OS/ bind mounts
 DefaultDependencies=no
 ConditionKernelCommandLine=ostree
-OnFailure=emergency.service
+OnFailure=emergency.target
 Conflicts=umount.target
 After=-.mount
 After=systemd-remount-fs.service