diff --git a/beacon-chain/blockchain/chain_info_norace_test.go b/beacon-chain/blockchain/chain_info_norace_test.go
index 2448100675..4ab3ecd9b6 100644
--- a/beacon-chain/blockchain/chain_info_norace_test.go
+++ b/beacon-chain/blockchain/chain_info_norace_test.go
@@ -16,10 +16,13 @@ func TestHeadSlot_DataRace(t *testing.T) {
 	s := &Service{
 		cfg: &config{BeaconDB: beaconDB},
 	}
+	wait := make(chan struct{})
 	go func() {
+		defer close(wait)
 		require.NoError(t, s.saveHead(context.Background(), [32]byte{}))
 	}()
 	s.HeadSlot()
+	<-wait
 }
 
 func TestHeadRoot_DataRace(t *testing.T) {
@@ -28,11 +31,14 @@ func TestHeadRoot_DataRace(t *testing.T) {
 		cfg:  &config{BeaconDB: beaconDB, StateGen: stategen.New(beaconDB)},
 		head: &head{root: [32]byte{'A'}},
 	}
+	wait := make(chan struct{})
 	go func() {
+		defer close(wait)
 		require.NoError(t, s.saveHead(context.Background(), [32]byte{}))
 	}()
 	_, err := s.HeadRoot(context.Background())
 	require.NoError(t, err)
+	<-wait
 }
 
 func TestHeadBlock_DataRace(t *testing.T) {
@@ -41,11 +47,14 @@ func TestHeadBlock_DataRace(t *testing.T) {
 		cfg:  &config{BeaconDB: beaconDB, StateGen: stategen.New(beaconDB)},
 		head: &head{block: wrapper.WrappedPhase0SignedBeaconBlock(&ethpb.SignedBeaconBlock{})},
 	}
+	wait := make(chan struct{})
 	go func() {
+		defer close(wait)
 		require.NoError(t, s.saveHead(context.Background(), [32]byte{}))
 	}()
 	_, err := s.HeadBlock(context.Background())
 	require.NoError(t, err)
+	<-wait
 }
 
 func TestHeadState_DataRace(t *testing.T) {
@@ -53,9 +62,12 @@ func TestHeadState_DataRace(t *testing.T) {
 	s := &Service{
 		cfg: &config{BeaconDB: beaconDB, StateGen: stategen.New(beaconDB)},
 	}
+	wait := make(chan struct{})
 	go func() {
+		defer close(wait)
 		require.NoError(t, s.saveHead(context.Background(), [32]byte{}))
 	}()
 	_, err := s.HeadState(context.Background())
 	require.NoError(t, err)
+	<-wait
 }
diff --git a/beacon-chain/blockchain/checktags_test.go b/beacon-chain/blockchain/checktags_test.go
index b6565cb4c2..a0b7cc0746 100644
--- a/beacon-chain/blockchain/checktags_test.go
+++ b/beacon-chain/blockchain/checktags_test.go
@@ -1,3 +1,4 @@
+//go:build !develop
 // +build !develop
 
 package blockchain
diff --git a/beacon-chain/cache/active_balance_disabled.go b/beacon-chain/cache/active_balance_disabled.go
index 1014080bca..864504a8ed 100644
--- a/beacon-chain/cache/active_balance_disabled.go
+++ b/beacon-chain/cache/active_balance_disabled.go
@@ -1,3 +1,4 @@
+//go:build fuzz
 // +build fuzz
 
 package cache
diff --git a/beacon-chain/cache/committee_disabled.go b/beacon-chain/cache/committee_disabled.go
index a003d34554..814d8202f4 100644
--- a/beacon-chain/cache/committee_disabled.go
+++ b/beacon-chain/cache/committee_disabled.go
@@ -1,3 +1,4 @@
+//go:build fuzz
 // +build fuzz
 
 // This file is used in fuzzer builds to bypass global committee caches.
diff --git a/beacon-chain/cache/proposer_indices.go b/beacon-chain/cache/proposer_indices.go
index 44089b76a5..a14d12ccd3 100644
--- a/beacon-chain/cache/proposer_indices.go
+++ b/beacon-chain/cache/proposer_indices.go
@@ -1,3 +1,4 @@
+//go:build !fuzz
 // +build !fuzz
 
 package cache
diff --git a/beacon-chain/cache/proposer_indices_disabled.go b/beacon-chain/cache/proposer_indices_disabled.go
index 2ae1418e52..75a3780de0 100644
--- a/beacon-chain/cache/proposer_indices_disabled.go
+++ b/beacon-chain/cache/proposer_indices_disabled.go
@@ -1,3 +1,4 @@
+//go:build fuzz
 // +build fuzz
 
 // This file is used in fuzzer builds to bypass proposer indices caches.
diff --git a/beacon-chain/cache/sync_committee.go b/beacon-chain/cache/sync_committee.go
index e00f29fa62..7d9554885c 100644
--- a/beacon-chain/cache/sync_committee.go
+++ b/beacon-chain/cache/sync_committee.go
@@ -1,3 +1,4 @@
+//go:build !fuzz
 // +build !fuzz
 
 package cache
diff --git a/beacon-chain/cache/sync_committee_disabled.go b/beacon-chain/cache/sync_committee_disabled.go
index 2632e057eb..90be10157f 100644
--- a/beacon-chain/cache/sync_committee_disabled.go
+++ b/beacon-chain/cache/sync_committee_disabled.go
@@ -1,3 +1,4 @@
+//go:build fuzz
 // +build fuzz
 
 package cache
diff --git a/beacon-chain/state/state-native/v1/beacon_state_mainnet.go b/beacon-chain/state/state-native/v1/beacon_state_mainnet.go
index ef2b2bc2a4..21dfc005d7 100644
--- a/beacon-chain/state/state-native/v1/beacon_state_mainnet.go
+++ b/beacon-chain/state/state-native/v1/beacon_state_mainnet.go
@@ -1,3 +1,4 @@
+//go:build !minimal
 // +build !minimal
 
 package v1
diff --git a/beacon-chain/state/state-native/v1/beacon_state_mainnet_test.go b/beacon-chain/state/state-native/v1/beacon_state_mainnet_test.go
index a273b3637e..3644a61820 100644
--- a/beacon-chain/state/state-native/v1/beacon_state_mainnet_test.go
+++ b/beacon-chain/state/state-native/v1/beacon_state_mainnet_test.go
@@ -1,3 +1,4 @@
+//go:build !minimal
 // +build !minimal
 
 package v1
diff --git a/beacon-chain/state/state-native/v1/beacon_state_minimal.go b/beacon-chain/state/state-native/v1/beacon_state_minimal.go
index f2e95b11aa..38d4a9feaa 100644
--- a/beacon-chain/state/state-native/v1/beacon_state_minimal.go
+++ b/beacon-chain/state/state-native/v1/beacon_state_minimal.go
@@ -1,3 +1,4 @@
+//go:build minimal
 // +build minimal
 
 package v1
diff --git a/beacon-chain/state/state-native/v1/beacon_state_minimal_test.go b/beacon-chain/state/state-native/v1/beacon_state_minimal_test.go
index 24ca41fac4..76dd691da0 100644
--- a/beacon-chain/state/state-native/v1/beacon_state_minimal_test.go
+++ b/beacon-chain/state/state-native/v1/beacon_state_minimal_test.go
@@ -1,3 +1,4 @@
+//go:build minimal
 // +build minimal
 
 package v1
diff --git a/beacon-chain/state/state-native/v2/beacon_state_mainnet.go b/beacon-chain/state/state-native/v2/beacon_state_mainnet.go
index ee49eb460f..b8e4cfb1ec 100644
--- a/beacon-chain/state/state-native/v2/beacon_state_mainnet.go
+++ b/beacon-chain/state/state-native/v2/beacon_state_mainnet.go
@@ -1,3 +1,4 @@
+//go:build !minimal
 // +build !minimal
 
 package v2
diff --git a/beacon-chain/state/state-native/v2/beacon_state_mainnet_test.go b/beacon-chain/state/state-native/v2/beacon_state_mainnet_test.go
index eacc86f446..fd80e5c034 100644
--- a/beacon-chain/state/state-native/v2/beacon_state_mainnet_test.go
+++ b/beacon-chain/state/state-native/v2/beacon_state_mainnet_test.go
@@ -1,3 +1,4 @@
+//go:build !minimal
 // +build !minimal
 
 package v2
diff --git a/beacon-chain/state/state-native/v2/beacon_state_minimal.go b/beacon-chain/state/state-native/v2/beacon_state_minimal.go
index 0199a607e1..f528df95e7 100644
--- a/beacon-chain/state/state-native/v2/beacon_state_minimal.go
+++ b/beacon-chain/state/state-native/v2/beacon_state_minimal.go
@@ -1,3 +1,4 @@
+//go:build minimal
 // +build minimal
 
 package v2
diff --git a/beacon-chain/state/state-native/v2/beacon_state_minimal_test.go b/beacon-chain/state/state-native/v2/beacon_state_minimal_test.go
index aa5b29e283..e2bf3c4a47 100644
--- a/beacon-chain/state/state-native/v2/beacon_state_minimal_test.go
+++ b/beacon-chain/state/state-native/v2/beacon_state_minimal_test.go
@@ -1,3 +1,4 @@
+//go:build minimal
 // +build minimal
 
 package v2
diff --git a/beacon-chain/state/state-native/v3/beacon_state_mainnet.go b/beacon-chain/state/state-native/v3/beacon_state_mainnet.go
index 72e1e6ae01..9619f50b59 100644
--- a/beacon-chain/state/state-native/v3/beacon_state_mainnet.go
+++ b/beacon-chain/state/state-native/v3/beacon_state_mainnet.go
@@ -1,3 +1,4 @@
+//go:build !minimal
 // +build !minimal
 
 package v3
diff --git a/beacon-chain/state/state-native/v3/beacon_state_mainnet_test.go b/beacon-chain/state/state-native/v3/beacon_state_mainnet_test.go
index 0782711013..18599f9ca9 100644
--- a/beacon-chain/state/state-native/v3/beacon_state_mainnet_test.go
+++ b/beacon-chain/state/state-native/v3/beacon_state_mainnet_test.go
@@ -1,3 +1,4 @@
+//go:build !minimal
 // +build !minimal
 
 package v3
diff --git a/beacon-chain/state/state-native/v3/beacon_state_minimal.go b/beacon-chain/state/state-native/v3/beacon_state_minimal.go
index 4fbcb66d2e..34e9e888f1 100644
--- a/beacon-chain/state/state-native/v3/beacon_state_minimal.go
+++ b/beacon-chain/state/state-native/v3/beacon_state_minimal.go
@@ -1,3 +1,4 @@
+//go:build minimal
 // +build minimal
 
 package v3
diff --git a/beacon-chain/state/state-native/v3/beacon_state_minimal_test.go b/beacon-chain/state/state-native/v3/beacon_state_minimal_test.go
index f5edba5eea..bd74072d69 100644
--- a/beacon-chain/state/state-native/v3/beacon_state_minimal_test.go
+++ b/beacon-chain/state/state-native/v3/beacon_state_minimal_test.go
@@ -1,3 +1,4 @@
+//go:build minimal
 // +build minimal
 
 package v3
diff --git a/config/fieldparams/mainnet.go b/config/fieldparams/mainnet.go
index 0119827d56..fa30abb1c4 100644
--- a/config/fieldparams/mainnet.go
+++ b/config/fieldparams/mainnet.go
@@ -1,3 +1,4 @@
+//go:build !minimal
 // +build !minimal
 
 package field_params
diff --git a/config/fieldparams/mainnet_test.go b/config/fieldparams/mainnet_test.go
index dce9d03789..899d8d0b4c 100644
--- a/config/fieldparams/mainnet_test.go
+++ b/config/fieldparams/mainnet_test.go
@@ -1,3 +1,4 @@
+//go:build !minimal
 // +build !minimal
 
 package field_params_test
diff --git a/config/fieldparams/minimal.go b/config/fieldparams/minimal.go
index 12d78abfff..e45f050c01 100644
--- a/config/fieldparams/minimal.go
+++ b/config/fieldparams/minimal.go
@@ -1,3 +1,4 @@
+//go:build minimal
 // +build minimal
 
 package field_params
diff --git a/config/fieldparams/minimal_test.go b/config/fieldparams/minimal_test.go
index 0b46bab1f8..b2e5096d75 100644
--- a/config/fieldparams/minimal_test.go
+++ b/config/fieldparams/minimal_test.go
@@ -1,3 +1,4 @@
+//go:build minimal
 // +build minimal
 
 package field_params_test
diff --git a/config/params/checktags_test.go b/config/params/checktags_test.go
index ab04c005c5..9043f06cd0 100644
--- a/config/params/checktags_test.go
+++ b/config/params/checktags_test.go
@@ -1,3 +1,4 @@
+//go:build !develop
 // +build !develop
 
 package params_test
diff --git a/config/params/config_utils_develop.go b/config/params/config_utils_develop.go
index 793c75632e..0ebe0637a6 100644
--- a/config/params/config_utils_develop.go
+++ b/config/params/config_utils_develop.go
@@ -1,3 +1,4 @@
+//go:build develop
 // +build develop
 
 package params
diff --git a/config/params/config_utils_prod.go b/config/params/config_utils_prod.go
index b0e91fde66..c6df6f26ed 100644
--- a/config/params/config_utils_prod.go
+++ b/config/params/config_utils_prod.go
@@ -1,3 +1,4 @@
+//go:build !develop
 // +build !develop
 
 package params
diff --git a/crypto/bls/blst/aliases.go b/crypto/bls/blst/aliases.go
index 48f664ab6e..08ae6bbf58 100644
--- a/crypto/bls/blst/aliases.go
+++ b/crypto/bls/blst/aliases.go
@@ -1,3 +1,4 @@
+//go:build ((linux && amd64) || (linux && arm64) || (darwin && amd64) || (darwin && arm64) || (windows && amd64)) && !blst_disabled
 // +build linux,amd64 linux,arm64 darwin,amd64 darwin,arm64 windows,amd64
 // +build !blst_disabled
 
diff --git a/crypto/bls/blst/bls_benchmark_test.go b/crypto/bls/blst/bls_benchmark_test.go
index ecd54c675c..ca44e42d2a 100644
--- a/crypto/bls/blst/bls_benchmark_test.go
+++ b/crypto/bls/blst/bls_benchmark_test.go
@@ -1,3 +1,4 @@
+//go:build ((linux && amd64) || (linux && arm64) || (darwin && amd64) || (darwin && arm64) || (windows && amd64)) && !blst_disabled
 // +build linux,amd64 linux,arm64 darwin,amd64 darwin,arm64 windows,amd64
 // +build !blst_disabled
 
diff --git a/crypto/bls/blst/init.go b/crypto/bls/blst/init.go
index b283647ac8..24b9752b1a 100644
--- a/crypto/bls/blst/init.go
+++ b/crypto/bls/blst/init.go
@@ -1,3 +1,4 @@
+//go:build ((linux && amd64) || (linux && arm64) || (darwin && amd64) || (darwin && arm64) || (windows && amd64)) && !blst_disabled
 // +build linux,amd64 linux,arm64 darwin,amd64 darwin,arm64 windows,amd64
 // +build !blst_disabled
 
diff --git a/crypto/bls/blst/public_key.go b/crypto/bls/blst/public_key.go
index 95119a6d5e..b594aefab3 100644
--- a/crypto/bls/blst/public_key.go
+++ b/crypto/bls/blst/public_key.go
@@ -1,3 +1,4 @@
+//go:build ((linux && amd64) || (linux && arm64) || (darwin && amd64) || (darwin && arm64) || (windows && amd64)) && !blst_disabled
 // +build linux,amd64 linux,arm64 darwin,amd64 darwin,arm64 windows,amd64
 // +build !blst_disabled
 
diff --git a/crypto/bls/blst/public_key_test.go b/crypto/bls/blst/public_key_test.go
index 6bf0ad1fb6..0c9657c94c 100644
--- a/crypto/bls/blst/public_key_test.go
+++ b/crypto/bls/blst/public_key_test.go
@@ -1,3 +1,4 @@
+//go:build ((linux && amd64) || (linux && arm64) || (darwin && amd64) || (darwin && arm64) || (windows && amd64)) && !blst_disabled
 // +build linux,amd64 linux,arm64 darwin,amd64 darwin,arm64 windows,amd64
 // +build !blst_disabled
 
diff --git a/crypto/bls/blst/secret_key.go b/crypto/bls/blst/secret_key.go
index a1d2fb5287..f00f97214e 100644
--- a/crypto/bls/blst/secret_key.go
+++ b/crypto/bls/blst/secret_key.go
@@ -1,3 +1,4 @@
+//go:build ((linux && amd64) || (linux && arm64) || (darwin && amd64) || (darwin && arm64) || (windows && amd64)) && !blst_disabled
 // +build linux,amd64 linux,arm64 darwin,amd64 darwin,arm64 windows,amd64
 // +build !blst_disabled
 
diff --git a/crypto/bls/blst/secret_key_test.go b/crypto/bls/blst/secret_key_test.go
index 1eb2c2c2a2..854baa3ddb 100644
--- a/crypto/bls/blst/secret_key_test.go
+++ b/crypto/bls/blst/secret_key_test.go
@@ -1,3 +1,4 @@
+//go:build ((linux && amd64) || (linux && arm64) || (darwin && amd64) || (darwin && arm64) || (windows && amd64)) && !blst_disabled
 // +build linux,amd64 linux,arm64 darwin,amd64 darwin,arm64 windows,amd64
 // +build !blst_disabled
 
diff --git a/crypto/bls/blst/signature.go b/crypto/bls/blst/signature.go
index 942228e97f..93380f7c93 100644
--- a/crypto/bls/blst/signature.go
+++ b/crypto/bls/blst/signature.go
@@ -1,3 +1,4 @@
+//go:build ((linux && amd64) || (linux && arm64) || (darwin && amd64) || (darwin && arm64) || (windows && amd64)) && !blst_disabled
 // +build linux,amd64 linux,arm64 darwin,amd64 darwin,arm64 windows,amd64
 // +build !blst_disabled
 
diff --git a/crypto/bls/blst/signature_test.go b/crypto/bls/blst/signature_test.go
index 49757be70a..4bf3a8a1ab 100644
--- a/crypto/bls/blst/signature_test.go
+++ b/crypto/bls/blst/signature_test.go
@@ -1,3 +1,4 @@
+//go:build ((linux && amd64) || (linux && arm64) || (darwin && amd64) || (darwin && arm64) || (windows && amd64)) && !blst_disabled
 // +build linux,amd64 linux,arm64 darwin,amd64 darwin,arm64 windows,amd64
 // +build !blst_disabled
 
diff --git a/crypto/bls/blst/stub.go b/crypto/bls/blst/stub.go
index 69336bf62e..818f1fbb41 100644
--- a/crypto/bls/blst/stub.go
+++ b/crypto/bls/blst/stub.go
@@ -1,4 +1,5 @@
-// +build  blst_disabled fuzz
+//go:build blst_disabled || fuzz
+// +build blst_disabled fuzz
 
 package blst
 
diff --git a/monitoring/journald/journald.go b/monitoring/journald/journald.go
index cddf6ed6ee..01746fc289 100644
--- a/monitoring/journald/journald.go
+++ b/monitoring/journald/journald.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package journald
diff --git a/monitoring/journald/journald_linux.go b/monitoring/journald/journald_linux.go
index 680a87ae41..0b923635d7 100644
--- a/monitoring/journald/journald_linux.go
+++ b/monitoring/journald/journald_linux.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package journald
diff --git a/proto/eth/v1/attestation.pb.gw.go b/proto/eth/v1/attestation.pb.gw.go
index 33d2475db2..cdd03643f0 100755
--- a/proto/eth/v1/attestation.pb.gw.go
+++ b/proto/eth/v1/attestation.pb.gw.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package ignore
diff --git a/proto/eth/v1/beacon_block.pb.gw.go b/proto/eth/v1/beacon_block.pb.gw.go
index 33d2475db2..cdd03643f0 100755
--- a/proto/eth/v1/beacon_block.pb.gw.go
+++ b/proto/eth/v1/beacon_block.pb.gw.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package ignore
diff --git a/proto/eth/v1/beacon_chain.pb.gw.go b/proto/eth/v1/beacon_chain.pb.gw.go
index 33d2475db2..cdd03643f0 100755
--- a/proto/eth/v1/beacon_chain.pb.gw.go
+++ b/proto/eth/v1/beacon_chain.pb.gw.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package ignore
diff --git a/proto/eth/v1/beacon_state.pb.gw.go b/proto/eth/v1/beacon_state.pb.gw.go
index 33d2475db2..cdd03643f0 100755
--- a/proto/eth/v1/beacon_state.pb.gw.go
+++ b/proto/eth/v1/beacon_state.pb.gw.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package ignore
diff --git a/proto/eth/v1/events.pb.gw.go b/proto/eth/v1/events.pb.gw.go
index 33d2475db2..cdd03643f0 100755
--- a/proto/eth/v1/events.pb.gw.go
+++ b/proto/eth/v1/events.pb.gw.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package ignore
diff --git a/proto/eth/v1/node.pb.gw.go b/proto/eth/v1/node.pb.gw.go
index 33d2475db2..cdd03643f0 100755
--- a/proto/eth/v1/node.pb.gw.go
+++ b/proto/eth/v1/node.pb.gw.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package ignore
diff --git a/proto/eth/v1/validator.pb.gw.go b/proto/eth/v1/validator.pb.gw.go
index 33d2475db2..cdd03643f0 100755
--- a/proto/eth/v1/validator.pb.gw.go
+++ b/proto/eth/v1/validator.pb.gw.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package ignore
diff --git a/proto/eth/v2/beacon_block.pb.gw.go b/proto/eth/v2/beacon_block.pb.gw.go
index 33d2475db2..cdd03643f0 100755
--- a/proto/eth/v2/beacon_block.pb.gw.go
+++ b/proto/eth/v2/beacon_block.pb.gw.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package ignore
diff --git a/proto/eth/v2/beacon_state.pb.gw.go b/proto/eth/v2/beacon_state.pb.gw.go
index 33d2475db2..cdd03643f0 100755
--- a/proto/eth/v2/beacon_state.pb.gw.go
+++ b/proto/eth/v2/beacon_state.pb.gw.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package ignore
diff --git a/proto/eth/v2/sync_committee.pb.gw.go b/proto/eth/v2/sync_committee.pb.gw.go
index 33d2475db2..cdd03643f0 100755
--- a/proto/eth/v2/sync_committee.pb.gw.go
+++ b/proto/eth/v2/sync_committee.pb.gw.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package ignore
diff --git a/proto/eth/v2/validator.pb.gw.go b/proto/eth/v2/validator.pb.gw.go
index 33d2475db2..cdd03643f0 100755
--- a/proto/eth/v2/validator.pb.gw.go
+++ b/proto/eth/v2/validator.pb.gw.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package ignore
diff --git a/proto/eth/v2/version.pb.gw.go b/proto/eth/v2/version.pb.gw.go
index 33d2475db2..cdd03643f0 100755
--- a/proto/eth/v2/version.pb.gw.go
+++ b/proto/eth/v2/version.pb.gw.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package ignore
diff --git a/proto/prysm/v1alpha1/attestation.pb.gw.go b/proto/prysm/v1alpha1/attestation.pb.gw.go
index 33d2475db2..cdd03643f0 100755
--- a/proto/prysm/v1alpha1/attestation.pb.gw.go
+++ b/proto/prysm/v1alpha1/attestation.pb.gw.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package ignore
diff --git a/proto/prysm/v1alpha1/beacon_block.pb.gw.go b/proto/prysm/v1alpha1/beacon_block.pb.gw.go
index 33d2475db2..cdd03643f0 100755
--- a/proto/prysm/v1alpha1/beacon_block.pb.gw.go
+++ b/proto/prysm/v1alpha1/beacon_block.pb.gw.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package ignore
diff --git a/proto/prysm/v1alpha1/beacon_state.pb.gw.go b/proto/prysm/v1alpha1/beacon_state.pb.gw.go
index 33d2475db2..cdd03643f0 100755
--- a/proto/prysm/v1alpha1/beacon_state.pb.gw.go
+++ b/proto/prysm/v1alpha1/beacon_state.pb.gw.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package ignore
diff --git a/proto/prysm/v1alpha1/finalized_block_root_container.pb.gw.go b/proto/prysm/v1alpha1/finalized_block_root_container.pb.gw.go
index 33d2475db2..cdd03643f0 100755
--- a/proto/prysm/v1alpha1/finalized_block_root_container.pb.gw.go
+++ b/proto/prysm/v1alpha1/finalized_block_root_container.pb.gw.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package ignore
diff --git a/proto/prysm/v1alpha1/p2p_messages.pb.gw.go b/proto/prysm/v1alpha1/p2p_messages.pb.gw.go
index 33d2475db2..cdd03643f0 100755
--- a/proto/prysm/v1alpha1/p2p_messages.pb.gw.go
+++ b/proto/prysm/v1alpha1/p2p_messages.pb.gw.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package ignore
diff --git a/proto/prysm/v1alpha1/powchain.pb.gw.go b/proto/prysm/v1alpha1/powchain.pb.gw.go
index 33d2475db2..cdd03643f0 100755
--- a/proto/prysm/v1alpha1/powchain.pb.gw.go
+++ b/proto/prysm/v1alpha1/powchain.pb.gw.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package ignore
diff --git a/proto/prysm/v1alpha1/sync_committee.pb.gw.go b/proto/prysm/v1alpha1/sync_committee.pb.gw.go
index 33d2475db2..cdd03643f0 100755
--- a/proto/prysm/v1alpha1/sync_committee.pb.gw.go
+++ b/proto/prysm/v1alpha1/sync_committee.pb.gw.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package ignore
diff --git a/proto/prysm/v1alpha1/sync_committee_mainnet.go b/proto/prysm/v1alpha1/sync_committee_mainnet.go
index f2d9e68660..3ef26abe38 100644
--- a/proto/prysm/v1alpha1/sync_committee_mainnet.go
+++ b/proto/prysm/v1alpha1/sync_committee_mainnet.go
@@ -1,3 +1,4 @@
+//go:build !minimal
 // +build !minimal
 
 package eth
diff --git a/proto/prysm/v1alpha1/sync_committee_minimal.go b/proto/prysm/v1alpha1/sync_committee_minimal.go
index ecfe100062..55ccebe0dc 100644
--- a/proto/prysm/v1alpha1/sync_committee_minimal.go
+++ b/proto/prysm/v1alpha1/sync_committee_minimal.go
@@ -1,3 +1,4 @@
+//go:build minimal
 // +build minimal
 
 package eth
diff --git a/proto/testing/gocast.go b/proto/testing/gocast.go
index 81ea788b55..4c49f5bf22 100644
--- a/proto/testing/gocast.go
+++ b/proto/testing/gocast.go
@@ -1,3 +1,4 @@
+//go:build tools
 // +build tools
 
 package testing
diff --git a/runtime/debug/cgo_symbolizer.go b/runtime/debug/cgo_symbolizer.go
index 29a473509f..9b0c8459dc 100644
--- a/runtime/debug/cgo_symbolizer.go
+++ b/runtime/debug/cgo_symbolizer.go
@@ -1,3 +1,4 @@
+//go:build cgosymbolizer_enabled
 // +build cgosymbolizer_enabled
 
 package debug