diff --git a/.golangci.yml b/.golangci.yml
index 7e9642bfee..a6edfd8fbe 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,5 +1,5 @@
 run:
-  deadline: 5m
+  timeout: 15m
   skip-files:
     - ^.*\.(pb|y)\.go$
   skip-dirs:
diff --git a/Makefile b/Makefile
index b027b328df..5c5c81f377 100644
--- a/Makefile
+++ b/Makefile
@@ -150,12 +150,12 @@ run/site:
 .PHONY: lint/go
 lint/go: FIX ?= false
 lint/go: VERSION ?= sha256:78d1bbd01a9886a395dc8374218a6c0b7b67694e725dd76f0c8ac1de411b85e8 #v1.46.2
-lint/go: FLAGS ?= --rm --platform linux/amd64 -e GOLANGCI_LINT_CACHE=/repo/.cache/golangci-lint -v ${PWD}:/repo -w /repo -it
+lint/go: FLAGS ?= --rm --platform linux/amd64 -e GOCACHE=/repo/.cache/go-build -e GOLANGCI_LINT_CACHE=/repo/.cache/golangci-lint -v ${PWD}:/repo -w /repo -it
 lint/go:
 ifeq ($(FIX),true)
-	docker run ${FLAGS} golangci/golangci-lint@${VERSION} golangci-lint run --fix
+	docker run ${FLAGS} golangci/golangci-lint@${VERSION} golangci-lint run -v --fix
 else
-	docker run ${FLAGS} golangci/golangci-lint@${VERSION} golangci-lint run
+	docker run ${FLAGS} golangci/golangci-lint@${VERSION} golangci-lint run -v
 endif
 
 .PHONY: lint/web