diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile
index 12a47cc9e..b69f974ac 100644
--- a/29/dind/Dockerfile
+++ b/29/dind/Dockerfile
@@ -6,20 +6,16 @@
 
 FROM docker:29-cli
 
-# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies
-# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41
+# Runtime dependencies:
+# - https://github.com/moby/moby/blob/864598f8c2677189e308eb4a3b3c0dd41fc06599/project/PACKAGERS.md#runtime-dependencies#runtime-dependencies
+# - https://github.com/docker/packaging/blob/0ba325d178593583f190dc91566214a85c3880ad/pkg/docker-engine/deb/control#L24-L36
 RUN set -eux; \
 	apk add --no-cache \
-		btrfs-progs \
-		e2fsprogs \
-		e2fsprogs-extra \
-		git \
 		ip6tables \
 		iptables \
 		openssl \
 		pigz \
 		shadow-uidmap \
-		xfsprogs \
 		xz \
 		zfs \
 	;
@@ -84,12 +80,12 @@ RUN set -eux; \
 		--no-same-owner \
 # we exclude the CLI binary because we already extracted that over in the "docker:29-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer
 		--exclude 'docker/docker' \
+		--exclude 'docker/containerd' \
+		--exclude 'docker/ctr' \
 	; \
 	rm docker.tgz; \
 	\
 	dockerd --version; \
-	containerd --version; \
-	ctr --version; \
 	runc --version
 
 # https://github.com/docker/docker/tree/master/hack/dind
diff --git a/Dockerfile-dind.template b/Dockerfile-dind.template
index 75d30e7df..ab3abddee 100644
--- a/Dockerfile-dind.template
+++ b/Dockerfile-dind.template
@@ -1,20 +1,16 @@
 {{ include "shared" -}}
 FROM docker:{{ env.version }}-cli
 
-# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies
-# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41
+# Runtime dependencies:
+# - https://github.com/moby/moby/blob/864598f8c2677189e308eb4a3b3c0dd41fc06599/project/PACKAGERS.md#runtime-dependencies#runtime-dependencies
+# - https://github.com/docker/packaging/blob/0ba325d178593583f190dc91566214a85c3880ad/pkg/docker-engine/deb/control#L24-L36
 RUN set -eux; \
 	apk add --no-cache \
-		btrfs-progs \
-		e2fsprogs \
-		e2fsprogs-extra \
-		git \
 		ip6tables \
 		iptables \
 		openssl \
 		pigz \
 		shadow-uidmap \
-		xfsprogs \
 		xz \
 		zfs \
 	;
@@ -69,12 +65,12 @@ RUN set -eux; \
 		--no-same-owner \
 # we exclude the CLI binary because we already extracted that over in the "docker:{{ env.version }}-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer
 		--exclude 'docker/docker' \
+		--exclude 'docker/containerd' \
+		--exclude 'docker/ctr' \
 	; \
 	rm docker.tgz; \
 	\
 	dockerd --version; \
-	containerd --version; \
-	ctr --version; \
 	runc --version
 
 # https://github.com/docker/docker/tree/master/hack/dind