diff --git a/units/systemd-firstboot.service b/units/systemd-firstboot.service
index 15b7744289..31f02a8e00 100644
--- a/units/systemd-firstboot.service
+++ b/units/systemd-firstboot.service
@@ -35,6 +35,7 @@ ExecStart=systemd-firstboot --prompt-locale --prompt-keymap --prompt-timezone --
 StandardOutput=tty
 StandardInput=tty
 StandardError=tty
+TTYReset=yes
 
 # Optionally, pick up basic fields from credentials passed to the service
 # manager. This is useful for importing this data from nspawn's
diff --git a/units/systemd-homed-firstboot.service b/units/systemd-homed-firstboot.service
index 3615940a4e..444ec3055d 100644
--- a/units/systemd-homed-firstboot.service
+++ b/units/systemd-homed-firstboot.service
@@ -21,6 +21,7 @@ ExecStart=homectl firstboot --prompt-new-user
 StandardOutput=tty
 StandardInput=tty
 StandardError=tty
+TTYReset=yes
 ImportCredential=home.*
 
 [Install]
diff --git a/units/systemd-storagetm.service.in b/units/systemd-storagetm.service.in
index 22770bf291..60cd56933e 100644
--- a/units/systemd-storagetm.service.in
+++ b/units/systemd-storagetm.service.in
@@ -24,4 +24,5 @@ Type=notify
 RemainAfterExit=yes
 StandardInput=tty
 StandardOutput=tty
+TTYReset=yes
 ExecStart={{LIBEXECDIR}}/systemd-storagetm --all