diff --git a/alpine/packages/diagnostics/diagnostics b/alpine/packages/diagnostics/diagnostics
index 1223352d2..18973f7f0 100755
--- a/alpine/packages/diagnostics/diagnostics
+++ b/alpine/packages/diagnostics/diagnostics
@@ -1,8 +1,5 @@
 #!/bin/sh
 
-# now start very soon after docker, let containerd start
-sleep 1
-
 printf '\n'
 DEV=$(ls /dev | grep '[sxv]da$')
 [ $? -eq 0 ] && printf "✓ Drive found: $DEV\n" || printf "✗ No drive found\n"
diff --git a/alpine/packages/docker/etc/init.d/docker b/alpine/packages/docker/etc/init.d/docker
index b0b5b4ef5..6eff88ae0 100755
--- a/alpine/packages/docker/etc/init.d/docker
+++ b/alpine/packages/docker/etc/init.d/docker
@@ -75,6 +75,8 @@ start()
 		--stdout "${DOCKER_LOGFILE}" \
 		-- --pidfile=${pidfile} ${DOCKER_OPTS}
 
+	ewaitfile 20 ${pidfile} /var/run/docker.sock /var/run/docker/libcontainerd/docker-containerd.sock
+
 	eend $? "Failed to start docker"
 }