diff --git a/rootfs-overlay/usr/lib/systemd/system/root-shell@.service b/rootfs-overlay/usr/lib/systemd/system/root-shell@.service
index 2cf028a..f1c1776 100644
--- a/rootfs-overlay/usr/lib/systemd/system/root-shell@.service
+++ b/rootfs-overlay/usr/lib/systemd/system/root-shell@.service
@@ -1,9 +1,11 @@
 [Unit]
 Description=root shell on %I
-Conflicts=getty@%I.service
-Conflicts=serial-getty@%I.service
+After=sshd.service
+Conflicts=shutdown.target
+Conflicts=getty@%i.service serial-getty@%i.service
 
 [Service]
+Type=idle
 Environment=TERM=linux
 ExecStart=/bin/sh
 Restart=always