diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassio-supervisor.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassio-supervisor.service
new file mode 100644
index 000000000..ae5b1530e
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassio-supervisor.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Hass.io supervisor
+Requires=docker.service
+After=docker.service
+
+[Service]
+Type=simple
+Restart=always
+RestartSec=5s
+ExecStart=/usr/sbin/hassio-supervisor
+ExecStop=-/usr/bin/docker stop hassio_supervisor
+
+[Install]
+WantedBy=multi-user.target