diff --git a/base/docker/Dockerfile b/base/docker-ce/Dockerfile
similarity index 99%
rename from base/docker/Dockerfile
rename to base/docker-ce/Dockerfile
index d5081414a..34969e431 100644
--- a/base/docker/Dockerfile
+++ b/base/docker-ce/Dockerfile
@@ -33,4 +33,6 @@ RUN set -x \
 	&& rm docker.tgz \
 	&& docker -v
 
+COPY . ./
+
 ENTRYPOINT ["/usr/bin/docker-init", "/usr/bin/dockerd"]
diff --git a/base/docker/Makefile b/base/docker-ce/Makefile
similarity index 81%
rename from base/docker/Makefile
rename to base/docker-ce/Makefile
index 00bd06104..d3fcb0869 100644
--- a/base/docker/Makefile
+++ b/base/docker-ce/Makefile
@@ -1,14 +1,14 @@
 .PHONY: tag push
 
 BASE=alpine:3.5
-IMAGE=docker
+IMAGE=docker-ce
 
 default: push
 
 hash: Dockerfile
 	DOCKER_CONTENT_TRUST=1 docker pull $(BASE)
 	tar cf - $^ | docker build --no-cache -t $(IMAGE):build -
-	docker run --entrypoint /bin/sh --rm $(IMAGE):build -c 'cat Dockerfile /lib/apk/db/installed | sha1sum' | sed 's/ .*//' > $@
+	docker run --entrypoint /bin/sh --rm $(IMAGE):build -c 'cat $^ /lib/apk/db/installed | sha1sum' | sed 's/ .*//' > $@
 
 push: hash
 	docker pull mobylinux/$(IMAGE):$(shell cat hash) || \