diff --git a/Makefile b/Makefile
index 59b5e5362ce174359db63a1e9d6c960cdd63f20c..a3f7e48b4ced5e7bc126b8148c8c5adc2eea42cc 100755
--- a/Makefile
+++ b/Makefile
@@ -105,7 +105,7 @@ else
 endif
 
 out/minikube-windows-amd64.exe: out/minikube-windows-amd64
-	mv out/minikube-windows-amd64 out/minikube-windows-amd64.exe
+	cp out/minikube-windows-amd64 out/minikube-windows-amd64.exe
 
 out/minikube-%-amd64: pkg/minikube/assets/assets.go $(shell $(MINIKUBEFILES))
 ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y)
diff --git a/hack/jenkins/release_build_and_upload.sh b/hack/jenkins/release_build_and_upload.sh
index d6107f5082dd9f551726d63774e82d603c93ed07..ca6786f3c2be4eec0ff71d00f9bbbcefb78231d9 100755
--- a/hack/jenkins/release_build_and_upload.sh
+++ b/hack/jenkins/release_build_and_upload.sh
@@ -30,6 +30,9 @@ export TAGNAME=v${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD}
 export DEB_VERSION=${VERSION_MAJOR}.${VERSION_MINOR}-${VERSION_BUILD}
 export GOPATH=~/go
 
+# Build all binaries in docker
+export BUILD_IN_DOCKER=y
+
 # Sanity checks
 git status
 
@@ -39,7 +42,7 @@ cat Makefile | grep "VERSION_MINOR ?=" | grep $VERSION_MINOR
 cat Makefile | grep "VERSION_BUILD ?=" | grep $VERSION_BUILD
 
 # Build and upload
-BUILD_IN_DOCKER=y make cross checksum
+make cross checksum
 
 gsutil cp out/minikube-linux-amd64 gs://$BUCKET/releases/$TAGNAME/
 gsutil cp out/minikube-linux-amd64.sha256 gs://$BUCKET/releases/$TAGNAME/