diff --git a/buildroot-external/rootfs-overlay/etc/docker/.empty b/buildroot-external/rootfs-overlay/etc/docker/.empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/buildroot-external/rootfs-overlay/etc/dropbear/.empty b/buildroot-external/rootfs-overlay/etc/dropbear/.empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-docker.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-docker.mount
new file mode 120000
index 000000000..856d6a932
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-docker.mount
@@ -0,0 +1 @@
+usr/lib/systemd/system/etc-docker.mount
\ No newline at end of file
diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/dropbear.service b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/dropbear.service
new file mode 120000
index 000000000..e902b3085
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/dropbear.service
@@ -0,0 +1 @@
+usr/lib/systemd/system/dropbear.service
\ No newline at end of file
diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/dropbear.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/dropbear.service
new file mode 100644
index 000000000..d6b69367a
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/dropbear.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Dropbear SSH daemon
+After=syslog.target network.target auditd.service
+
+[Service]
+EnvironmentFile=-/etc/default/dropbear
+ExecStart=/usr/sbin/dropbear -F -E -p 22222 -s
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-docker.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-docker.mount
new file mode 100644
index 000000000..e138da75e
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-docker.mount
@@ -0,0 +1,14 @@
+[Unit]
+Description=Docker configuration
+Requires=mnt-overlay.mount
+After=mnt-overlay.mount
+Before=docker.service
+
+[Mount]
+What=/mnt/overlay/etc/docker
+Where=/etc/docker
+Type=none
+Options=bind
+
+[Install]
+WantedBy=hassio-bind.target
diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-dropbear.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-dropbear.mount
index 73a513d0b..11fb4ea23 100644
--- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-dropbear.mount
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-dropbear.mount
@@ -1,6 +1,6 @@
 [Unit]
 Description=Dropbear Host Key
-Requires=mnt-overlay.mount
+Requires=mnt-overlay.mount dropbear.service
 After=mnt-overlay.mount
 Before=dropbear.service