diff --git a/Makefile b/Makefile
index a8f0f10a7a381795a21cc97faa45638a2a621ec3..142965bdfb38fc8d6f376f4d975053ab502f88e6 100644
--- a/Makefile
+++ b/Makefile
@@ -5,14 +5,12 @@ UID:=$(shell id -u)
 VERSION:=$(shell git describe --tags --always --dirty="-dev")
 LDFLAGS:=-X main.Version=$(VERSION)
 
-export GO111MODULE:=off
-export GOPATH:=$(PWD)/gopath
 export CGO_ENABLED:=0
 
-build: gopath/src/$(PKG) fmt
-	GOOS=linux go build -ldflags="$(LDFLAGS)" -o bin/$(APP_NAME) $(PKG)
-	GOOS=darwin go build -ldflags="$(LDFLAGS)" -o bin/$(APP_NAME)_darwin $(PKG)
-	GOOS=windows go build -ldflags="$(LDFLAGS)" -o bin/$(APP_NAME).exe $(PKG)
+build: fmt vet
+	GOOS=linux go build -mod=vendor -ldflags="$(LDFLAGS)" -o bin/$(APP_NAME) $(PKG)
+	GOOS=darwin go build -mod=vendor -ldflags="$(LDFLAGS)" -o bin/$(APP_NAME)_darwin $(PKG)
+	GOOS=windows go build -mod=vendor -ldflags="$(LDFLAGS)" -o bin/$(APP_NAME).exe $(PKG)
 
 docker:
 	docker run -ti --rm -e GOCACHE=/tmp -v $(PWD):/$(APP_NAME) -u $(UID):$(UID) --workdir /$(APP_NAME) golang:latest make
@@ -20,11 +18,8 @@ docker:
 fmt:
 	gofmt -s -w *.go
 
-mod:
-	GO111MODULE=auto go mod download
-	GO111MODULE=auto go mod tidy
-	GO111MODULE=auto go mod vendor
+vet:
+	go vet -mod=vendor ./
 
-gopath/src/$(PKG):
-	mkdir -p gopath/src/$(shell dirname $(PKG))
-	ln -sf ../../../.. gopath/src/$(PKG)
+mod:
+	go mod vendor