diff --git a/1.12/dind/dockerd-entrypoint.sh b/1.12/dind/dockerd-entrypoint.sh
index 95680bd4a..884c4b4d9 100755
--- a/1.12/dind/dockerd-entrypoint.sh
+++ b/1.12/dind/dockerd-entrypoint.sh
@@ -5,14 +5,14 @@ set -e
 # or first arg is `-f` or `--some-option`
 if [ "$#" -eq 0 -o "${1#-}" != "$1" ]; then
 	# add our default arguments
-	set -- docker daemon \
+	set -- dockerd \
 		--host=unix:///var/run/docker.sock \
 		--host=tcp://0.0.0.0:2375 \
 		--storage-driver=vfs \
 		"$@"
 fi
 
-if [ "$1" = 'docker' -a "$2" = 'daemon' ]; then
+if [ "$1" = 'dockerd' ]; then
 	# if we're running Docker, let's pipe through dind
 	# (and we'll run dind explicitly with "sh" since its shebang is /bin/bash)
 	set -- sh "$(which dind)" "$@"
diff --git a/1.12/experimental/dind/dockerd-entrypoint.sh b/1.12/experimental/dind/dockerd-entrypoint.sh
index 95680bd4a..884c4b4d9 100755
--- a/1.12/experimental/dind/dockerd-entrypoint.sh
+++ b/1.12/experimental/dind/dockerd-entrypoint.sh
@@ -5,14 +5,14 @@ set -e
 # or first arg is `-f` or `--some-option`
 if [ "$#" -eq 0 -o "${1#-}" != "$1" ]; then
 	# add our default arguments
-	set -- docker daemon \
+	set -- dockerd \
 		--host=unix:///var/run/docker.sock \
 		--host=tcp://0.0.0.0:2375 \
 		--storage-driver=vfs \
 		"$@"
 fi
 
-if [ "$1" = 'docker' -a "$2" = 'daemon' ]; then
+if [ "$1" = 'dockerd' ]; then
 	# if we're running Docker, let's pipe through dind
 	# (and we'll run dind explicitly with "sh" since its shebang is /bin/bash)
 	set -- sh "$(which dind)" "$@"
diff --git a/1.13-rc/dind/dockerd-entrypoint.sh b/1.13-rc/dind/dockerd-entrypoint.sh
index 95680bd4a..884c4b4d9 100755
--- a/1.13-rc/dind/dockerd-entrypoint.sh
+++ b/1.13-rc/dind/dockerd-entrypoint.sh
@@ -5,14 +5,14 @@ set -e
 # or first arg is `-f` or `--some-option`
 if [ "$#" -eq 0 -o "${1#-}" != "$1" ]; then
 	# add our default arguments
-	set -- docker daemon \
+	set -- dockerd \
 		--host=unix:///var/run/docker.sock \
 		--host=tcp://0.0.0.0:2375 \
 		--storage-driver=vfs \
 		"$@"
 fi
 
-if [ "$1" = 'docker' -a "$2" = 'daemon' ]; then
+if [ "$1" = 'dockerd' ]; then
 	# if we're running Docker, let's pipe through dind
 	# (and we'll run dind explicitly with "sh" since its shebang is /bin/bash)
 	set -- sh "$(which dind)" "$@"