diff --git a/.golangci.yml b/.golangci.yml
index d0a9f4b46f6..d967e0c33f9 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -230,6 +230,9 @@ issues:
   exclude-dirs:
     - devenv
     - scripts
+  exclude-files:
+    - pkg/util/xorm/*.go
+    - pkg/build/wire/*.go
   exclude-rules:
     - linters:
         - stylecheck
diff --git a/Makefile b/Makefile
index 0279597db97..ccabdbd733a 100644
--- a/Makefile
+++ b/Makefile
@@ -305,7 +305,7 @@ test: test-go test-js ## Run all tests.
 golangci-lint: $(GOLANGCI_LINT)
 	@echo "lint via golangci-lint"
 	$(GOLANGCI_LINT) run \
-		--config .golangci.yml \
+		--config .golangci.toml \
 		$(GO_LINT_FILES)
 
 .PHONY: lint-go