diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index 252401be1..96aa685d2 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -30,8 +30,7 @@ COPY packages/transfused/transfused /sbin/
 COPY packages/transfused/etc /etc/
 COPY packages/mdnstool/mdnstool /sbin/
 COPY packages/mdnstool/etc /etc/
-COPY packages/docker/docker /usr/bin/
-COPY packages/docker/docker-* /usr/bin/
+COPY packages/docker/bin/* /usr/bin/
 COPY packages/docker/etc /etc/
 COPY packages/docker-x/docker-x /usr/bin/
 COPY packages/diagnostics/diagnostics /usr/bin/
diff --git a/alpine/packages/docker/.gitignore b/alpine/packages/docker/.gitignore
index 37af952a7..e660fd93d 100644
--- a/alpine/packages/docker/.gitignore
+++ b/alpine/packages/docker/.gitignore
@@ -1,2 +1 @@
-docker
-docker-*
+bin/
diff --git a/alpine/packages/docker/Makefile b/alpine/packages/docker/Makefile
index 46a2ed6a6..56b8c2b71 100644
--- a/alpine/packages/docker/Makefile
+++ b/alpine/packages/docker/Makefile
@@ -6,8 +6,9 @@ OS?=Linux
 
 DOCKER_HOST=$(shell if echo "$(DOCKER_VERSION)" | grep -q -- '-rc'; then echo "test.docker.com"; else echo "get.docker.com"; fi)
 docker:
-	if [ "${ARCH}" != "arm" ] ; then curl -f -L -o docker.tgz https://${DOCKER_HOST}/builds/${OS}/${ARCH}/docker-${DOCKER_VERSION}.tgz && tar xjf docker.tgz && mv docker docker- && mv docker-/* . && rm -rf docker-/ docker.tgz; else cp docker-arm docker; fi
-	chmod +x docker docker-containerd docker-containerd-ctr docker-containerd-shim docker-runc
+	mkdir -p bin
+	if [ "${ARCH}" != "arm" ] ; then curl -f -L -o docker.tgz https://${DOCKER_HOST}/builds/${OS}/${ARCH}/docker-${DOCKER_VERSION}.tgz && tar xjf docker.tgz && mv docker/* bin && rm -rf docker/ docker.tgz; else cp docker-arm bin/docker; fi
+	chmod +x bin/*
 
 clean:
-	rm -f docker docker-containerd docker-containerd-ctr docker-containerd-shim docker-runc
+	rm -rf bin