diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 52a97f3413..413125a8aa 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -18,8 +18,5 @@ jobs:
         with:
           go-version: 1.20.2
       - uses: actions/checkout@v3
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
-        with:
-          # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-          version: v1.51.2
+      - run: make lint
+
diff --git a/Makefile b/Makefile
index 523b3d938f..8c9bbfd503 100644
--- a/Makefile
+++ b/Makefile
@@ -379,19 +379,9 @@ golangci_version=v1.51.2
 lint:
 	@echo "--> Running linter"
 	@go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(golangci_version)
-	@$(golangci_lint_cmd) run --timeout=10m
+	@sh ./scripts/go-lint-all.sh
 
-lint-fix:
-	@echo "--> Running linter"
-	@go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(golangci_version)
-	@$(golangci_lint_cmd) run --fix --out-format=tab --issues-exit-code=0
-
-.PHONY: lint lint-fix
-
-format:
-	@go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(golangci_version)
-	$(golangci_lint_cmd) run --fix
-.PHONY: format
+.PHONY: lint
 
 ###############################################################################
 ###                                Protobuf                                 ###
diff --git a/scripts/go-lint-all.sh b/scripts/go-lint-all.sh
new file mode 100644
index 0000000000..2f945db925
--- /dev/null
+++ b/scripts/go-lint-all.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+set -eu
+
+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)
+done