diff --git a/.build.yml b/.build.yml
index aad7636..f0df088 100644
--- a/.build.yml
+++ b/.build.yml
@@ -7,7 +7,7 @@ sources:
   - https://git.sr.ht/~motiejus/undocker
 tasks:
   - setup: |
-      GOPATH=/usr/local go get honnef.co/go/tools/cmd/staticcheck
+      go install honnef.co/go/tools/cmd/staticcheck@latest
   - test: |
       make -C undocker coverage.html
   - lint: |
diff --git a/Makefile b/Makefile
index bc556f4..d1f3aab 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 GODEPS = $(shell git ls-files '*.go' go.mod go.sum)
+GOBIN = $(shell go env GOPATH)/bin/
 
 undocker: $(GODEPS)
 	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build
@@ -9,7 +10,7 @@ test:
 
 .PHONY: lint
 lint:
-	staticcheck -f stylish ./...
+	$(GOBIN)staticcheck -f stylish ./...
 	go vet ./...
 
 .INTERMEDIATE: coverage.out