diff --git a/buildroot-external/package/hassio/builder/hostapp.sh b/buildroot-external/package/hassio/builder/hostapp.sh
index 61e0f53d7..2a7806624 100755
--- a/buildroot-external/package/hassio/builder/hostapp.sh
+++ b/buildroot-external/package/hassio/builder/hostapp.sh
@@ -55,11 +55,11 @@ mkdir -p /mnt/supervisor
 mkdir -p /mnt/cli
 
 # Run dockerd
-dockerd -s overlay2 -g /mnt/docker 2> /dev/null &
+dockerd -s overlay2 -g /mnt/docker &
 DOCKER_PID=$!
 
+DOCKER_COUNT=0
 until docker info >/dev/null 2>&1; do
-    DOCKER_COUNT=0
     if [ ${DOCKER_COUNT} -gt 30 ]; then
         exit 1
     fi
diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-hostname.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-hostname.mount
new file mode 120000
index 000000000..173cae388
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-hostname.mount
@@ -0,0 +1 @@
+/usr/lib/systemd/system/etc-hostname.mount
\ No newline at end of file
diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-hosts.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-hosts.mount
new file mode 120000
index 000000000..d22d22eb3
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-hosts.mount
@@ -0,0 +1 @@
+/usr/lib/systemd/system/etc-hosts.mount
\ No newline at end of file
diff --git a/buildroot-external/rootfs-overlay/etc/tmpfiles.d/hostname.conf b/buildroot-external/rootfs-overlay/etc/tmpfiles.d/hostname.conf
new file mode 100644
index 000000000..9d64a0516
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/etc/tmpfiles.d/hostname.conf
@@ -0,0 +1,2 @@
+C /mnt/overlay/etc/hostname - - - - /etc/hostname
+C /mnt/overlay/etc/hosts - - - - /etc/hosts
diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-hostname.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-hostname.mount
new file mode 100644
index 000000000..be4a26bea
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-hostname.mount
@@ -0,0 +1,14 @@
+[Unit]
+Description=Hostname persistent configuration
+Requires=mnt-overlay.mount
+After=mnt-overlay.mount systemd-tmpfiles-setup.service
+Before=network.target
+
+[Mount]
+What=/mnt/overlay/etc/hostname
+Where=/etc/hostname
+Type=none
+Options=bind
+
+[Install]
+WantedBy=hassio-bind.target
diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-hosts.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-hosts.mount
new file mode 100644
index 000000000..366be9906
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-hosts.mount
@@ -0,0 +1,14 @@
+[Unit]
+Description=Hosts persistent configuration
+Requires=mnt-overlay.mount
+After=mnt-overlay.mount systemd-tmpfiles-setup.service
+Before=network.target
+
+[Mount]
+What=/mnt/overlay/etc/hosts
+Where=/etc/hosts
+Type=none
+Options=bind
+
+[Install]
+WantedBy=hassio-bind.target
diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-overlay.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-overlay.mount
index f648f6bfd..7af4b28a0 100644
--- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-overlay.mount
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-overlay.mount
@@ -1,7 +1,7 @@
 [Unit]
 Description=Hassio overlay partition
 DefaultDependencies=no
-Before=umount.target
+Before=umount.target systemd-tmpfiles-setup.service
 Conflicts=umount.target
 
 [Mount]
diff --git a/scripts/enter.sh b/scripts/enter.sh
index 0be4cb7ed..1ca96ced3 100755
--- a/scripts/enter.sh
+++ b/scripts/enter.sh
@@ -1,3 +1,4 @@
 #!/bin/bash
+modprobe overlayfs
 docker build -t hassbuildroot .
 docker run -it --rm --privileged -v "$(pwd):/build" hassbuildroot bash