diff --git a/Makefile b/Makefile
index 80cdae1386..641ba0f3ee 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ src/github.com/docker/cli:
 	cp -r "$(CLI_DIR)" $@
 else
 src/github.com/docker/cli:
-	git init $@
+	git init --initial-branch=master $@
 	git -C $@ remote add origin "$(DOCKER_CLI_REPO)"
 endif
 
@@ -33,20 +33,20 @@ src/github.com/docker/docker:
 	cp -r "$(ENGINE_DIR)" $@
 else
 src/github.com/docker/docker:
-	git init $@
+	git init --initial-branch=master $@
 	git -C $@ remote add origin "$(DOCKER_ENGINE_REPO)"
 endif
 
 src/github.com/docker/buildx:
-	git init $@
+	git init --initial-branch=master $@
 	git -C $@ remote add origin "$(DOCKER_BUILDX_REPO)"
 
 src/github.com/docker/compose:
-	git init $@
+	git init --initial-branch=master $@
 	git -C $@ remote add origin "$(DOCKER_COMPOSE_REPO)"
 
 src/github.com/docker/scan-cli-plugin:
-	git init $@
+	git init --initial-branch=master $@
 	git -C $@ remote add origin "$(DOCKER_SCAN_REPO)"
 
 
diff --git a/static/Makefile b/static/Makefile
index 392ac9fa9a..6ec6f67c09 100644
--- a/static/Makefile
+++ b/static/Makefile
@@ -5,8 +5,8 @@ ENGINE_DIR=$(realpath $(CURDIR)/../src/github.com/docker/docker)
 BUILDX_DIR=$(realpath $(CURDIR)/../src/github.com/docker/buildx)
 
 GEN_STATIC_VER=$(shell ./gen-static-ver $(CLI_DIR) $(VERSION))
-HASH_CMD=docker run -v $(CURDIR):/sum -w /sum debian:jessie bash hash_files
-DIR_TO_HASH:=build/linux
+HASH_CMD=docker run -v $(CURDIR):/sum -w /sum alpine sh hash_files
+DIR_TO_HASH:=build
 DOCKER_CLI_GOLANG_IMG=golang:$(GO_VERSION)
 
 DOCKER_BUILD_OPTS=