diff --git a/Makefile b/Makefile
index 038602fc..d9753d3f 100644
--- a/Makefile
+++ b/Makefile
@@ -20,8 +20,11 @@ $(STATIC): $(JSFILES) client/node_modules
 	npm --prefix client run build-prod
 
 $(TARGET): $(STATIC) *.go coredns_plugin/*.go dnsfilter/*.go
-	GOPATH=$(GOPATH) GOOS=$(NATIVE_GOOS) GOARCH=$(NATIVE_GOARCH) GO111MODULE=off go get -v github.com/gobuffalo/packr/...
-	GOPATH=$(GOPATH) PATH=$(GOPATH)/bin:$(PATH) packr build -ldflags="-X main.VersionString=$(GIT_VERSION)" -asmflags="-trimpath=$(PWD)" -gcflags="-trimpath=$(PWD)" -o $(TARGET)
+	go get -d .
+	GOOS=$(NATIVE_GOOS) GOARCH=$(NATIVE_GOARCH) GO111MODULE=off go get -v github.com/gobuffalo/packr/...
+	PATH=$(GOPATH)/bin:$(PATH) packr -z
+	CGO_ENABLED=0 go build -ldflags="-s -w -X main.VersionString=$(GIT_VERSION)" -asmflags="-trimpath=$(PWD)" -gcflags="-trimpath=$(PWD)" -o $(TARGET)
+	PATH=$(GOPATH)/bin:$(PATH) packr clean
 
 clean:
 	$(MAKE) cleanfast