diff --git a/mkosi/mkosi.extra.common/usr/lib/systemd/system/systemd-pcrphase-factory-reset.service.d/exit-on-failure.conf b/mkosi/mkosi.extra.common/usr/lib/systemd/system/systemd-pcrphase-factory-reset.service.d/exit-on-failure.conf
new file mode 100644
index 0000000000..7183952c9b
--- /dev/null
+++ b/mkosi/mkosi.extra.common/usr/lib/systemd/system/systemd-pcrphase-factory-reset.service.d/exit-on-failure.conf
@@ -0,0 +1,2 @@
+[Unit]
+FailureAction=exit
diff --git a/mkosi/mkosi.extra.common/usr/lib/systemd/system/systemd-storagetm.service.d/exit-on-failure.conf b/mkosi/mkosi.extra.common/usr/lib/systemd/system/systemd-storagetm.service.d/exit-on-failure.conf
new file mode 100644
index 0000000000..7183952c9b
--- /dev/null
+++ b/mkosi/mkosi.extra.common/usr/lib/systemd/system/systemd-storagetm.service.d/exit-on-failure.conf
@@ -0,0 +1,2 @@
+[Unit]
+FailureAction=exit
diff --git a/mkosi/mkosi.extra.common/usr/lib/systemd/system/systemd-validatefs@.service.d/exit-on-failure.conf b/mkosi/mkosi.extra.common/usr/lib/systemd/system/systemd-validatefs@.service.d/exit-on-failure.conf
new file mode 100644
index 0000000000..7183952c9b
--- /dev/null
+++ b/mkosi/mkosi.extra.common/usr/lib/systemd/system/systemd-validatefs@.service.d/exit-on-failure.conf
@@ -0,0 +1,2 @@
+[Unit]
+FailureAction=exit
diff --git a/mkosi/mkosi.extra/usr/lib/systemd/system/systemd-pcrfs-root.service.d/exit-on-failure.conf b/mkosi/mkosi.extra/usr/lib/systemd/system/systemd-pcrfs-root.service.d/exit-on-failure.conf
new file mode 100644
index 0000000000..7183952c9b
--- /dev/null
+++ b/mkosi/mkosi.extra/usr/lib/systemd/system/systemd-pcrfs-root.service.d/exit-on-failure.conf
@@ -0,0 +1,2 @@
+[Unit]
+FailureAction=exit
diff --git a/mkosi/mkosi.extra/usr/lib/systemd/system/systemd-pcrfs@.service.d/exit-on-failure.conf b/mkosi/mkosi.extra/usr/lib/systemd/system/systemd-pcrfs@.service.d/exit-on-failure.conf
new file mode 100644
index 0000000000..7183952c9b
--- /dev/null
+++ b/mkosi/mkosi.extra/usr/lib/systemd/system/systemd-pcrfs@.service.d/exit-on-failure.conf
@@ -0,0 +1,2 @@
+[Unit]
+FailureAction=exit
diff --git a/mkosi/mkosi.extra/usr/lib/systemd/system/systemd-pcrphase-sysinit.service.d/exit-on-failure.conf b/mkosi/mkosi.extra/usr/lib/systemd/system/systemd-pcrphase-sysinit.service.d/exit-on-failure.conf
new file mode 100644
index 0000000000..7183952c9b
--- /dev/null
+++ b/mkosi/mkosi.extra/usr/lib/systemd/system/systemd-pcrphase-sysinit.service.d/exit-on-failure.conf
@@ -0,0 +1,2 @@
+[Unit]
+FailureAction=exit
diff --git a/mkosi/mkosi.extra/usr/lib/systemd/system/systemd-pcrphase.service.d/exit-on-failure.conf b/mkosi/mkosi.extra/usr/lib/systemd/system/systemd-pcrphase.service.d/exit-on-failure.conf
new file mode 100644
index 0000000000..7183952c9b
--- /dev/null
+++ b/mkosi/mkosi.extra/usr/lib/systemd/system/systemd-pcrphase.service.d/exit-on-failure.conf
@@ -0,0 +1,2 @@
+[Unit]
+FailureAction=exit
diff --git a/mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/systemd-pcrphase-initrd.service.d/exit-on-failure.conf b/mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/systemd-pcrphase-initrd.service.d/exit-on-failure.conf
new file mode 100644
index 0000000000..7183952c9b
--- /dev/null
+++ b/mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/systemd-pcrphase-initrd.service.d/exit-on-failure.conf
@@ -0,0 +1,2 @@
+[Unit]
+FailureAction=exit
diff --git a/mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/systemd-pcrphase-storage-target-mode.service.d/exit-on-failure.conf b/mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/systemd-pcrphase-storage-target-mode.service.d/exit-on-failure.conf
new file mode 100644
index 0000000000..7183952c9b
--- /dev/null
+++ b/mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/systemd-pcrphase-storage-target-mode.service.d/exit-on-failure.conf
@@ -0,0 +1,2 @@
+[Unit]
+FailureAction=exit