diff --git a/contrib/fuzz/archive_fuzzer.go b/contrib/fuzz/archive_fuzzer.go
index fe1348e84..1fd87a1c5 100644
--- a/contrib/fuzz/archive_fuzzer.go
+++ b/contrib/fuzz/archive_fuzzer.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 /*
diff --git a/contrib/fuzz/cap_fuzzer.go b/contrib/fuzz/cap_fuzzer.go
index df7a398c6..f03a5630e 100644
--- a/contrib/fuzz/cap_fuzzer.go
+++ b/contrib/fuzz/cap_fuzzer.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 /*
diff --git a/contrib/fuzz/container_fuzzer.go b/contrib/fuzz/container_fuzzer.go
index f124993b8..1738dbed8 100644
--- a/contrib/fuzz/container_fuzzer.go
+++ b/contrib/fuzz/container_fuzzer.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 /*
diff --git a/contrib/fuzz/containerd_import_fuzzer.go b/contrib/fuzz/containerd_import_fuzzer.go
index 5760bfea3..6874e8c87 100644
--- a/contrib/fuzz/containerd_import_fuzzer.go
+++ b/contrib/fuzz/containerd_import_fuzzer.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 /*
diff --git a/contrib/fuzz/content_fuzzer.go b/contrib/fuzz/content_fuzzer.go
index 179c9f2c4..c0b67db57 100644
--- a/contrib/fuzz/content_fuzzer.go
+++ b/contrib/fuzz/content_fuzzer.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 /*
diff --git a/contrib/fuzz/cri_fuzzer.go b/contrib/fuzz/cri_fuzzer.go
index 549166e08..03d174963 100644
--- a/contrib/fuzz/cri_fuzzer.go
+++ b/contrib/fuzz/cri_fuzzer.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 /*
diff --git a/contrib/fuzz/docker_fuzzer.go b/contrib/fuzz/docker_fuzzer.go
index ecfab0bed..7f4213b78 100644
--- a/contrib/fuzz/docker_fuzzer.go
+++ b/contrib/fuzz/docker_fuzzer.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 /*
diff --git a/contrib/fuzz/filters_fuzzers.go b/contrib/fuzz/filters_fuzzers.go
index 9440c4693..d78a0af0f 100644
--- a/contrib/fuzz/filters_fuzzers.go
+++ b/contrib/fuzz/filters_fuzzers.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 /*
diff --git a/contrib/fuzz/metadata_fuzzer.go b/contrib/fuzz/metadata_fuzzer.go
index de049a726..b00d480ff 100644
--- a/contrib/fuzz/metadata_fuzzer.go
+++ b/contrib/fuzz/metadata_fuzzer.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 /*
@@ -13,7 +14,6 @@
    limitations under the License.
 */
 
-
 package fuzz
 
 import (
diff --git a/contrib/fuzz/platforms_fuzzers.go b/contrib/fuzz/platforms_fuzzers.go
index 8b02c8356..cf418a976 100644
--- a/contrib/fuzz/platforms_fuzzers.go
+++ b/contrib/fuzz/platforms_fuzzers.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 /*
diff --git a/diff/lcow/lcow.go b/diff/lcow/lcow.go
index 20fb4db41..c72efa89e 100644
--- a/diff/lcow/lcow.go
+++ b/diff/lcow/lcow.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 /*
diff --git a/diff/windows/windows.go b/diff/windows/windows.go
index 0bcf3adcd..032163b64 100644
--- a/diff/windows/windows.go
+++ b/diff/windows/windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 /*
diff --git a/integration/client/client_unix_test.go b/integration/client/client_unix_test.go
index 278b4eaf6..60b7150b8 100644
--- a/integration/client/client_unix_test.go
+++ b/integration/client/client_unix_test.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/integration/client/container_checkpoint_test.go b/integration/client/container_checkpoint_test.go
index 52354c557..56e862bea 100644
--- a/integration/client/container_checkpoint_test.go
+++ b/integration/client/container_checkpoint_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/integration/client/helpers_unix_test.go b/integration/client/helpers_unix_test.go
index f95297e8e..586fade9f 100644
--- a/integration/client/helpers_unix_test.go
+++ b/integration/client/helpers_unix_test.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/integration/client/task_opts_unix_test.go b/integration/client/task_opts_unix_test.go
index b65fb09d6..7fccee41f 100644
--- a/integration/client/task_opts_unix_test.go
+++ b/integration/client/task_opts_unix_test.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/platforms/defaults_darwin.go b/platforms/defaults_darwin.go
index 386edc7d7..e249fe48d 100644
--- a/platforms/defaults_darwin.go
+++ b/platforms/defaults_darwin.go
@@ -1,3 +1,4 @@
+//go:build darwin
 // +build darwin
 
 /*
diff --git a/services/tasks/local_darwin.go b/services/tasks/local_darwin.go
index 4c3d7fc3a..d3a3e8022 100644
--- a/services/tasks/local_darwin.go
+++ b/services/tasks/local_darwin.go
@@ -1,3 +1,4 @@
+//go:build darwin
 // +build darwin
 
 /*
diff --git a/snapshots/lcow/lcow.go b/snapshots/lcow/lcow.go
index 3bc94dfcd..c6754da56 100644
--- a/snapshots/lcow/lcow.go
+++ b/snapshots/lcow/lcow.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 /*
diff --git a/snapshots/windows/windows.go b/snapshots/windows/windows.go
index 3fc52c04b..96fbd2525 100644
--- a/snapshots/windows/windows.go
+++ b/snapshots/windows/windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 /*