diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/dropbear.service.d/hassos.conf b/buildroot-external/rootfs-overlay/etc/systemd/system/dropbear.service.d/hassos.conf
index 5da76e50a..1719de873 100644
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/dropbear.service.d/hassos.conf
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/dropbear.service.d/hassos.conf
@@ -3,6 +3,9 @@ RequiresMountsFor=/etc/dropbear
 ConditionFileNotEmpty=/root/.ssh/authorized_keys
 
 [Service]
+Type=forking
+PIDFile=/run/dropbear.pid
 ExecStartPre=
 ExecStart=
-ExecStart=/usr/sbin/dropbear -F -R -E -p 22222 -s
+ExecStart=-/usr/sbin/dropbear -R -E -p 22222 -s
+KillMode=mixed