diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/docker.service.d/hassos.conf b/buildroot-external/rootfs-overlay/etc/systemd/system/docker.service.d/hassos.conf
index 87fafd279..ae8598aee 100644
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/docker.service.d/hassos.conf
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/docker.service.d/hassos.conf
@@ -3,4 +3,4 @@ RequiresMountsFor=/etc/docker /mnt/data /var/lib/docker
 
 [Service]
 ExecStart=
-ExecStart=/usr/bin/dockerd -H fd:// --cpu-rt-runtime=950000 --storage-driver=overlay2 --log-driver=journald --data-root /mnt/data/docker
+ExecStart=/usr/bin/dockerd -H fd:// --cpu-rt-runtime=950000 --storage-driver=overlay2 --log-driver=journald --log-opt tag="{{.ImageName}}/{{.Name}}" --data-root /mnt/data/docker
diff --git a/buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor b/buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor
index def085137..7727968a9 100755
--- a/buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor
+++ b/buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor
@@ -100,4 +100,5 @@ fi
 # Run supervisor
 mkdir -p ${SUPERVISOR_DATA}
 echo "[INFO] Starting the Supervisor..."
-exec docker container start --attach hassio_supervisor
+docker container start hassio_supervisor
+exec docker container wait hassio_supervisor