diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/getty@tty1.service.d/hassos.conf b/buildroot-external/rootfs-overlay/etc/systemd/system/getty@.service.d/hassos.conf
similarity index 100%
rename from buildroot-external/rootfs-overlay/etc/systemd/system/getty@tty1.service.d/hassos.conf
rename to buildroot-external/rootfs-overlay/etc/systemd/system/getty@.service.d/hassos.conf
diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/getty@tty1.service.d/noclear.conf b/buildroot-external/rootfs-overlay/etc/systemd/system/getty@.service.d/noclear.conf
similarity index 100%
rename from buildroot-external/rootfs-overlay/etc/systemd/system/getty@tty1.service.d/noclear.conf
rename to buildroot-external/rootfs-overlay/etc/systemd/system/getty@.service.d/noclear.conf
diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/serial-getty@.service.d/hassos.conf b/buildroot-external/rootfs-overlay/etc/systemd/system/serial-getty@.service.d/hassos.conf
new file mode 100644
index 000000000..53a8d88b0
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/serial-getty@.service.d/hassos.conf
@@ -0,0 +1,3 @@
+[Unit]
+Requires=docker.service
+After=docker.service