diff --git a/Makefile b/Makefile
index 44d60dc8a..de9d20b3d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # renovate: datasource=github-releases depName=mvdan/gofumpt
 GOFUMPT_VERSION := v0.9.2
 # renovate: datasource=github-releases depName=golangci/golangci-lint
-GOLANGCI_LINT_VERSION := v2.5.0
+GOLANGCI_LINT_VERSION := v2.6.0
 # renovate: datasource=docker depName=docker.io/techknowlogick/xgo
 XGO_VERSION := go-1.25.x
 
diff --git a/cli/exec/dummy.go b/cli/exec/dummy.go
index 757bd9519..377c34a41 100644
--- a/cli/exec/dummy.go
+++ b/cli/exec/dummy.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build test
-// +build test
 
 package exec
 
diff --git a/cmd/agent/dummy.go b/cmd/agent/dummy.go
index f2da7c105..7db166712 100644
--- a/cmd/agent/dummy.go
+++ b/cmd/agent/dummy.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build test
-// +build test
 
 package main
 
diff --git a/cmd/cli/docs.go b/cmd/cli/docs.go
index d8dae41de..151de3c13 100644
--- a/cmd/cli/docs.go
+++ b/cmd/cli/docs.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build generate
-// +build generate
 
 package main
 
diff --git a/cmd/server/main.go b/cmd/server/main.go
index 5ac49ff27..2176ca394 100644
--- a/cmd/server/main.go
+++ b/cmd/server/main.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build !generate
-// +build !generate
 
 package main
 
diff --git a/cmd/server/openapi_json_gen.go b/cmd/server/openapi_json_gen.go
index 73474b8e3..7a98c0d6b 100644
--- a/cmd/server/openapi_json_gen.go
+++ b/cmd/server/openapi_json_gen.go
@@ -17,7 +17,6 @@
 // *********************************************************
 
 //go:build generate
-// +build generate
 
 package main
 
diff --git a/pipeline/backend/dummy/dummy.go b/pipeline/backend/dummy/dummy.go
index 5e56f7fbb..650b63dcb 100644
--- a/pipeline/backend/dummy/dummy.go
+++ b/pipeline/backend/dummy/dummy.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build test
-// +build test
 
 package dummy
 
diff --git a/pipeline/backend/local/local_test.go b/pipeline/backend/local/local_test.go
index 0c8d97ab7..373ff9d8b 100644
--- a/pipeline/backend/local/local_test.go
+++ b/pipeline/backend/local/local_test.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build linux
-// +build linux
 
 package local
 
diff --git a/server/store/datastore/init.go b/server/store/datastore/init.go
index 0f9439fad..75ebea170 100644
--- a/server/store/datastore/init.go
+++ b/server/store/datastore/init.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build !cgo
-// +build !cgo
 
 package datastore
 
diff --git a/server/store/datastore/init_cgo.go b/server/store/datastore/init_cgo.go
index a103b8fa8..65f20a5aa 100644
--- a/server/store/datastore/init_cgo.go
+++ b/server/store/datastore/init_cgo.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build cgo
-// +build cgo
 
 package datastore