diff --git a/bencode/fuzz.go b/bencode/fuzz.go
index d075b13e..7606a8cc 100644
--- a/bencode/fuzz.go
+++ b/bencode/fuzz.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package bencode
diff --git a/metainfo/fuzz.go b/metainfo/fuzz.go
index 60ece520..f0f0dd41 100644
--- a/metainfo/fuzz.go
+++ b/metainfo/fuzz.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package metainfo
diff --git a/storage/bolt-piece-completion.go b/storage/bolt-piece-completion.go
index 52c52977..43417f20 100644
--- a/storage/bolt-piece-completion.go
+++ b/storage/bolt-piece-completion.go
@@ -1,4 +1,4 @@
-//go:build !noboltdb,!wasm
+//go:build !noboltdb && !wasm
 // +build !noboltdb,!wasm
 
 package storage
diff --git a/storage/bolt-piece.go b/storage/bolt-piece.go
index 0be820b1..12916ee5 100644
--- a/storage/bolt-piece.go
+++ b/storage/bolt-piece.go
@@ -1,4 +1,4 @@
-//go:build !noboltdb,!wasm
+//go:build !noboltdb && !wasm
 // +build !noboltdb,!wasm
 
 package storage
diff --git a/storage/bolt.go b/storage/bolt.go
index d2eabf8f..4473b841 100644
--- a/storage/bolt.go
+++ b/storage/bolt.go
@@ -1,4 +1,4 @@
-//go:build !noboltdb,!wasm
+//go:build !noboltdb && !wasm
 // +build !noboltdb,!wasm
 
 package storage
diff --git a/utp_go.go b/utp_go.go
index 073c34ab..a7c225de 100644
--- a/utp_go.go
+++ b/utp_go.go
@@ -1,3 +1,4 @@
+//go:build !cgo || disable_libutp
 // +build !cgo disable_libutp
 
 package torrent
diff --git a/utp_libutp.go b/utp_libutp.go
index 46ba3afb..1e8fa673 100644
--- a/utp_libutp.go
+++ b/utp_libutp.go
@@ -1,3 +1,4 @@
+//go:build cgo && !disable_libutp
 // +build cgo,!disable_libutp
 
 package torrent