diff --git a/hack/make.sh b/hack/make.sh
index e2f9dfefbd..e1ea573e12 100755
--- a/hack/make.sh
+++ b/hack/make.sh
@@ -289,6 +289,30 @@ bundle() {
 	source "$SCRIPTDIR/make/$bundle" "$@"
 }
 
+copy_containerd() {
+    dir="$1"
+    # Add nested executables to bundle dir so we have complete set of
+    # them available, but only if the native OS/ARCH is the same as the
+    # OS/ARCH of the build target
+    if [ "$(go env GOOS)/$(go env GOARCH)" == "$(go env GOHOSTOS)/$(go env GOHOSTARCH)" ]; then
+        (set -x
+        if [ -x /usr/local/bin/runc ]; then
+            echo "Copying nested executables into $dir"
+            cp /usr/local/bin/runc "$dir/"
+            cp /usr/local/bin/ctr "$dir/"
+            cp /usr/local/bin/containerd "$dir/"
+            cp /usr/local/bin/containerd-shim "$dir/"
+            if [ "$2" == "hash" ]; then
+                hash_files "$dir/runc"
+                hash_files "$dir/ctr"
+                hash_files "$dir/containerd"
+                hash_files "$dir/containerd-shim"
+            fi
+        fi
+        )
+    fi
+}
+
 main() {
 	# We want this to fail if the bundles already exist and cannot be removed.
 	# This is to avoid mixing bundles from different versions of the code.
diff --git a/hack/make/binary b/hack/make/binary
index 20c7d2484c..378af761be 100644
--- a/hack/make/binary
+++ b/hack/make/binary
@@ -61,19 +61,5 @@ go build \
 echo "Created binary: $DEST/$BINARY_FULLNAME"
 ln -sf "$BINARY_FULLNAME" "$DEST/docker$BINARY_EXTENSION"
 
+copy_containerd "$DEST" "hash"
 hash_files "$DEST/$BINARY_FULLNAME"
-
-# Add nested executables to bundle dir so we have complete set of
-# them available, but only if the native OS/ARCH is the same as the
-# OS/ARCH of the build target
-if [ "$(go env GOOS)/$(go env GOARCH)" == "$(go env GOHOSTOS)/$(go env GOHOSTARCH)" ]; then
-	echo "Copying nested executables into $DEST"
-	(set -x
-	if [ -x /usr/local/bin/runc ]; then
-		cp /usr/local/bin/runc $DEST/
-		cp /usr/local/bin/ctr $DEST/
-		cp /usr/local/bin/containerd $DEST/
-		cp /usr/local/bin/containerd-shim $DEST/
-	fi
-	)
-fi
diff --git a/hack/make/gccgo b/hack/make/gccgo
index 39a3f8556a..9da203ff79 100644
--- a/hack/make/gccgo
+++ b/hack/make/gccgo
@@ -26,19 +26,5 @@ go build -compiler=gccgo \
 echo "Created binary: $DEST/$BINARY_FULLNAME"
 ln -sf "$BINARY_FULLNAME" "$DEST/docker$BINARY_EXTENSION"
 
+copy_containerd "$DEST" "hash"
 hash_files "$DEST/$BINARY_FULLNAME"
-
-# Add nested executables to bundle dir so we have complete set of
-# them available, but only if the native OS/ARCH is the same as the
-# OS/ARCH of the build target
-if [ "$(go env GOOS)/$(go env GOARCH)" == "$(go env GOHOSTOS)/$(go env GOHOSTARCH)" ]; then
-    echo "Copying nested executables into $DEST"
-    (set -x
-    if [ -x /usr/local/bin/runc ]; then
-        cp /usr/local/bin/runc $DEST/
-        cp /usr/local/bin/ctr $DEST/
-        cp /usr/local/bin/containerd $DEST/
-        cp /usr/local/bin/containerd-shim $DEST/
-    fi
-    )
-fi
diff --git a/hack/make/tgz b/hack/make/tgz
index a512b832d2..93a69cbe53 100644
--- a/hack/make/tgz
+++ b/hack/make/tgz
@@ -9,9 +9,10 @@ if [ ! -d "$CROSS/linux/amd64" ]; then
 	false
 fi
 
+(
 for d in "$CROSS/"*/*; do
-	GOARCH="$(basename "$d")"
-	GOOS="$(basename "$(dirname "$d")")"
+	export GOARCH="$(basename "$d")"
+	export GOOS="$(basename "$(dirname "$d")")"
 	BINARY_NAME="docker-$VERSION"
 	BINARY_EXTENSION="$(export GOOS && binary_extension)"
 	BINARY_FULLNAME="$BINARY_NAME$BINARY_EXTENSION"
@@ -22,6 +23,7 @@ for d in "$CROSS/"*/*; do
 
 	mkdir -p "$DEST/build/usr/local/bin"
 	cp -L "$d/$BINARY_FULLNAME" "$DEST/build/usr/local/bin/docker$BINARY_EXTENSION"
+	copy_containerd "$DEST/build/usr/local/bin/"
 
 	tar --numeric-owner --owner 0 -C "$DEST/build" -czf "$TGZ" usr
 
@@ -31,3 +33,4 @@ for d in "$CROSS/"*/*; do
 
 	echo "Created tgz: $TGZ"
 done
+)