diff --git a/Makefile b/Makefile
index 8c9bbfd503..b610ae47cb 100644
--- a/Makefile
+++ b/Makefile
@@ -379,9 +379,14 @@ golangci_version=v1.51.2
 lint:
 	@echo "--> Running linter"
 	@go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(golangci_version)
-	@sh ./scripts/go-lint-all.sh
+	@sh ./scripts/go-lint-all.sh --timeout=15m
 
-.PHONY: lint
+lint-fix:
+	@echo "--> Running linter"
+	@go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(golangci_version)
+	@sh ./scripts/go-lint-all.sh --fix
+
+.PHONY: lint lint-fix
 
 ###############################################################################
 ###                                Protobuf                                 ###
diff --git a/scripts/go-lint-all.sh b/scripts/go-lint-all.sh
index 2f945db925..4518046191 100644
--- a/scripts/go-lint-all.sh
+++ b/scripts/go-lint-all.sh
@@ -7,5 +7,5 @@ export pwd=$(pwd)
 for modfile in $(find . -name go.mod); do
  echo "linting $(dirname $modfile)"
  DIR=$(dirname $modfile)
- (cd $DIR; golangci-lint run ./... --fix -c $pwd/.golangci.yml)
+ (cd $DIR; golangci-lint run ./... -c $pwd/.golangci.yml $@)
 done