diff --git a/aezeed/cipherseed_rpctest.go b/aezeed/cipherseed_rpctest.go
index 82f782cd..1fb25e31 100644
--- a/aezeed/cipherseed_rpctest.go
+++ b/aezeed/cipherseed_rpctest.go
@@ -1,3 +1,4 @@
+//go:build rpctest
 // +build rpctest
 
 package aezeed
diff --git a/build/deployment_dev.go b/build/deployment_dev.go
index fb2bb2b9..a26ebd0e 100644
--- a/build/deployment_dev.go
+++ b/build/deployment_dev.go
@@ -1,3 +1,4 @@
+//go:build dev
 // +build dev
 
 package build
diff --git a/build/deployment_prod.go b/build/deployment_prod.go
index 247f25ae..255c1e18 100644
--- a/build/deployment_prod.go
+++ b/build/deployment_prod.go
@@ -1,3 +1,4 @@
+//go:build !dev
 // +build !dev
 
 package build
diff --git a/build/log_default.go b/build/log_default.go
index 399a00df..bbb6d4c3 100644
--- a/build/log_default.go
+++ b/build/log_default.go
@@ -1,3 +1,4 @@
+//go:build !stdlog && !nolog
 // +build !stdlog,!nolog
 
 package build
diff --git a/build/log_nolog.go b/build/log_nolog.go
index 0aa15bc4..32199ada 100644
--- a/build/log_nolog.go
+++ b/build/log_nolog.go
@@ -1,3 +1,4 @@
+//go:build nolog
 // +build nolog
 
 package build
diff --git a/build/log_stdlog.go b/build/log_stdlog.go
index a495eaec..34a8c1bf 100644
--- a/build/log_stdlog.go
+++ b/build/log_stdlog.go
@@ -1,3 +1,4 @@
+//go:build stdlog
 // +build stdlog
 
 package build
diff --git a/build/loglevel_critical.go b/build/loglevel_critical.go
index 2e3a3734..8decb83a 100644
--- a/build/loglevel_critical.go
+++ b/build/loglevel_critical.go
@@ -1,3 +1,4 @@
+//go:build dev && critical
 // +build dev,critical
 
 package build
diff --git a/build/loglevel_debug.go b/build/loglevel_debug.go
index 7d22c90a..c80afec1 100644
--- a/build/loglevel_debug.go
+++ b/build/loglevel_debug.go
@@ -1,3 +1,4 @@
+//go:build dev && debug
 // +build dev,debug
 
 package build
diff --git a/build/loglevel_default.go b/build/loglevel_default.go
index 5e12ffcc..52fe1224 100644
--- a/build/loglevel_default.go
+++ b/build/loglevel_default.go
@@ -1,3 +1,4 @@
+//go:build !info && !debug && !trace && !warn && !error && !critical && !off
 // +build !info,!debug,!trace,!warn,!error,!critical,!off
 
 package build
diff --git a/build/loglevel_error.go b/build/loglevel_error.go
index 81e3849e..5fbdb999 100644
--- a/build/loglevel_error.go
+++ b/build/loglevel_error.go
@@ -1,3 +1,4 @@
+//go:build dev && error
 // +build dev,error
 
 package build
diff --git a/build/loglevel_info.go b/build/loglevel_info.go
index f0d6dca0..c367f649 100644
--- a/build/loglevel_info.go
+++ b/build/loglevel_info.go
@@ -1,3 +1,4 @@
+//go:build dev && info
 // +build dev,info
 
 package build
diff --git a/build/loglevel_off.go b/build/loglevel_off.go
index d6c65e77..077dcd0a 100644
--- a/build/loglevel_off.go
+++ b/build/loglevel_off.go
@@ -1,3 +1,4 @@
+//go:build dev && off
 // +build dev,off
 
 package build
diff --git a/build/loglevel_trace.go b/build/loglevel_trace.go
index ec17e9dd..1d9eed67 100644
--- a/build/loglevel_trace.go
+++ b/build/loglevel_trace.go
@@ -1,3 +1,4 @@
+//go:build dev && trace
 // +build dev,trace
 
 package build
diff --git a/build/loglevel_warn.go b/build/loglevel_warn.go
index a8fdfc29..84368ee6 100644
--- a/build/loglevel_warn.go
+++ b/build/loglevel_warn.go
@@ -1,3 +1,4 @@
+//go:build dev && warn
 // +build dev,warn
 
 package build
diff --git a/chainntnfs/bitcoindnotify/bitcoind_dev.go b/chainntnfs/bitcoindnotify/bitcoind_dev.go
index 99080b38..d71caf4d 100644
--- a/chainntnfs/bitcoindnotify/bitcoind_dev.go
+++ b/chainntnfs/bitcoindnotify/bitcoind_dev.go
@@ -1,3 +1,4 @@
+//go:build dev
 // +build dev
 
 package bitcoindnotify
diff --git a/chainntnfs/bitcoindnotify/bitcoind_test.go b/chainntnfs/bitcoindnotify/bitcoind_test.go
index 4b670854..a3568c16 100644
--- a/chainntnfs/bitcoindnotify/bitcoind_test.go
+++ b/chainntnfs/bitcoindnotify/bitcoind_test.go
@@ -1,3 +1,4 @@
+//go:build dev
 // +build dev
 
 package bitcoindnotify
diff --git a/chainntnfs/btcdnotify/btcd_dev.go b/chainntnfs/btcdnotify/btcd_dev.go
index 4723c0de..11b20ff7 100644
--- a/chainntnfs/btcdnotify/btcd_dev.go
+++ b/chainntnfs/btcdnotify/btcd_dev.go
@@ -1,3 +1,4 @@
+//go:build dev
 // +build dev
 
 package btcdnotify
diff --git a/chainntnfs/btcdnotify/btcd_test.go b/chainntnfs/btcdnotify/btcd_test.go
index 798275f0..16782d46 100644
--- a/chainntnfs/btcdnotify/btcd_test.go
+++ b/chainntnfs/btcdnotify/btcd_test.go
@@ -1,3 +1,4 @@
+//go:build dev
 // +build dev
 
 package btcdnotify
diff --git a/chainntnfs/interface_dev.go b/chainntnfs/interface_dev.go
index ac00fa8d..eb307224 100644
--- a/chainntnfs/interface_dev.go
+++ b/chainntnfs/interface_dev.go
@@ -1,3 +1,4 @@
+//go:build dev
 // +build dev
 
 package chainntnfs
diff --git a/chainntnfs/neutrinonotify/neutrino_dev.go b/chainntnfs/neutrinonotify/neutrino_dev.go
index d19783cc..e70cdf4d 100644
--- a/chainntnfs/neutrinonotify/neutrino_dev.go
+++ b/chainntnfs/neutrinonotify/neutrino_dev.go
@@ -1,3 +1,4 @@
+//go:build dev
 // +build dev
 
 package neutrinonotify
diff --git a/chainntnfs/test/bitcoind/bitcoind_test.go b/chainntnfs/test/bitcoind/bitcoind_test.go
index df9d3853..32335e7b 100644
--- a/chainntnfs/test/bitcoind/bitcoind_test.go
+++ b/chainntnfs/test/bitcoind/bitcoind_test.go
@@ -1,3 +1,4 @@
+//go:build dev
 // +build dev
 
 package bitcoind_test
diff --git a/chainntnfs/test/btcd/btcd_test.go b/chainntnfs/test/btcd/btcd_test.go
index 320d6d8a..5ef44836 100644
--- a/chainntnfs/test/btcd/btcd_test.go
+++ b/chainntnfs/test/btcd/btcd_test.go
@@ -1,3 +1,4 @@
+//go:build dev
 // +build dev
 
 package btcd_test
diff --git a/chainntnfs/test/neutrino/neutrino_test.go b/chainntnfs/test/neutrino/neutrino_test.go
index ac6a09cf..e8be8537 100644
--- a/chainntnfs/test/neutrino/neutrino_test.go
+++ b/chainntnfs/test/neutrino/neutrino_test.go
@@ -1,3 +1,4 @@
+//go:build dev
 // +build dev
 
 package neutrino_test
diff --git a/chainntnfs/test/test_interface.go b/chainntnfs/test/test_interface.go
index f894e774..bdbb532f 100644
--- a/chainntnfs/test/test_interface.go
+++ b/chainntnfs/test/test_interface.go
@@ -1,3 +1,4 @@
+//go:build dev
 // +build dev
 
 package chainntnfstest
diff --git a/chainntnfs/test_utils.go b/chainntnfs/test_utils.go
index 5b7cc34f..291c26a6 100644
--- a/chainntnfs/test_utils.go
+++ b/chainntnfs/test_utils.go
@@ -1,3 +1,4 @@
+//go:build dev
 // +build dev
 
 package chainntnfs
diff --git a/cluster/etcd_elector.go b/cluster/etcd_elector.go
index acd0276a..a33ff24c 100644
--- a/cluster/etcd_elector.go
+++ b/cluster/etcd_elector.go
@@ -1,3 +1,4 @@
+//go:build kvdb_etcd
 // +build kvdb_etcd
 
 package cluster
diff --git a/cluster/etcd_elector_factory.go b/cluster/etcd_elector_factory.go
index 2863433d..75182d47 100644
--- a/cluster/etcd_elector_factory.go
+++ b/cluster/etcd_elector_factory.go
@@ -1,3 +1,4 @@
+//go:build kvdb_etcd
 // +build kvdb_etcd
 
 package cluster
diff --git a/cluster/etcd_elector_test.go b/cluster/etcd_elector_test.go
index b7f6e24c..65587edd 100644
--- a/cluster/etcd_elector_test.go
+++ b/cluster/etcd_elector_test.go
@@ -1,3 +1,4 @@
+//go:build kvdb_etcd
 // +build kvdb_etcd
 
 package cluster
diff --git a/cmd/lncli/autopilotrpc_active.go b/cmd/lncli/autopilotrpc_active.go
index d0d60ff2..961e8599 100644
--- a/cmd/lncli/autopilotrpc_active.go
+++ b/cmd/lncli/autopilotrpc_active.go
@@ -1,3 +1,4 @@
+//go:build autopilotrpc
 // +build autopilotrpc
 
 package main
diff --git a/cmd/lncli/autopilotrpc_default.go b/cmd/lncli/autopilotrpc_default.go
index 49061254..7fb88521 100644
--- a/cmd/lncli/autopilotrpc_default.go
+++ b/cmd/lncli/autopilotrpc_default.go
@@ -1,3 +1,4 @@
+//go:build !autopilotrpc
 // +build !autopilotrpc
 
 package main
diff --git a/cmd/lncli/invoicesrpc_active.go b/cmd/lncli/invoicesrpc_active.go
index 3df51360..b708e0f6 100644
--- a/cmd/lncli/invoicesrpc_active.go
+++ b/cmd/lncli/invoicesrpc_active.go
@@ -1,3 +1,4 @@
+//go:build invoicesrpc
 // +build invoicesrpc
 
 package main
diff --git a/cmd/lncli/invoicesrpc_default.go b/cmd/lncli/invoicesrpc_default.go
index 570dfa69..cca3c14e 100644
--- a/cmd/lncli/invoicesrpc_default.go
+++ b/cmd/lncli/invoicesrpc_default.go
@@ -1,3 +1,4 @@
+//go:build !invoicesrpc
 // +build !invoicesrpc
 
 package main
diff --git a/cmd/lncli/walletrpc_active.go b/cmd/lncli/walletrpc_active.go
index fa6104d3..460635f0 100644
--- a/cmd/lncli/walletrpc_active.go
+++ b/cmd/lncli/walletrpc_active.go
@@ -1,3 +1,4 @@
+//go:build walletrpc
 // +build walletrpc
 
 package main
diff --git a/cmd/lncli/walletrpc_default.go b/cmd/lncli/walletrpc_default.go
index f919a993..d6670e44 100644
--- a/cmd/lncli/walletrpc_default.go
+++ b/cmd/lncli/walletrpc_default.go
@@ -1,3 +1,4 @@
+//go:build !walletrpc
 // +build !walletrpc
 
 package main
diff --git a/cmd/lncli/watchtower_active.go b/cmd/lncli/watchtower_active.go
index f8b6b9e7..9c31c6ec 100644
--- a/cmd/lncli/watchtower_active.go
+++ b/cmd/lncli/watchtower_active.go
@@ -1,3 +1,4 @@
+//go:build watchtowerrpc
 // +build watchtowerrpc
 
 package main
diff --git a/cmd/lncli/watchtower_default.go b/cmd/lncli/watchtower_default.go
index 41d887a9..e3db3ccf 100644
--- a/cmd/lncli/watchtower_default.go
+++ b/cmd/lncli/watchtower_default.go
@@ -1,3 +1,4 @@
+//go:build !watchtowerrpc
 // +build !watchtowerrpc
 
 package main
diff --git a/funding/manager_test.go b/funding/manager_test.go
index 1a3f9905..636f4b0f 100644
--- a/funding/manager_test.go
+++ b/funding/manager_test.go
@@ -1,3 +1,4 @@
+//go:build !rpctest
 // +build !rpctest
 
 package funding
diff --git a/fuzz/brontide/fuzz_utils.go b/fuzz/brontide/fuzz_utils.go
index 57370f7c..ab846efa 100644
--- a/fuzz/brontide/fuzz_utils.go
+++ b/fuzz/brontide/fuzz_utils.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package brontidefuzz
diff --git a/fuzz/brontide/random_actone.go b/fuzz/brontide/random_actone.go
index efa888b9..7d2e0c07 100644
--- a/fuzz/brontide/random_actone.go
+++ b/fuzz/brontide/random_actone.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package brontidefuzz
diff --git a/fuzz/brontide/random_actthree.go b/fuzz/brontide/random_actthree.go
index 6b051771..fe0c7076 100644
--- a/fuzz/brontide/random_actthree.go
+++ b/fuzz/brontide/random_actthree.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package brontidefuzz
diff --git a/fuzz/brontide/random_acttwo.go b/fuzz/brontide/random_acttwo.go
index 8ff2f7eb..8cef21b7 100644
--- a/fuzz/brontide/random_acttwo.go
+++ b/fuzz/brontide/random_acttwo.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package brontidefuzz
diff --git a/fuzz/brontide/random_init_decrypt.go b/fuzz/brontide/random_init_decrypt.go
index 3328a2b6..b9a4aac5 100644
--- a/fuzz/brontide/random_init_decrypt.go
+++ b/fuzz/brontide/random_init_decrypt.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package brontidefuzz
diff --git a/fuzz/brontide/random_init_enc_dec.go b/fuzz/brontide/random_init_enc_dec.go
index 6f1a7312..7d79cfc4 100644
--- a/fuzz/brontide/random_init_enc_dec.go
+++ b/fuzz/brontide/random_init_enc_dec.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package brontidefuzz
diff --git a/fuzz/brontide/random_init_encrypt.go b/fuzz/brontide/random_init_encrypt.go
index 76f5dacd..50f784c4 100644
--- a/fuzz/brontide/random_init_encrypt.go
+++ b/fuzz/brontide/random_init_encrypt.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package brontidefuzz
diff --git a/fuzz/brontide/random_resp_decrypt.go b/fuzz/brontide/random_resp_decrypt.go
index 1ae40bd2..9bb44faa 100644
--- a/fuzz/brontide/random_resp_decrypt.go
+++ b/fuzz/brontide/random_resp_decrypt.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package brontidefuzz
diff --git a/fuzz/brontide/random_resp_enc_dec.go b/fuzz/brontide/random_resp_enc_dec.go
index f84e7c47..9d50816a 100644
--- a/fuzz/brontide/random_resp_enc_dec.go
+++ b/fuzz/brontide/random_resp_enc_dec.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package brontidefuzz
diff --git a/fuzz/brontide/random_resp_encrypt.go b/fuzz/brontide/random_resp_encrypt.go
index 5ac9abad..c72f64df 100644
--- a/fuzz/brontide/random_resp_encrypt.go
+++ b/fuzz/brontide/random_resp_encrypt.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package brontidefuzz
diff --git a/fuzz/brontide/static_actone.go b/fuzz/brontide/static_actone.go
index 9400255d..ee9700af 100644
--- a/fuzz/brontide/static_actone.go
+++ b/fuzz/brontide/static_actone.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package brontidefuzz
diff --git a/fuzz/brontide/static_actthree.go b/fuzz/brontide/static_actthree.go
index b28abace..61fa00b2 100644
--- a/fuzz/brontide/static_actthree.go
+++ b/fuzz/brontide/static_actthree.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package brontidefuzz
diff --git a/fuzz/brontide/static_acttwo.go b/fuzz/brontide/static_acttwo.go
index 463ebab3..e7e12326 100644
--- a/fuzz/brontide/static_acttwo.go
+++ b/fuzz/brontide/static_acttwo.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package brontidefuzz
diff --git a/fuzz/brontide/static_init_decrypt.go b/fuzz/brontide/static_init_decrypt.go
index 35525d20..9a39c803 100644
--- a/fuzz/brontide/static_init_decrypt.go
+++ b/fuzz/brontide/static_init_decrypt.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package brontidefuzz
diff --git a/fuzz/brontide/static_init_enc_dec.go b/fuzz/brontide/static_init_enc_dec.go
index 81669db2..5a33aabf 100644
--- a/fuzz/brontide/static_init_enc_dec.go
+++ b/fuzz/brontide/static_init_enc_dec.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package brontidefuzz
diff --git a/fuzz/brontide/static_init_encrypt.go b/fuzz/brontide/static_init_encrypt.go
index 6c45a0b2..6375dd4d 100644
--- a/fuzz/brontide/static_init_encrypt.go
+++ b/fuzz/brontide/static_init_encrypt.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package brontidefuzz
diff --git a/fuzz/brontide/static_resp_decrypt.go b/fuzz/brontide/static_resp_decrypt.go
index fee4500b..140a52bb 100644
--- a/fuzz/brontide/static_resp_decrypt.go
+++ b/fuzz/brontide/static_resp_decrypt.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package brontidefuzz
diff --git a/fuzz/brontide/static_resp_enc_dec.go b/fuzz/brontide/static_resp_enc_dec.go
index aaa7c3e8..1f0f31b9 100644
--- a/fuzz/brontide/static_resp_enc_dec.go
+++ b/fuzz/brontide/static_resp_enc_dec.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package brontidefuzz
diff --git a/fuzz/brontide/static_resp_encrypt.go b/fuzz/brontide/static_resp_encrypt.go
index 5fdc9036..9c957fb1 100644
--- a/fuzz/brontide/static_resp_encrypt.go
+++ b/fuzz/brontide/static_resp_encrypt.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package brontidefuzz
diff --git a/fuzz/lnwire/accept_channel.go b/fuzz/lnwire/accept_channel.go
index 5f20a858..f57c2af4 100644
--- a/fuzz/lnwire/accept_channel.go
+++ b/fuzz/lnwire/accept_channel.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package lnwirefuzz
diff --git a/fuzz/lnwire/announce_signatures.go b/fuzz/lnwire/announce_signatures.go
index 68263786..c35d5a24 100644
--- a/fuzz/lnwire/announce_signatures.go
+++ b/fuzz/lnwire/announce_signatures.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package lnwirefuzz
diff --git a/fuzz/lnwire/channel_announcement.go b/fuzz/lnwire/channel_announcement.go
index 2b0c2ff0..92800185 100644
--- a/fuzz/lnwire/channel_announcement.go
+++ b/fuzz/lnwire/channel_announcement.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package lnwirefuzz
diff --git a/fuzz/lnwire/channel_reestablish.go b/fuzz/lnwire/channel_reestablish.go
index 324f0afc..841142c1 100644
--- a/fuzz/lnwire/channel_reestablish.go
+++ b/fuzz/lnwire/channel_reestablish.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package lnwirefuzz
diff --git a/fuzz/lnwire/channel_update.go b/fuzz/lnwire/channel_update.go
index 29bb7d37..cce82442 100644
--- a/fuzz/lnwire/channel_update.go
+++ b/fuzz/lnwire/channel_update.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package lnwirefuzz
diff --git a/fuzz/lnwire/closing_signed.go b/fuzz/lnwire/closing_signed.go
index 7ecf96aa..4d3dd59f 100644
--- a/fuzz/lnwire/closing_signed.go
+++ b/fuzz/lnwire/closing_signed.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package lnwirefuzz
diff --git a/fuzz/lnwire/commit_sig.go b/fuzz/lnwire/commit_sig.go
index 7133f114..7dae9651 100644
--- a/fuzz/lnwire/commit_sig.go
+++ b/fuzz/lnwire/commit_sig.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package lnwirefuzz
diff --git a/fuzz/lnwire/error.go b/fuzz/lnwire/error.go
index 37481f07..f613606e 100644
--- a/fuzz/lnwire/error.go
+++ b/fuzz/lnwire/error.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package lnwirefuzz
diff --git a/fuzz/lnwire/funding_created.go b/fuzz/lnwire/funding_created.go
index bb37869c..a14b1083 100644
--- a/fuzz/lnwire/funding_created.go
+++ b/fuzz/lnwire/funding_created.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package lnwirefuzz
diff --git a/fuzz/lnwire/funding_locked.go b/fuzz/lnwire/funding_locked.go
index 1144225e..c5512f97 100644
--- a/fuzz/lnwire/funding_locked.go
+++ b/fuzz/lnwire/funding_locked.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package lnwirefuzz
diff --git a/fuzz/lnwire/funding_signed.go b/fuzz/lnwire/funding_signed.go
index f3a11cef..1af68add 100644
--- a/fuzz/lnwire/funding_signed.go
+++ b/fuzz/lnwire/funding_signed.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package lnwirefuzz
diff --git a/fuzz/lnwire/fuzz_utils.go b/fuzz/lnwire/fuzz_utils.go
index fda7517e..98ab50bc 100644
--- a/fuzz/lnwire/fuzz_utils.go
+++ b/fuzz/lnwire/fuzz_utils.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package lnwirefuzz
diff --git a/fuzz/lnwire/gossip_timestamp_range.go b/fuzz/lnwire/gossip_timestamp_range.go
index da56594c..5cfe8917 100644
--- a/fuzz/lnwire/gossip_timestamp_range.go
+++ b/fuzz/lnwire/gossip_timestamp_range.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package lnwirefuzz
diff --git a/fuzz/lnwire/init.go b/fuzz/lnwire/init.go
index 3f0c0c80..3a10fb67 100644
--- a/fuzz/lnwire/init.go
+++ b/fuzz/lnwire/init.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package lnwirefuzz
diff --git a/fuzz/lnwire/node_announcement.go b/fuzz/lnwire/node_announcement.go
index 8826e026..7f73c837 100644
--- a/fuzz/lnwire/node_announcement.go
+++ b/fuzz/lnwire/node_announcement.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package lnwirefuzz
diff --git a/fuzz/lnwire/open_channel.go b/fuzz/lnwire/open_channel.go
index 4942c5b6..c7ab024a 100644
--- a/fuzz/lnwire/open_channel.go
+++ b/fuzz/lnwire/open_channel.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package lnwirefuzz
diff --git a/fuzz/lnwire/ping.go b/fuzz/lnwire/ping.go
index 4cdb629e..2147dc8a 100644
--- a/fuzz/lnwire/ping.go
+++ b/fuzz/lnwire/ping.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package lnwirefuzz
diff --git a/fuzz/lnwire/pong.go b/fuzz/lnwire/pong.go
index 31df6ca3..bc8b1a17 100644
--- a/fuzz/lnwire/pong.go
+++ b/fuzz/lnwire/pong.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package lnwirefuzz
diff --git a/fuzz/lnwire/query_channel_range.go b/fuzz/lnwire/query_channel_range.go
index 87b69afb..c8bdbc2d 100644
--- a/fuzz/lnwire/query_channel_range.go
+++ b/fuzz/lnwire/query_channel_range.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package lnwirefuzz
diff --git a/fuzz/lnwire/query_short_chan_ids.go b/fuzz/lnwire/query_short_chan_ids.go
index 8830eea3..8d4e9936 100644
--- a/fuzz/lnwire/query_short_chan_ids.go
+++ b/fuzz/lnwire/query_short_chan_ids.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package lnwirefuzz
diff --git a/fuzz/lnwire/query_short_chan_ids_zlib.go b/fuzz/lnwire/query_short_chan_ids_zlib.go
index 2d257366..eaf1e1f7 100644
--- a/fuzz/lnwire/query_short_chan_ids_zlib.go
+++ b/fuzz/lnwire/query_short_chan_ids_zlib.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package lnwirefuzz
diff --git a/fuzz/lnwire/reply_channel_range.go b/fuzz/lnwire/reply_channel_range.go
index 8a2d7f13..e1611aa7 100644
--- a/fuzz/lnwire/reply_channel_range.go
+++ b/fuzz/lnwire/reply_channel_range.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package lnwirefuzz
diff --git a/fuzz/lnwire/reply_channel_range_zlib.go b/fuzz/lnwire/reply_channel_range_zlib.go
index af04efd5..fe251717 100644
--- a/fuzz/lnwire/reply_channel_range_zlib.go
+++ b/fuzz/lnwire/reply_channel_range_zlib.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package lnwirefuzz
diff --git a/fuzz/lnwire/reply_short_chan_ids_end.go b/fuzz/lnwire/reply_short_chan_ids_end.go
index 7e5c9657..b91f3b54 100644
--- a/fuzz/lnwire/reply_short_chan_ids_end.go
+++ b/fuzz/lnwire/reply_short_chan_ids_end.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package lnwirefuzz
diff --git a/fuzz/lnwire/revoke_and_ack.go b/fuzz/lnwire/revoke_and_ack.go
index bab5d118..276ba7c2 100644
--- a/fuzz/lnwire/revoke_and_ack.go
+++ b/fuzz/lnwire/revoke_and_ack.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package lnwirefuzz
diff --git a/fuzz/lnwire/shutdown.go b/fuzz/lnwire/shutdown.go
index 5e855b71..84e40cc7 100644
--- a/fuzz/lnwire/shutdown.go
+++ b/fuzz/lnwire/shutdown.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package lnwirefuzz
diff --git a/fuzz/lnwire/update_add_htlc.go b/fuzz/lnwire/update_add_htlc.go
index 2ea7b4af..3ec84ff9 100644
--- a/fuzz/lnwire/update_add_htlc.go
+++ b/fuzz/lnwire/update_add_htlc.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package lnwirefuzz
diff --git a/fuzz/lnwire/update_fail_htlc.go b/fuzz/lnwire/update_fail_htlc.go
index 33cd9b1f..77b4bac8 100644
--- a/fuzz/lnwire/update_fail_htlc.go
+++ b/fuzz/lnwire/update_fail_htlc.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package lnwirefuzz
diff --git a/fuzz/lnwire/update_fail_malformed_htlc.go b/fuzz/lnwire/update_fail_malformed_htlc.go
index d7dc9768..38ddfdf1 100644
--- a/fuzz/lnwire/update_fail_malformed_htlc.go
+++ b/fuzz/lnwire/update_fail_malformed_htlc.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package lnwirefuzz
diff --git a/fuzz/lnwire/update_fee.go b/fuzz/lnwire/update_fee.go
index cdb04568..228d12fd 100644
--- a/fuzz/lnwire/update_fee.go
+++ b/fuzz/lnwire/update_fee.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package lnwirefuzz
diff --git a/fuzz/lnwire/update_fulfill_htlc.go b/fuzz/lnwire/update_fulfill_htlc.go
index 6887cac8..241f37c7 100644
--- a/fuzz/lnwire/update_fulfill_htlc.go
+++ b/fuzz/lnwire/update_fulfill_htlc.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package lnwirefuzz
diff --git a/fuzz/wtwire/create_session.go b/fuzz/wtwire/create_session.go
index df521bf4..b2bd3e70 100644
--- a/fuzz/wtwire/create_session.go
+++ b/fuzz/wtwire/create_session.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package wtwirefuzz
diff --git a/fuzz/wtwire/create_session_reply.go b/fuzz/wtwire/create_session_reply.go
index a0e07f85..e862e3e3 100644
--- a/fuzz/wtwire/create_session_reply.go
+++ b/fuzz/wtwire/create_session_reply.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package wtwirefuzz
diff --git a/fuzz/wtwire/delete_session.go b/fuzz/wtwire/delete_session.go
index 2cb56225..cca27809 100644
--- a/fuzz/wtwire/delete_session.go
+++ b/fuzz/wtwire/delete_session.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package wtwirefuzz
diff --git a/fuzz/wtwire/delete_session_reply.go b/fuzz/wtwire/delete_session_reply.go
index 0f0360f1..ec890aa1 100644
--- a/fuzz/wtwire/delete_session_reply.go
+++ b/fuzz/wtwire/delete_session_reply.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package wtwirefuzz
diff --git a/fuzz/wtwire/error.go b/fuzz/wtwire/error.go
index f0f5fae2..7d73e1f3 100644
--- a/fuzz/wtwire/error.go
+++ b/fuzz/wtwire/error.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package wtwirefuzz
diff --git a/fuzz/wtwire/fuzz_utils.go b/fuzz/wtwire/fuzz_utils.go
index a62e4852..06a00a2d 100644
--- a/fuzz/wtwire/fuzz_utils.go
+++ b/fuzz/wtwire/fuzz_utils.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package wtwirefuzz
diff --git a/fuzz/wtwire/init.go b/fuzz/wtwire/init.go
index 31112b8f..ea157a64 100644
--- a/fuzz/wtwire/init.go
+++ b/fuzz/wtwire/init.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package wtwirefuzz
diff --git a/fuzz/wtwire/state_update.go b/fuzz/wtwire/state_update.go
index 5d13568e..82323e14 100644
--- a/fuzz/wtwire/state_update.go
+++ b/fuzz/wtwire/state_update.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package wtwirefuzz
diff --git a/fuzz/wtwire/state_update_reply.go b/fuzz/wtwire/state_update_reply.go
index fb7a3bbb..c645031d 100644
--- a/fuzz/wtwire/state_update_reply.go
+++ b/fuzz/wtwire/state_update_reply.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package wtwirefuzz
diff --git a/fuzz/zpay32/decode.go b/fuzz/zpay32/decode.go
index 0c1d1e5a..a5573e20 100644
--- a/fuzz/zpay32/decode.go
+++ b/fuzz/zpay32/decode.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package zpay32fuzz
diff --git a/fuzz/zpay32/encode.go b/fuzz/zpay32/encode.go
index 4734a578..ac289493 100644
--- a/fuzz/zpay32/encode.go
+++ b/fuzz/zpay32/encode.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package zpay32fuzz
diff --git a/healthcheck/diskcheck.go b/healthcheck/diskcheck.go
index 087fc7a7..ec2fa6a1 100644
--- a/healthcheck/diskcheck.go
+++ b/healthcheck/diskcheck.go
@@ -1,3 +1,4 @@
+//go:build !windows && !solaris && !netbsd && !openbsd && !js
 // +build !windows,!solaris,!netbsd,!openbsd,!js
 
 package healthcheck
diff --git a/htlcswitch/hodl/config_dev.go b/htlcswitch/hodl/config_dev.go
index ef8389ad..00eb6c8a 100644
--- a/htlcswitch/hodl/config_dev.go
+++ b/htlcswitch/hodl/config_dev.go
@@ -1,3 +1,4 @@
+//go:build dev
 // +build dev
 
 package hodl
diff --git a/htlcswitch/hodl/config_prod.go b/htlcswitch/hodl/config_prod.go
index c5e9e934..4dd1b230 100644
--- a/htlcswitch/hodl/config_prod.go
+++ b/htlcswitch/hodl/config_prod.go
@@ -1,3 +1,4 @@
+//go:build !dev
 // +build !dev
 
 package hodl
diff --git a/htlcswitch/hodl/mask_dev.go b/htlcswitch/hodl/mask_dev.go
index a1d50ff0..500f4248 100644
--- a/htlcswitch/hodl/mask_dev.go
+++ b/htlcswitch/hodl/mask_dev.go
@@ -1,3 +1,4 @@
+//go:build dev
 // +build dev
 
 package hodl
diff --git a/htlcswitch/hodl/mask_prod.go b/htlcswitch/hodl/mask_prod.go
index 1b8a4b70..a0d4bb56 100644
--- a/htlcswitch/hodl/mask_prod.go
+++ b/htlcswitch/hodl/mask_prod.go
@@ -1,3 +1,4 @@
+//go:build !dev
 // +build !dev
 
 package hodl
diff --git a/kvdb/backend.go b/kvdb/backend.go
index 9bf210c4..014260b2 100644
--- a/kvdb/backend.go
+++ b/kvdb/backend.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package kvdb
diff --git a/kvdb/bolt_compact.go b/kvdb/bolt_compact.go
index 66203ff9..7da51b3d 100644
--- a/kvdb/bolt_compact.go
+++ b/kvdb/bolt_compact.go
@@ -2,6 +2,7 @@
 // implemented in this file:
 // https://github.com/etcd-io/bbolt/blob/master/cmd/bbolt/main.go
 
+//go:build !js
 // +build !js
 
 package kvdb
diff --git a/kvdb/debug.go b/kvdb/debug.go
index 07874bea..c480954c 100644
--- a/kvdb/debug.go
+++ b/kvdb/debug.go
@@ -1,3 +1,4 @@
+//go:build dev
 // +build dev
 
 package kvdb
diff --git a/kvdb/etcd/bucket.go b/kvdb/etcd/bucket.go
index 514eab63..ed548db7 100644
--- a/kvdb/etcd/bucket.go
+++ b/kvdb/etcd/bucket.go
@@ -1,3 +1,4 @@
+//go:build kvdb_etcd
 // +build kvdb_etcd
 
 package etcd
diff --git a/kvdb/etcd/commit_queue.go b/kvdb/etcd/commit_queue.go
index 138c08e6..e1afb4a8 100644
--- a/kvdb/etcd/commit_queue.go
+++ b/kvdb/etcd/commit_queue.go
@@ -1,3 +1,4 @@
+//go:build kvdb_etcd
 // +build kvdb_etcd
 
 package etcd
diff --git a/kvdb/etcd/commit_queue_test.go b/kvdb/etcd/commit_queue_test.go
index a7ebcca2..900b08ca 100644
--- a/kvdb/etcd/commit_queue_test.go
+++ b/kvdb/etcd/commit_queue_test.go
@@ -1,3 +1,4 @@
+//go:build kvdb_etcd
 // +build kvdb_etcd
 
 package etcd
diff --git a/kvdb/etcd/db.go b/kvdb/etcd/db.go
index 49105643..315359ec 100644
--- a/kvdb/etcd/db.go
+++ b/kvdb/etcd/db.go
@@ -1,3 +1,4 @@
+//go:build kvdb_etcd
 // +build kvdb_etcd
 
 package etcd
diff --git a/kvdb/etcd/db_test.go b/kvdb/etcd/db_test.go
index ebb044f4..6f8f85b4 100644
--- a/kvdb/etcd/db_test.go
+++ b/kvdb/etcd/db_test.go
@@ -1,3 +1,4 @@
+//go:build kvdb_etcd
 // +build kvdb_etcd
 
 package etcd
diff --git a/kvdb/etcd/debug.go b/kvdb/etcd/debug.go
index 5b67b0bb..f76d3f93 100644
--- a/kvdb/etcd/debug.go
+++ b/kvdb/etcd/debug.go
@@ -1,3 +1,4 @@
+//go:build dev
 // +build dev
 
 package etcd
diff --git a/kvdb/etcd/driver.go b/kvdb/etcd/driver.go
index 39a9deb9..2642c134 100644
--- a/kvdb/etcd/driver.go
+++ b/kvdb/etcd/driver.go
@@ -1,3 +1,4 @@
+//go:build kvdb_etcd
 // +build kvdb_etcd
 
 package etcd
diff --git a/kvdb/etcd/driver_test.go b/kvdb/etcd/driver_test.go
index ea4196ef..bca3293d 100644
--- a/kvdb/etcd/driver_test.go
+++ b/kvdb/etcd/driver_test.go
@@ -1,3 +1,4 @@
+//go:build kvdb_etcd
 // +build kvdb_etcd
 
 package etcd
diff --git a/kvdb/etcd/embed.go b/kvdb/etcd/embed.go
index a4f96914..0df2f804 100644
--- a/kvdb/etcd/embed.go
+++ b/kvdb/etcd/embed.go
@@ -1,3 +1,4 @@
+//go:build kvdb_etcd
 // +build kvdb_etcd
 
 package etcd
diff --git a/kvdb/etcd/fixture.go b/kvdb/etcd/fixture.go
index 3a32ba09..4dde37cc 100644
--- a/kvdb/etcd/fixture.go
+++ b/kvdb/etcd/fixture.go
@@ -1,3 +1,4 @@
+//go:build kvdb_etcd
 // +build kvdb_etcd
 
 package etcd
diff --git a/kvdb/etcd/nodebug.go b/kvdb/etcd/nodebug.go
index 9494f8cc..1a9767a9 100644
--- a/kvdb/etcd/nodebug.go
+++ b/kvdb/etcd/nodebug.go
@@ -1,3 +1,4 @@
+//go:build !dev
 // +build !dev
 
 package etcd
diff --git a/kvdb/etcd/readwrite_bucket.go b/kvdb/etcd/readwrite_bucket.go
index 23162f85..79007433 100644
--- a/kvdb/etcd/readwrite_bucket.go
+++ b/kvdb/etcd/readwrite_bucket.go
@@ -1,3 +1,4 @@
+//go:build kvdb_etcd
 // +build kvdb_etcd
 
 package etcd
diff --git a/kvdb/etcd/readwrite_cursor.go b/kvdb/etcd/readwrite_cursor.go
index 123f2a5c..272e4813 100644
--- a/kvdb/etcd/readwrite_cursor.go
+++ b/kvdb/etcd/readwrite_cursor.go
@@ -1,3 +1,4 @@
+//go:build kvdb_etcd
 // +build kvdb_etcd
 
 package etcd
diff --git a/kvdb/etcd/readwrite_tx.go b/kvdb/etcd/readwrite_tx.go
index 8e580d5a..fcd1469b 100644
--- a/kvdb/etcd/readwrite_tx.go
+++ b/kvdb/etcd/readwrite_tx.go
@@ -1,3 +1,4 @@
+//go:build kvdb_etcd
 // +build kvdb_etcd
 
 package etcd
diff --git a/kvdb/etcd/readwrite_tx_test.go b/kvdb/etcd/readwrite_tx_test.go
index 7c0c296d..41f91669 100644
--- a/kvdb/etcd/readwrite_tx_test.go
+++ b/kvdb/etcd/readwrite_tx_test.go
@@ -1,3 +1,4 @@
+//go:build kvdb_etcd
 // +build kvdb_etcd
 
 package etcd
diff --git a/kvdb/etcd/stm.go b/kvdb/etcd/stm.go
index 7ef9776b..3a3d2023 100644
--- a/kvdb/etcd/stm.go
+++ b/kvdb/etcd/stm.go
@@ -1,3 +1,4 @@
+//go:build kvdb_etcd
 // +build kvdb_etcd
 
 package etcd
diff --git a/kvdb/etcd/stm_test.go b/kvdb/etcd/stm_test.go
index 5f311c8f..ee556335 100644
--- a/kvdb/etcd/stm_test.go
+++ b/kvdb/etcd/stm_test.go
@@ -1,3 +1,4 @@
+//go:build kvdb_etcd
 // +build kvdb_etcd
 
 package etcd
diff --git a/kvdb/etcd/walletdb_interface_test.go b/kvdb/etcd/walletdb_interface_test.go
index bdf2680d..c37a137f 100644
--- a/kvdb/etcd/walletdb_interface_test.go
+++ b/kvdb/etcd/walletdb_interface_test.go
@@ -1,3 +1,4 @@
+//go:build kvdb_etcd
 // +build kvdb_etcd
 
 package etcd
diff --git a/kvdb/etcd_test.go b/kvdb/etcd_test.go
index c5e40a9f..aae16531 100644
--- a/kvdb/etcd_test.go
+++ b/kvdb/etcd_test.go
@@ -1,3 +1,4 @@
+//go:build kvdb_etcd
 // +build kvdb_etcd
 
 package kvdb
diff --git a/kvdb/kvdb_etcd.go b/kvdb/kvdb_etcd.go
index 0637baf2..017388a3 100644
--- a/kvdb/kvdb_etcd.go
+++ b/kvdb/kvdb_etcd.go
@@ -1,3 +1,4 @@
+//go:build kvdb_etcd
 // +build kvdb_etcd
 
 package kvdb
diff --git a/kvdb/kvdb_no_etcd.go b/kvdb/kvdb_no_etcd.go
index 588fce37..ad56a377 100644
--- a/kvdb/kvdb_no_etcd.go
+++ b/kvdb/kvdb_no_etcd.go
@@ -1,3 +1,4 @@
+//go:build !kvdb_etcd
 // +build !kvdb_etcd
 
 package kvdb
diff --git a/kvdb/nodebug.go b/kvdb/nodebug.go
index 76225182..b29e34a5 100644
--- a/kvdb/nodebug.go
+++ b/kvdb/nodebug.go
@@ -1,3 +1,4 @@
+//go:build !dev
 // +build !dev
 
 package kvdb
diff --git a/lncfg/address_test.go b/lncfg/address_test.go
index 208b0407..009093e7 100644
--- a/lncfg/address_test.go
+++ b/lncfg/address_test.go
@@ -1,3 +1,4 @@
+//go:build !rpctest
 // +build !rpctest
 
 package lncfg
diff --git a/lncfg/monitoring_off.go b/lncfg/monitoring_off.go
index 5ee21a12..ad8375f9 100644
--- a/lncfg/monitoring_off.go
+++ b/lncfg/monitoring_off.go
@@ -1,3 +1,4 @@
+//go:build !monitoring
 // +build !monitoring
 
 package lncfg
diff --git a/lncfg/monitoring_on.go b/lncfg/monitoring_on.go
index dc31e51d..872b4633 100644
--- a/lncfg/monitoring_on.go
+++ b/lncfg/monitoring_on.go
@@ -1,3 +1,4 @@
+//go:build monitoring
 // +build monitoring
 
 package lncfg
diff --git a/lncfg/protocol.go b/lncfg/protocol.go
index afc12968..1c249117 100644
--- a/lncfg/protocol.go
+++ b/lncfg/protocol.go
@@ -1,3 +1,4 @@
+//go:build !rpctest
 // +build !rpctest
 
 package lncfg
diff --git a/lncfg/protocol_experimental_off.go b/lncfg/protocol_experimental_off.go
index a4f32c03..34143a22 100644
--- a/lncfg/protocol_experimental_off.go
+++ b/lncfg/protocol_experimental_off.go
@@ -1,3 +1,4 @@
+//go:build !dev
 // +build !dev
 
 package lncfg
diff --git a/lncfg/protocol_experimental_on.go b/lncfg/protocol_experimental_on.go
index d12fb982..b7d74acf 100644
--- a/lncfg/protocol_experimental_on.go
+++ b/lncfg/protocol_experimental_on.go
@@ -1,3 +1,4 @@
+//go:build dev
 // +build dev
 
 package lncfg
diff --git a/lncfg/protocol_legacy_off.go b/lncfg/protocol_legacy_off.go
index 060569d8..4dc0a814 100644
--- a/lncfg/protocol_legacy_off.go
+++ b/lncfg/protocol_legacy_off.go
@@ -1,3 +1,4 @@
+//go:build !dev
 // +build !dev
 
 package lncfg
diff --git a/lncfg/protocol_legacy_on.go b/lncfg/protocol_legacy_on.go
index 712d5fed..699f8941 100644
--- a/lncfg/protocol_legacy_on.go
+++ b/lncfg/protocol_legacy_on.go
@@ -1,3 +1,4 @@
+//go:build dev
 // +build dev
 
 package lncfg
diff --git a/lncfg/protocol_rpctest.go b/lncfg/protocol_rpctest.go
index 037aec77..910b9ed3 100644
--- a/lncfg/protocol_rpctest.go
+++ b/lncfg/protocol_rpctest.go
@@ -1,3 +1,4 @@
+//go:build rpctest
 // +build rpctest
 
 package lncfg
diff --git a/lnrpc/autopilotrpc/autopilot_server.go b/lnrpc/autopilotrpc/autopilot_server.go
index 215f14f8..ee8bbc64 100644
--- a/lnrpc/autopilotrpc/autopilot_server.go
+++ b/lnrpc/autopilotrpc/autopilot_server.go
@@ -1,3 +1,4 @@
+//go:build autopilotrpc
 // +build autopilotrpc
 
 package autopilotrpc
diff --git a/lnrpc/autopilotrpc/config_active.go b/lnrpc/autopilotrpc/config_active.go
index 93aca4f2..a80581b4 100644
--- a/lnrpc/autopilotrpc/config_active.go
+++ b/lnrpc/autopilotrpc/config_active.go
@@ -1,3 +1,4 @@
+//go:build autopilotrpc
 // +build autopilotrpc
 
 package autopilotrpc
diff --git a/lnrpc/autopilotrpc/config_default.go b/lnrpc/autopilotrpc/config_default.go
index 2d42ab51..efe532cd 100644
--- a/lnrpc/autopilotrpc/config_default.go
+++ b/lnrpc/autopilotrpc/config_default.go
@@ -1,3 +1,4 @@
+//go:build !autopilotrpc
 // +build !autopilotrpc
 
 package autopilotrpc
diff --git a/lnrpc/autopilotrpc/driver.go b/lnrpc/autopilotrpc/driver.go
index 8f849c3e..c62ecc1b 100644
--- a/lnrpc/autopilotrpc/driver.go
+++ b/lnrpc/autopilotrpc/driver.go
@@ -1,3 +1,4 @@
+//go:build autopilotrpc
 // +build autopilotrpc
 
 package autopilotrpc
diff --git a/lnrpc/chainrpc/chainnotifier_server.go b/lnrpc/chainrpc/chainnotifier_server.go
index 4f3f5d1c..56f6fb8f 100644
--- a/lnrpc/chainrpc/chainnotifier_server.go
+++ b/lnrpc/chainrpc/chainnotifier_server.go
@@ -1,3 +1,4 @@
+//go:build chainrpc
 // +build chainrpc
 
 package chainrpc
diff --git a/lnrpc/chainrpc/config_active.go b/lnrpc/chainrpc/config_active.go
index 0cc3a53d..636798c7 100644
--- a/lnrpc/chainrpc/config_active.go
+++ b/lnrpc/chainrpc/config_active.go
@@ -1,3 +1,4 @@
+//go:build chainrpc
 // +build chainrpc
 
 package chainrpc
diff --git a/lnrpc/chainrpc/config_default.go b/lnrpc/chainrpc/config_default.go
index 53bb97a1..678eb68b 100644
--- a/lnrpc/chainrpc/config_default.go
+++ b/lnrpc/chainrpc/config_default.go
@@ -1,3 +1,4 @@
+//go:build !chainrpc
 // +build !chainrpc
 
 package chainrpc
diff --git a/lnrpc/chainrpc/driver.go b/lnrpc/chainrpc/driver.go
index be307f82..c25ffbff 100644
--- a/lnrpc/chainrpc/driver.go
+++ b/lnrpc/chainrpc/driver.go
@@ -1,3 +1,4 @@
+//go:build chainrpc
 // +build chainrpc
 
 package chainrpc
diff --git a/lnrpc/invoicesrpc/config_active.go b/lnrpc/invoicesrpc/config_active.go
index 3246f4b7..01f595ab 100644
--- a/lnrpc/invoicesrpc/config_active.go
+++ b/lnrpc/invoicesrpc/config_active.go
@@ -1,3 +1,4 @@
+//go:build invoicesrpc
 // +build invoicesrpc
 
 package invoicesrpc
diff --git a/lnrpc/invoicesrpc/config_default.go b/lnrpc/invoicesrpc/config_default.go
index bb40c480..fad6aacb 100644
--- a/lnrpc/invoicesrpc/config_default.go
+++ b/lnrpc/invoicesrpc/config_default.go
@@ -1,3 +1,4 @@
+//go:build !invoicesrpc
 // +build !invoicesrpc
 
 package invoicesrpc
diff --git a/lnrpc/invoicesrpc/driver.go b/lnrpc/invoicesrpc/driver.go
index 5183c878..8014528e 100644
--- a/lnrpc/invoicesrpc/driver.go
+++ b/lnrpc/invoicesrpc/driver.go
@@ -1,3 +1,4 @@
+//go:build invoicesrpc
 // +build invoicesrpc
 
 package invoicesrpc
diff --git a/lnrpc/invoicesrpc/invoices_server.go b/lnrpc/invoicesrpc/invoices_server.go
index 947867af..4cd2758a 100644
--- a/lnrpc/invoicesrpc/invoices_server.go
+++ b/lnrpc/invoicesrpc/invoices_server.go
@@ -1,3 +1,4 @@
+//go:build invoicesrpc
 // +build invoicesrpc
 
 package invoicesrpc
diff --git a/lnrpc/signrpc/config_active.go b/lnrpc/signrpc/config_active.go
index c5ce25a9..b2db1696 100644
--- a/lnrpc/signrpc/config_active.go
+++ b/lnrpc/signrpc/config_active.go
@@ -1,3 +1,4 @@
+//go:build signrpc
 // +build signrpc
 
 package signrpc
diff --git a/lnrpc/signrpc/config_default.go b/lnrpc/signrpc/config_default.go
index 7698f19f..743e4147 100644
--- a/lnrpc/signrpc/config_default.go
+++ b/lnrpc/signrpc/config_default.go
@@ -1,3 +1,4 @@
+//go:build !signrpc
 // +build !signrpc
 
 package signrpc
diff --git a/lnrpc/signrpc/driver.go b/lnrpc/signrpc/driver.go
index cd130d5e..e000c563 100644
--- a/lnrpc/signrpc/driver.go
+++ b/lnrpc/signrpc/driver.go
@@ -1,3 +1,4 @@
+//go:build signrpc
 // +build signrpc
 
 package signrpc
diff --git a/lnrpc/signrpc/signer_server.go b/lnrpc/signrpc/signer_server.go
index 2eefdd48..a7da514b 100644
--- a/lnrpc/signrpc/signer_server.go
+++ b/lnrpc/signrpc/signer_server.go
@@ -1,3 +1,4 @@
+//go:build signrpc
 // +build signrpc
 
 package signrpc
diff --git a/lnrpc/walletrpc/config_active.go b/lnrpc/walletrpc/config_active.go
index 891553fd..806dbca4 100644
--- a/lnrpc/walletrpc/config_active.go
+++ b/lnrpc/walletrpc/config_active.go
@@ -1,3 +1,4 @@
+//go:build walletrpc
 // +build walletrpc
 
 package walletrpc
diff --git a/lnrpc/walletrpc/config_default.go b/lnrpc/walletrpc/config_default.go
index 9439ef84..2a423522 100644
--- a/lnrpc/walletrpc/config_default.go
+++ b/lnrpc/walletrpc/config_default.go
@@ -1,3 +1,4 @@
+//go:build !walletrpc
 // +build !walletrpc
 
 package walletrpc
diff --git a/lnrpc/walletrpc/driver.go b/lnrpc/walletrpc/driver.go
index d8547d8c..79972f7d 100644
--- a/lnrpc/walletrpc/driver.go
+++ b/lnrpc/walletrpc/driver.go
@@ -1,3 +1,4 @@
+//go:build walletrpc
 // +build walletrpc
 
 package walletrpc
diff --git a/lnrpc/walletrpc/psbt.go b/lnrpc/walletrpc/psbt.go
index 736b0402..40deedd0 100644
--- a/lnrpc/walletrpc/psbt.go
+++ b/lnrpc/walletrpc/psbt.go
@@ -1,3 +1,4 @@
+//go:build walletrpc
 // +build walletrpc
 
 package walletrpc
diff --git a/lnrpc/walletrpc/walletkit_server.go b/lnrpc/walletrpc/walletkit_server.go
index 487f2ab4..80a5b8e4 100644
--- a/lnrpc/walletrpc/walletkit_server.go
+++ b/lnrpc/walletrpc/walletkit_server.go
@@ -1,3 +1,4 @@
+//go:build walletrpc
 // +build walletrpc
 
 package walletrpc
diff --git a/lnrpc/watchtowerrpc/config_active.go b/lnrpc/watchtowerrpc/config_active.go
index 22381626..5d8ded7a 100644
--- a/lnrpc/watchtowerrpc/config_active.go
+++ b/lnrpc/watchtowerrpc/config_active.go
@@ -1,3 +1,4 @@
+//go:build watchtowerrpc
 // +build watchtowerrpc
 
 package watchtowerrpc
diff --git a/lnrpc/watchtowerrpc/config_default.go b/lnrpc/watchtowerrpc/config_default.go
index ac40e0bf..d7d50bf4 100644
--- a/lnrpc/watchtowerrpc/config_default.go
+++ b/lnrpc/watchtowerrpc/config_default.go
@@ -1,3 +1,4 @@
+//go:build !watchtowerrpc
 // +build !watchtowerrpc
 
 package watchtowerrpc
diff --git a/lnrpc/watchtowerrpc/driver.go b/lnrpc/watchtowerrpc/driver.go
index 3fa5f1d2..6352de7c 100644
--- a/lnrpc/watchtowerrpc/driver.go
+++ b/lnrpc/watchtowerrpc/driver.go
@@ -1,3 +1,4 @@
+//go:build watchtowerrpc
 // +build watchtowerrpc
 
 package watchtowerrpc
diff --git a/lnrpc/watchtowerrpc/handler.go b/lnrpc/watchtowerrpc/handler.go
index a9b60216..4aacea1b 100644
--- a/lnrpc/watchtowerrpc/handler.go
+++ b/lnrpc/watchtowerrpc/handler.go
@@ -1,3 +1,4 @@
+//go:build watchtowerrpc
 // +build watchtowerrpc
 
 package watchtowerrpc
diff --git a/lntest/bitcoind.go b/lntest/bitcoind.go
index e730b707..37ff5fb5 100644
--- a/lntest/bitcoind.go
+++ b/lntest/bitcoind.go
@@ -1,5 +1,5 @@
-// +build bitcoind
-// +build !notxindex
+//go:build bitcoind && !notxindex
+// +build bitcoind,!notxindex
 
 package lntest
 
diff --git a/lntest/bitcoind_common.go b/lntest/bitcoind_common.go
index 586c927d..9fc03756 100644
--- a/lntest/bitcoind_common.go
+++ b/lntest/bitcoind_common.go
@@ -1,3 +1,4 @@
+//go:build bitcoind
 // +build bitcoind
 
 package lntest
diff --git a/lntest/bitcoind_notxindex.go b/lntest/bitcoind_notxindex.go
index 1d565d8c..2aa7e4a6 100644
--- a/lntest/bitcoind_notxindex.go
+++ b/lntest/bitcoind_notxindex.go
@@ -1,5 +1,5 @@
-// +build bitcoind
-// +build notxindex
+//go:build bitcoind && notxindex
+// +build bitcoind,notxindex
 
 package lntest
 
diff --git a/lntest/btcd.go b/lntest/btcd.go
index 18ad01bb..fd8cacf7 100644
--- a/lntest/btcd.go
+++ b/lntest/btcd.go
@@ -1,3 +1,4 @@
+//go:build !bitcoind && !neutrino
 // +build !bitcoind,!neutrino
 
 package lntest
diff --git a/lntest/itest/lnd_etcd_failover_test.go b/lntest/itest/lnd_etcd_failover_test.go
index 14c15ab9..9d6caceb 100644
--- a/lntest/itest/lnd_etcd_failover_test.go
+++ b/lntest/itest/lnd_etcd_failover_test.go
@@ -1,3 +1,4 @@
+//go:build kvdb_etcd
 // +build kvdb_etcd
 
 package itest
diff --git a/lntest/itest/lnd_max_channel_size_test.go b/lntest/itest/lnd_max_channel_size_test.go
index f2612639..940e5f21 100644
--- a/lntest/itest/lnd_max_channel_size_test.go
+++ b/lntest/itest/lnd_max_channel_size_test.go
@@ -1,3 +1,4 @@
+//go:build rpctest
 // +build rpctest
 
 package itest
diff --git a/lntest/itest/lnd_no_etcd_dummy_failover_test.go b/lntest/itest/lnd_no_etcd_dummy_failover_test.go
index 25eb3214..c2a9a188 100644
--- a/lntest/itest/lnd_no_etcd_dummy_failover_test.go
+++ b/lntest/itest/lnd_no_etcd_dummy_failover_test.go
@@ -1,3 +1,4 @@
+//go:build !kvdb_etcd
 // +build !kvdb_etcd
 
 package itest
diff --git a/lntest/itest/lnd_test_list_off_test.go b/lntest/itest/lnd_test_list_off_test.go
index 59795f1d..bf21584f 100644
--- a/lntest/itest/lnd_test_list_off_test.go
+++ b/lntest/itest/lnd_test_list_off_test.go
@@ -1,3 +1,4 @@
+//go:build !rpctest
 // +build !rpctest
 
 package itest
diff --git a/lntest/itest/lnd_test_list_on_test.go b/lntest/itest/lnd_test_list_on_test.go
index a3acbcaf..df266cdc 100644
--- a/lntest/itest/lnd_test_list_on_test.go
+++ b/lntest/itest/lnd_test_list_on_test.go
@@ -1,3 +1,4 @@
+//go:build rpctest
 // +build rpctest
 
 package itest
diff --git a/lntest/neutrino.go b/lntest/neutrino.go
index f16b3e15..6c8f7098 100644
--- a/lntest/neutrino.go
+++ b/lntest/neutrino.go
@@ -1,3 +1,4 @@
+//go:build neutrino
 // +build neutrino
 
 package lntest
diff --git a/lntest/timeouts.go b/lntest/timeouts.go
index d4ca9555..6723050b 100644
--- a/lntest/timeouts.go
+++ b/lntest/timeouts.go
@@ -1,3 +1,4 @@
+//go:build !darwin && !kvdb_etcd && !kvdb_postgres
 // +build !darwin,!kvdb_etcd,!kvdb_postgres
 
 package lntest
diff --git a/lntest/timeouts_darwin.go b/lntest/timeouts_darwin.go
index 1382bc2f..b07559b3 100644
--- a/lntest/timeouts_darwin.go
+++ b/lntest/timeouts_darwin.go
@@ -1,3 +1,4 @@
+//go:build darwin && !kvdb_etcd && !kvdb_postgres
 // +build darwin,!kvdb_etcd,!kvdb_postgres
 
 package lntest
diff --git a/lntest/timeouts_remote_db.go b/lntest/timeouts_remote_db.go
index c0c16cbc..a9d6977d 100644
--- a/lntest/timeouts_remote_db.go
+++ b/lntest/timeouts_remote_db.go
@@ -1,3 +1,4 @@
+//go:build kvdb_etcd || kvdb_postgres
 // +build kvdb_etcd kvdb_postgres
 
 package lntest
diff --git a/lnwallet/btcwallet/btcwallet_rpctest.go b/lnwallet/btcwallet/btcwallet_rpctest.go
index 28dd35a7..938aef30 100644
--- a/lnwallet/btcwallet/btcwallet_rpctest.go
+++ b/lnwallet/btcwallet/btcwallet_rpctest.go
@@ -1,3 +1,4 @@
+//go:build rpctest || lowscrypt
 // +build rpctest lowscrypt
 
 package btcwallet
diff --git a/lnwallet/revocation_producer.go b/lnwallet/revocation_producer.go
index 6f8c56c5..fc8bde0f 100644
--- a/lnwallet/revocation_producer.go
+++ b/lnwallet/revocation_producer.go
@@ -1,3 +1,4 @@
+//go:build !rpctest
 // +build !rpctest
 
 package lnwallet
diff --git a/lnwallet/revocation_producer_itest.go b/lnwallet/revocation_producer_itest.go
index 6ef89119..853a8776 100644
--- a/lnwallet/revocation_producer_itest.go
+++ b/lnwallet/revocation_producer_itest.go
@@ -1,3 +1,4 @@
+//go:build rpctest
 // +build rpctest
 
 package lnwallet
diff --git a/macaroons/security.go b/macaroons/security.go
index 814b0d25..cdc409b3 100644
--- a/macaroons/security.go
+++ b/macaroons/security.go
@@ -1,3 +1,4 @@
+//go:build !rpctest
 // +build !rpctest
 
 package macaroons
diff --git a/macaroons/security_rpctest.go b/macaroons/security_rpctest.go
index d49819e0..83792c38 100644
--- a/macaroons/security_rpctest.go
+++ b/macaroons/security_rpctest.go
@@ -1,3 +1,4 @@
+//go:build rpctest
 // +build rpctest
 
 package macaroons
diff --git a/mobile/bindings.go b/mobile/bindings.go
index 58cf2a0e..ca841d79 100644
--- a/mobile/bindings.go
+++ b/mobile/bindings.go
@@ -1,3 +1,4 @@
+//go:build mobile
 // +build mobile
 
 package lndmobile
diff --git a/monitoring/monitoring_off.go b/monitoring/monitoring_off.go
index f3a79219..8e2a1c2b 100644
--- a/monitoring/monitoring_off.go
+++ b/monitoring/monitoring_off.go
@@ -1,3 +1,4 @@
+//go:build !monitoring
 // +build !monitoring
 
 package monitoring
diff --git a/monitoring/monitoring_on.go b/monitoring/monitoring_on.go
index 8f10bec4..78a0f7e2 100644
--- a/monitoring/monitoring_on.go
+++ b/monitoring/monitoring_on.go
@@ -1,3 +1,4 @@
+//go:build monitoring
 // +build monitoring
 
 package monitoring
diff --git a/server_test.go b/server_test.go
index 7bcecbc0..48b2f652 100644
--- a/server_test.go
+++ b/server_test.go
@@ -1,3 +1,4 @@
+//go:build !rpctest
 // +build !rpctest
 
 package lnd
diff --git a/sweep/defaults.go b/sweep/defaults.go
index d9b5c923..def74a3a 100644
--- a/sweep/defaults.go
+++ b/sweep/defaults.go
@@ -1,3 +1,4 @@
+//go:build !rpctest
 // +build !rpctest
 
 package sweep
diff --git a/sweep/defaults_rpctest.go b/sweep/defaults_rpctest.go
index 0d185e74..24789de0 100644
--- a/sweep/defaults_rpctest.go
+++ b/sweep/defaults_rpctest.go
@@ -1,3 +1,4 @@
+//go:build rpctest
 // +build rpctest
 
 package sweep
diff --git a/tools.go b/tools.go
index d3ff69b0..fad50c7e 100644
--- a/tools.go
+++ b/tools.go
@@ -1,3 +1,4 @@
+//go:build tools
 // +build tools
 
 package lnd