diff --git a/cmd/prometheus/main_unix_test.go b/cmd/prometheus/main_unix_test.go
index 7224e25d7..417d062d6 100644
--- a/cmd/prometheus/main_unix_test.go
+++ b/cmd/prometheus/main_unix_test.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 //
 //go:build !windows
-// +build !windows
 
 package main
 
diff --git a/config/config_default_test.go b/config/config_default_test.go
index f5333f4c8..26623590d 100644
--- a/config/config_default_test.go
+++ b/config/config_default_test.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build !windows
-// +build !windows
 
 package config
 
diff --git a/plugins/generate.go b/plugins/generate.go
index 32a32d890..3db6de4ab 100644
--- a/plugins/generate.go
+++ b/plugins/generate.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build plugins
-// +build plugins
 
 package main
 
diff --git a/promql/fuzz.go b/promql/fuzz.go
index aff6eb15b..d2e5925eb 100644
--- a/promql/fuzz.go
+++ b/promql/fuzz.go
@@ -13,7 +13,6 @@
 
 // Only build when go-fuzz is in use
 //go:build gofuzz
-// +build gofuzz
 
 package promql
 
diff --git a/promql/fuzz_test.go b/promql/fuzz_test.go
index 08a04d98b..1f0bbaa66 100644
--- a/promql/fuzz_test.go
+++ b/promql/fuzz_test.go
@@ -13,7 +13,6 @@
 
 // Only build when go-fuzz is in use
 //go:build gofuzz
-// +build gofuzz
 
 package promql
 
diff --git a/scripts/tools.go b/scripts/tools.go
index 52b464911..e1dd80232 100644
--- a/scripts/tools.go
+++ b/scripts/tools.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build tools
-// +build tools
 
 // Package tools tracks dependencies for tools that are required to generate the protobuf code.
 // See https://github.com/golang/go/issues/25922
diff --git a/tsdb/chunks/head_chunks_other.go b/tsdb/chunks/head_chunks_other.go
index 3d00fddc3..f30c5e55e 100644
--- a/tsdb/chunks/head_chunks_other.go
+++ b/tsdb/chunks/head_chunks_other.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build !windows
-// +build !windows
 
 package chunks
 
diff --git a/tsdb/fileutil/dir_unix.go b/tsdb/fileutil/dir_unix.go
index db310014e..2afb2aeab 100644
--- a/tsdb/fileutil/dir_unix.go
+++ b/tsdb/fileutil/dir_unix.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build !windows
-// +build !windows
 
 package fileutil
 
diff --git a/tsdb/fileutil/dir_windows.go b/tsdb/fileutil/dir_windows.go
index f67cc74b3..307077ebc 100644
--- a/tsdb/fileutil/dir_windows.go
+++ b/tsdb/fileutil/dir_windows.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build windows
-// +build windows
 
 package fileutil
 
diff --git a/tsdb/fileutil/flock_js.go b/tsdb/fileutil/flock_js.go
index 697d2e542..6029cdf4d 100644
--- a/tsdb/fileutil/flock_js.go
+++ b/tsdb/fileutil/flock_js.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build js
-// +build js
 
 package fileutil
 
diff --git a/tsdb/fileutil/flock_solaris.go b/tsdb/fileutil/flock_solaris.go
index 21be384d3..8ca919f3b 100644
--- a/tsdb/fileutil/flock_solaris.go
+++ b/tsdb/fileutil/flock_solaris.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build solaris
-// +build solaris
 
 package fileutil
 
diff --git a/tsdb/fileutil/flock_unix.go b/tsdb/fileutil/flock_unix.go
index 9637f073b..25de0ffb2 100644
--- a/tsdb/fileutil/flock_unix.go
+++ b/tsdb/fileutil/flock_unix.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd
-// +build darwin dragonfly freebsd linux netbsd openbsd
 
 package fileutil
 
diff --git a/tsdb/fileutil/mmap_386.go b/tsdb/fileutil/mmap_386.go
index 591d722d5..85c0cce09 100644
--- a/tsdb/fileutil/mmap_386.go
+++ b/tsdb/fileutil/mmap_386.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build windows
-// +build windows
 
 package fileutil
 
diff --git a/tsdb/fileutil/mmap_amd64.go b/tsdb/fileutil/mmap_amd64.go
index 4c9534e93..71fc568bd 100644
--- a/tsdb/fileutil/mmap_amd64.go
+++ b/tsdb/fileutil/mmap_amd64.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build windows
-// +build windows
 
 package fileutil
 
diff --git a/tsdb/fileutil/mmap_arm64.go b/tsdb/fileutil/mmap_arm64.go
index 4c9534e93..71fc568bd 100644
--- a/tsdb/fileutil/mmap_arm64.go
+++ b/tsdb/fileutil/mmap_arm64.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build windows
-// +build windows
 
 package fileutil
 
diff --git a/tsdb/fileutil/mmap_js.go b/tsdb/fileutil/mmap_js.go
index 0c666e8bf..f29106fc1 100644
--- a/tsdb/fileutil/mmap_js.go
+++ b/tsdb/fileutil/mmap_js.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build js
-// +build js
 
 package fileutil
 
diff --git a/tsdb/fileutil/mmap_unix.go b/tsdb/fileutil/mmap_unix.go
index 1fd7f48ff..3d15e1a8c 100644
--- a/tsdb/fileutil/mmap_unix.go
+++ b/tsdb/fileutil/mmap_unix.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build !windows && !plan9 && !js
-// +build !windows,!plan9,!js
 
 package fileutil
 
diff --git a/tsdb/fileutil/preallocate_other.go b/tsdb/fileutil/preallocate_other.go
index 2c46dd490..e7fd937a4 100644
--- a/tsdb/fileutil/preallocate_other.go
+++ b/tsdb/fileutil/preallocate_other.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build !linux && !darwin
-// +build !linux,!darwin
 
 package fileutil
 
diff --git a/tsdb/fileutil/sync.go b/tsdb/fileutil/sync.go
index 5bd18b458..e1a4a7fd3 100644
--- a/tsdb/fileutil/sync.go
+++ b/tsdb/fileutil/sync.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build !linux && !darwin
-// +build !linux,!darwin
 
 package fileutil
 
diff --git a/tsdb/fileutil/sync_darwin.go b/tsdb/fileutil/sync_darwin.go
index 155b94459..d698b896a 100644
--- a/tsdb/fileutil/sync_darwin.go
+++ b/tsdb/fileutil/sync_darwin.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build darwin
-// +build darwin
 
 package fileutil
 
diff --git a/tsdb/fileutil/sync_linux.go b/tsdb/fileutil/sync_linux.go
index 1c2091ea3..2b4c620bb 100644
--- a/tsdb/fileutil/sync_linux.go
+++ b/tsdb/fileutil/sync_linux.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build linux
-// +build linux
 
 package fileutil
 
diff --git a/tsdb/goversion/goversion.go b/tsdb/goversion/goversion.go
index 02da2639d..ec23d25f2 100644
--- a/tsdb/goversion/goversion.go
+++ b/tsdb/goversion/goversion.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build go1.12
-// +build go1.12
 
 // Package goversion enforces the go version supported by the tsdb module.
 package goversion
diff --git a/tsdb/wal_test.go b/tsdb/wal_test.go
index 964763d7f..9004f5093 100644
--- a/tsdb/wal_test.go
+++ b/tsdb/wal_test.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build !windows
-// +build !windows
 
 package tsdb
 
diff --git a/util/runtime/limits_default.go b/util/runtime/limits_default.go
index 40af5f14d..0126adb1a 100644
--- a/util/runtime/limits_default.go
+++ b/util/runtime/limits_default.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build !windows
-// +build !windows
 
 package runtime
 
diff --git a/util/runtime/limits_windows.go b/util/runtime/limits_windows.go
index ce514949e..ce82d31e6 100644
--- a/util/runtime/limits_windows.go
+++ b/util/runtime/limits_windows.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build windows
-// +build windows
 
 package runtime
 
diff --git a/util/runtime/statfs.go b/util/runtime/statfs.go
index 2e5a624b6..66bedb5ea 100644
--- a/util/runtime/statfs.go
+++ b/util/runtime/statfs.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build openbsd || windows || netbsd || solaris
-// +build openbsd windows netbsd solaris
 
 package runtime
 
diff --git a/util/runtime/statfs_default.go b/util/runtime/statfs_default.go
index b6f837c47..8d283c1e4 100644
--- a/util/runtime/statfs_default.go
+++ b/util/runtime/statfs_default.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build !windows && !openbsd && !netbsd && !solaris && !386
-// +build !windows,!openbsd,!netbsd,!solaris,!386
 
 package runtime
 
diff --git a/util/runtime/statfs_linux_386.go b/util/runtime/statfs_linux_386.go
index 7494a0adf..a003b2eff 100644
--- a/util/runtime/statfs_linux_386.go
+++ b/util/runtime/statfs_linux_386.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build linux && 386
-// +build linux,386
 
 package runtime
 
diff --git a/util/runtime/statfs_uint32.go b/util/runtime/statfs_uint32.go
index 72d670a39..fbf994ea6 100644
--- a/util/runtime/statfs_uint32.go
+++ b/util/runtime/statfs_uint32.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build (386 && darwin) || (386 && freebsd)
-// +build 386,darwin 386,freebsd
 
 package runtime
 
diff --git a/util/runtime/uname_default.go b/util/runtime/uname_default.go
index 161337121..0052dbab4 100644
--- a/util/runtime/uname_default.go
+++ b/util/runtime/uname_default.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build !linux
-// +build !linux
 
 package runtime
 
diff --git a/util/runtime/vmlimits_default.go b/util/runtime/vmlimits_default.go
index bf35b48fe..aef434106 100644
--- a/util/runtime/vmlimits_default.go
+++ b/util/runtime/vmlimits_default.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build !windows && !openbsd
-// +build !windows,!openbsd
 
 package runtime
 
diff --git a/util/runtime/vmlimits_openbsd.go b/util/runtime/vmlimits_openbsd.go
index e33ab4802..b40f06588 100644
--- a/util/runtime/vmlimits_openbsd.go
+++ b/util/runtime/vmlimits_openbsd.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build openbsd
-// +build openbsd
 
 package runtime
 
diff --git a/web/ui/assets_embed.go b/web/ui/assets_embed.go
index f10d5c0c2..a5f8f5ddf 100644
--- a/web/ui/assets_embed.go
+++ b/web/ui/assets_embed.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build builtinassets
-// +build builtinassets
 
 package ui
 
diff --git a/web/ui/ui.go b/web/ui/ui.go
index 99ae34e5d..2585951d4 100644
--- a/web/ui/ui.go
+++ b/web/ui/ui.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build !builtinassets
-// +build !builtinassets
 
 package ui