diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile
index 155b93795..978e3851f 100644
--- a/29/dind/Dockerfile
+++ b/29/dind/Dockerfile
@@ -88,11 +88,11 @@ RUN set -eux; \
 	ctr --version; \
 	runc --version
 
-# https://github.com/docker/docker/tree/master/hack/dind
+# https://github.com/moby/moby/tree/master/hack/dind
 ENV DIND_COMMIT 8d9e3502aba39127e4d12196dae16d306f76993d
 
 RUN set -eux; \
-	wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \
+	wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/moby/moby/${DIND_COMMIT}/hack/dind"; \
 	chmod +x /usr/local/bin/dind
 
 COPY dockerd-entrypoint.sh /usr/local/bin/
diff --git a/Dockerfile-dind.template b/Dockerfile-dind.template
index e0768d804..446c03414 100644
--- a/Dockerfile-dind.template
+++ b/Dockerfile-dind.template
@@ -78,11 +78,11 @@ RUN set -eux; \
 	ctr --version; \
 	runc --version
 
-# https://github.com/docker/docker/tree/master/hack/dind
+# https://github.com/moby/moby/tree/master/hack/dind
 ENV DIND_COMMIT {{ .dindCommit }}
 
 RUN set -eux; \
-	wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \
+	wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/moby/moby/${DIND_COMMIT}/hack/dind"; \
 	chmod +x /usr/local/bin/dind
 
 COPY dockerd-entrypoint.sh /usr/local/bin/
diff --git a/versions.sh b/versions.sh
index 7693592cb..e67957bb8 100755
--- a/versions.sh
+++ b/versions.sh
@@ -39,12 +39,12 @@ _curl() {
 }
 
 dindLatest="$(
-	_curl -H 'Accept: application/json' 'https://github.com/docker/docker/commits/master/hack/dind.atom' \
+	_curl -H 'Accept: application/json' 'https://github.com/moby/moby/commits/master/hack/dind.atom' \
 		| jq -r '.payload | first(.. | .commits?[]?.oid)'
 )"
 
 dockerVersions="$(
-	git ls-remote --tags https://github.com/docker/docker.git \
+	git ls-remote --tags https://github.com/moby/moby.git \
 		| jq --raw-input --null-input --raw-output '
 			[ inputs | capture("refs/tags/(docker-)?v(?<version>[0-9.a-z-]+)($|\\^)") | .version ]
 			| unique_by( split(".") | map(tonumber? // .) )