diff --git a/Makefile b/Makefile
index bada10fe..d4dd1222 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,8 @@ project-tools:
 # LINT
 lint-golangci-lint:
 	@echo "Linting with golangci-lint"
-	go tool golangci-lint run --fix --config golang-ci.yaml
+	@go run github.com/golangci/golangci-lint/v2/cmd/golangci-lint run --fix --config golang-ci.yaml
+
 
 lint-tf:
 	@echo "Linting terraform files"
diff --git a/go.mod b/go.mod
index 38b85919..0b7d4090 100644
--- a/go.mod
+++ b/go.mod
@@ -2,11 +2,10 @@ module tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stac
 
 go 1.25.6
 
-tool github.com/golangci/golangci-lint/v2/cmd/golangci-lint
-
 require (
 	github.com/SladkyCitron/slogcolor v1.8.0
 	github.com/golang-jwt/jwt/v5 v5.3.1
+	github.com/golangci/golangci-lint/v2 v2.10.1
 	github.com/google/go-cmp v0.7.0
 	github.com/google/uuid v1.6.0
 	github.com/hashicorp/terraform-plugin-framework v1.17.0
@@ -112,7 +111,6 @@ require (
 	github.com/golangci/dupl v0.0.0-20250308024227-f665c8d69b32 // indirect
 	github.com/golangci/go-printf-func-name v0.1.1 // indirect
 	github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d // indirect
-	github.com/golangci/golangci-lint/v2 v2.10.1 // indirect
 	github.com/golangci/golines v0.15.0 // indirect
 	github.com/golangci/misspell v0.8.0 // indirect
 	github.com/golangci/plugin-module-register v0.1.2 // indirect
diff --git a/tools/tools.go b/tools/tools.go
index 075c26d5..9c5dd871 100644
--- a/tools/tools.go
+++ b/tools/tools.go
@@ -1,3 +1,5 @@
+//go:build tools
+
 package tools
 
 // Format Terraform code for use in documentation.
@@ -7,3 +9,7 @@ package tools
 
 // Generate documentation.
 //go:generate go run github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs generate --provider-dir .. -provider-name stackitprivatepreview
+
+import (
+	_ "github.com/golangci/golangci-lint/v2/cmd/golangci-lint"
+)