diff --git a/17.12/dind/Dockerfile b/17.12/dind/Dockerfile
index 8f5a5424c..3e2897060 100644
--- a/17.12/dind/Dockerfile
+++ b/17.12/dind/Dockerfile
@@ -26,7 +26,8 @@ RUN set -x \
 	&& echo 'dockremap:165536:65536' >> /etc/subuid \
 	&& echo 'dockremap:165536:65536' >> /etc/subgid
 
-ENV DIND_COMMIT 3b5fac462d21ca164b3778647420016315289034
+# https://github.com/docker/docker/tree/master/hack/dind
+ENV DIND_COMMIT 52379fa76dee07ca038624d639d9e14f4fb719ff
 
 RUN set -ex; \
 	apk add --no-cache --virtual .fetch-deps libressl; \
diff --git a/18.03/dind/Dockerfile b/18.03/dind/Dockerfile
index d6ef48484..8fb0862ae 100644
--- a/18.03/dind/Dockerfile
+++ b/18.03/dind/Dockerfile
@@ -28,7 +28,8 @@ RUN set -x \
 	&& echo 'dockremap:165536:65536' >> /etc/subuid \
 	&& echo 'dockremap:165536:65536' >> /etc/subgid
 
-ENV DIND_COMMIT 3b5fac462d21ca164b3778647420016315289034
+# https://github.com/docker/docker/tree/master/hack/dind
+ENV DIND_COMMIT 52379fa76dee07ca038624d639d9e14f4fb719ff
 
 RUN set -ex; \
 	apk add --no-cache --virtual .fetch-deps libressl; \
diff --git a/18.04/dind/Dockerfile b/18.04/dind/Dockerfile
index 83a27ede0..a3725bdcc 100644
--- a/18.04/dind/Dockerfile
+++ b/18.04/dind/Dockerfile
@@ -28,7 +28,8 @@ RUN set -x \
 	&& echo 'dockremap:165536:65536' >> /etc/subuid \
 	&& echo 'dockremap:165536:65536' >> /etc/subgid
 
-ENV DIND_COMMIT 3b5fac462d21ca164b3778647420016315289034
+# https://github.com/docker/docker/tree/master/hack/dind
+ENV DIND_COMMIT 52379fa76dee07ca038624d639d9e14f4fb719ff
 
 RUN set -ex; \
 	apk add --no-cache --virtual .fetch-deps libressl; \
diff --git a/18.05-rc/dind/Dockerfile b/18.05-rc/dind/Dockerfile
index 352558b4a..ca6160385 100644
--- a/18.05-rc/dind/Dockerfile
+++ b/18.05-rc/dind/Dockerfile
@@ -28,7 +28,8 @@ RUN set -x \
 	&& echo 'dockremap:165536:65536' >> /etc/subuid \
 	&& echo 'dockremap:165536:65536' >> /etc/subgid
 
-ENV DIND_COMMIT 3b5fac462d21ca164b3778647420016315289034
+# https://github.com/docker/docker/tree/master/hack/dind
+ENV DIND_COMMIT 52379fa76dee07ca038624d639d9e14f4fb719ff
 
 RUN set -ex; \
 	apk add --no-cache --virtual .fetch-deps libressl; \
diff --git a/Dockerfile-dind.template b/Dockerfile-dind.template
index 4184e5b47..e5042c056 100644
--- a/Dockerfile-dind.template
+++ b/Dockerfile-dind.template
@@ -28,7 +28,8 @@ RUN set -x \
 	&& echo 'dockremap:165536:65536' >> /etc/subuid \
 	&& echo 'dockremap:165536:65536' >> /etc/subgid
 
-ENV DIND_COMMIT 3b5fac462d21ca164b3778647420016315289034
+# https://github.com/docker/docker/tree/master/hack/dind
+ENV DIND_COMMIT %%DIND-COMMIT%%
 
 RUN set -ex; \
 	apk add --no-cache --virtual .fetch-deps libressl; \
diff --git a/update.sh b/update.sh
index 36a5e48a8..11b9a33ba 100755
--- a/update.sh
+++ b/update.sh
@@ -27,9 +27,6 @@ sed_escape_rhs() {
 # "tac|tac" for http://stackoverflow.com/a/28879552/433558
 dindLatest="$(curl -fsSL 'https://github.com/docker/docker/commits/master/hack/dind.atom' | tac|tac | awk -F '[[:space:]]*[<>/]+' '$2 == "id" && $3 ~ /Commit/ { print $4; exit }')"
 
-# TODO once "Supported Docker versions" minimums at Docker 1.8+ (1.6 at time of this writing), bring this back again
-#sed -r -e 's/^(ENV DIND_COMMIT) .*/\1 '"$dindLatest"'/' Dockerfile-dind.template
-
 dockerVersions="$(
 	{
 		git ls-remote --tags https://github.com/docker/docker-ce.git
@@ -94,6 +91,7 @@ for version in "${versions[@]}"; do
 			-e 's!%%DOCKER-CHANNEL%%!'"$channel"'!g' \
 			-e 's!%%DOCKER-VERSION%%!'"$fullVersion"'!g' \
 			-e 's!%%TAG%%!'"$tag"'!g' \
+			-e 's!%%DIND-COMMIT%%!'"$dindLatest"'!g' \
 			-e 's!%%ARCH-CASE%%!'"$(sed_escape_rhs "$archCase")"'!g' \
 			"$template" > "$df"