diff --git a/archive/tar_mostunix.go b/archive/tar_mostunix.go
index 9cd1f0fa8..d2d970356 100644
--- a/archive/tar_mostunix.go
+++ b/archive/tar_mostunix.go
@@ -1,3 +1,4 @@
+//go:build !windows && !freebsd
 // +build !windows,!freebsd
 
 /*
diff --git a/archive/tar_test.go b/archive/tar_test.go
index dcea0b48a..13879672b 100644
--- a/archive/tar_test.go
+++ b/archive/tar_test.go
@@ -1,3 +1,4 @@
+//go:build !windows && !darwin
 // +build !windows,!darwin
 
 /*
diff --git a/archive/tar_unix.go b/archive/tar_unix.go
index cd2be74a0..4deaf00f4 100644
--- a/archive/tar_unix.go
+++ b/archive/tar_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/archive/time_unix.go b/archive/time_unix.go
index e05ca719c..53e77aa9f 100644
--- a/archive/time_unix.go
+++ b/archive/time_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/cio/io_test.go b/cio/io_test.go
index 3f4ceb94c..5ad46f356 100644
--- a/cio/io_test.go
+++ b/cio/io_test.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/cio/io_unix.go b/cio/io_unix.go
index 8b600673f..2896fb9d6 100644
--- a/cio/io_unix.go
+++ b/cio/io_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/cio/io_unix_test.go b/cio/io_unix_test.go
index 6e0a9fc35..47fe60da8 100644
--- a/cio/io_unix_test.go
+++ b/cio/io_unix_test.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/cmd/containerd-shim-runc-v1/main.go b/cmd/containerd-shim-runc-v1/main.go
index 1b1b106aa..9db509290 100644
--- a/cmd/containerd-shim-runc-v1/main.go
+++ b/cmd/containerd-shim-runc-v1/main.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/cmd/containerd-shim-runc-v2/main.go b/cmd/containerd-shim-runc-v2/main.go
index 4f5d804d9..d2173c86e 100644
--- a/cmd/containerd-shim-runc-v2/main.go
+++ b/cmd/containerd-shim-runc-v2/main.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/cmd/containerd-shim/main_unix.go b/cmd/containerd-shim/main_unix.go
index a778f0a16..10c64cdcb 100644
--- a/cmd/containerd-shim/main_unix.go
+++ b/cmd/containerd-shim/main_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/cmd/containerd-stress/rlimit_unix.go b/cmd/containerd-stress/rlimit_unix.go
index 492f60432..e8fa749a2 100644
--- a/cmd/containerd-stress/rlimit_unix.go
+++ b/cmd/containerd-stress/rlimit_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows && !freebsd
 // +build !windows,!freebsd
 
 /*
diff --git a/cmd/containerd/builtins_aufs_linux.go b/cmd/containerd/builtins_aufs_linux.go
index b6a97738a..f06e01f25 100644
--- a/cmd/containerd/builtins_aufs_linux.go
+++ b/cmd/containerd/builtins_aufs_linux.go
@@ -1,3 +1,4 @@
+//go:build !no_aufs
 // +build !no_aufs
 
 /*
diff --git a/cmd/containerd/builtins_btrfs_linux.go b/cmd/containerd/builtins_btrfs_linux.go
index 7eb709524..a6b11ca2a 100644
--- a/cmd/containerd/builtins_btrfs_linux.go
+++ b/cmd/containerd/builtins_btrfs_linux.go
@@ -1,3 +1,4 @@
+//go:build !no_btrfs && cgo
 // +build !no_btrfs,cgo
 
 /*
diff --git a/cmd/containerd/builtins_cri.go b/cmd/containerd/builtins_cri.go
index 4d5129d0d..c2d282598 100644
--- a/cmd/containerd/builtins_cri.go
+++ b/cmd/containerd/builtins_cri.go
@@ -1,3 +1,4 @@
+//go:build (linux && !no_cri) || (windows && !no_cri)
 // +build linux,!no_cri windows,!no_cri
 
 /*
diff --git a/cmd/containerd/builtins_devmapper_linux.go b/cmd/containerd/builtins_devmapper_linux.go
index 2d22d8ca9..0c036242c 100644
--- a/cmd/containerd/builtins_devmapper_linux.go
+++ b/cmd/containerd/builtins_devmapper_linux.go
@@ -1,3 +1,4 @@
+//go:build !no_devmapper
 // +build !no_devmapper
 
 /*
diff --git a/cmd/containerd/builtins_unix.go b/cmd/containerd/builtins_unix.go
index 143b24976..2e5c1fa26 100644
--- a/cmd/containerd/builtins_unix.go
+++ b/cmd/containerd/builtins_unix.go
@@ -1,3 +1,4 @@
+//go:build darwin || freebsd || solaris
 // +build darwin freebsd solaris
 
 /*
diff --git a/cmd/containerd/builtins_zfs_linux.go b/cmd/containerd/builtins_zfs_linux.go
index 8bc26e5fa..bde126a61 100644
--- a/cmd/containerd/builtins_zfs_linux.go
+++ b/cmd/containerd/builtins_zfs_linux.go
@@ -1,3 +1,4 @@
+//go:build !no_zfs
 // +build !no_zfs
 
 /*
diff --git a/cmd/containerd/command/config_unsupported.go b/cmd/containerd/command/config_unsupported.go
index 8dc92bc61..3d935dede 100644
--- a/cmd/containerd/command/config_unsupported.go
+++ b/cmd/containerd/command/config_unsupported.go
@@ -1,3 +1,4 @@
+//go:build !linux && !windows && !solaris
 // +build !linux,!windows,!solaris
 
 /*
diff --git a/cmd/containerd/command/main_unix.go b/cmd/containerd/command/main_unix.go
index 98fd69871..9b2441fa1 100644
--- a/cmd/containerd/command/main_unix.go
+++ b/cmd/containerd/command/main_unix.go
@@ -1,3 +1,4 @@
+//go:build linux || darwin || freebsd || solaris
 // +build linux darwin freebsd solaris
 
 /*
diff --git a/cmd/containerd/command/notify_unsupported.go b/cmd/containerd/command/notify_unsupported.go
index 3a0513739..76b3f8580 100644
--- a/cmd/containerd/command/notify_unsupported.go
+++ b/cmd/containerd/command/notify_unsupported.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 /*
diff --git a/cmd/containerd/command/service_unsupported.go b/cmd/containerd/command/service_unsupported.go
index b28205255..2ea02af6e 100644
--- a/cmd/containerd/command/service_unsupported.go
+++ b/cmd/containerd/command/service_unsupported.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/cmd/ctr/app/main_unix.go b/cmd/ctr/app/main_unix.go
index c0eb1b6e1..f922e4e04 100644
--- a/cmd/ctr/app/main_unix.go
+++ b/cmd/ctr/app/main_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/cmd/ctr/commands/commands_unix.go b/cmd/ctr/commands/commands_unix.go
index a43516909..44b81e183 100644
--- a/cmd/ctr/commands/commands_unix.go
+++ b/cmd/ctr/commands/commands_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/cmd/ctr/commands/namespaces/namespaces_other.go b/cmd/ctr/commands/namespaces/namespaces_other.go
index b0f12e5d9..4e99d6000 100644
--- a/cmd/ctr/commands/namespaces/namespaces_other.go
+++ b/cmd/ctr/commands/namespaces/namespaces_other.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 /*
diff --git a/cmd/ctr/commands/pprof/pprof_unix.go b/cmd/ctr/commands/pprof/pprof_unix.go
index 9314ca5d1..de662a2b4 100644
--- a/cmd/ctr/commands/pprof/pprof_unix.go
+++ b/cmd/ctr/commands/pprof/pprof_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/cmd/ctr/commands/run/run_unix.go b/cmd/ctr/commands/run/run_unix.go
index 67ba65ac6..a92cf2758 100644
--- a/cmd/ctr/commands/run/run_unix.go
+++ b/cmd/ctr/commands/run/run_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/cmd/ctr/commands/shim/io_unix.go b/cmd/ctr/commands/shim/io_unix.go
index 1200e199a..7806ad88f 100644
--- a/cmd/ctr/commands/shim/io_unix.go
+++ b/cmd/ctr/commands/shim/io_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/cmd/ctr/commands/shim/shim.go b/cmd/ctr/commands/shim/shim.go
index c210dbc6c..57585a02f 100644
--- a/cmd/ctr/commands/shim/shim.go
+++ b/cmd/ctr/commands/shim/shim.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/cmd/ctr/commands/signals_notlinux.go b/cmd/ctr/commands/signals_notlinux.go
index 6a9dccbc4..1e0fbe66b 100644
--- a/cmd/ctr/commands/signals_notlinux.go
+++ b/cmd/ctr/commands/signals_notlinux.go
@@ -1,4 +1,5 @@
-//+build !linux
+//go:build !linux
+// +build !linux
 
 /*
    Copyright The containerd Authors.
diff --git a/cmd/ctr/commands/tasks/metrics.go b/cmd/ctr/commands/tasks/metrics.go
index a83e45efc..0ef9602c2 100644
--- a/cmd/ctr/commands/tasks/metrics.go
+++ b/cmd/ctr/commands/tasks/metrics.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/cmd/ctr/commands/tasks/tasks_unix.go b/cmd/ctr/commands/tasks/tasks_unix.go
index 0ec6dc010..748ba2892 100644
--- a/cmd/ctr/commands/tasks/tasks_unix.go
+++ b/cmd/ctr/commands/tasks/tasks_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/container_opts_unix.go b/container_opts_unix.go
index b109a10ec..b6fc37db9 100644
--- a/container_opts_unix.go
+++ b/container_opts_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/content/local/store_bsd.go b/content/local/store_bsd.go
index da149a2fd..3e6a95674 100644
--- a/content/local/store_bsd.go
+++ b/content/local/store_bsd.go
@@ -1,3 +1,4 @@
+//go:build darwin || freebsd || netbsd
 // +build darwin freebsd netbsd
 
 /*
diff --git a/content/local/store_openbsd.go b/content/local/store_openbsd.go
index f34f0dad2..05d1a1a98 100644
--- a/content/local/store_openbsd.go
+++ b/content/local/store_openbsd.go
@@ -1,3 +1,4 @@
+//go:build openbsd
 // +build openbsd
 
 /*
diff --git a/content/local/store_unix.go b/content/local/store_unix.go
index 69a74bab0..d60d753cb 100644
--- a/content/local/store_unix.go
+++ b/content/local/store_unix.go
@@ -1,3 +1,4 @@
+//go:build linux || solaris
 // +build linux solaris
 
 /*
diff --git a/contrib/apparmor/apparmor.go b/contrib/apparmor/apparmor.go
index ec255fc79..8131d612f 100644
--- a/contrib/apparmor/apparmor.go
+++ b/contrib/apparmor/apparmor.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/contrib/apparmor/apparmor_test.go b/contrib/apparmor/apparmor_test.go
index 478a6095d..8c907ef54 100644
--- a/contrib/apparmor/apparmor_test.go
+++ b/contrib/apparmor/apparmor_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/contrib/apparmor/apparmor_unsupported.go b/contrib/apparmor/apparmor_unsupported.go
index 0429954ea..239ca5e38 100644
--- a/contrib/apparmor/apparmor_unsupported.go
+++ b/contrib/apparmor/apparmor_unsupported.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 /*
diff --git a/contrib/apparmor/template.go b/contrib/apparmor/template.go
index 08f4268a5..6e0af2840 100644
--- a/contrib/apparmor/template.go
+++ b/contrib/apparmor/template.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/contrib/apparmor/template_test.go b/contrib/apparmor/template_test.go
index c49306a27..9fd1a4fb7 100644
--- a/contrib/apparmor/template_test.go
+++ b/contrib/apparmor/template_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package apparmor
diff --git a/contrib/seccomp/seccomp_default.go b/contrib/seccomp/seccomp_default.go
index f7087ad94..f050c03e3 100644
--- a/contrib/seccomp/seccomp_default.go
+++ b/contrib/seccomp/seccomp_default.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/contrib/seccomp/seccomp_default_unsupported.go b/contrib/seccomp/seccomp_default_unsupported.go
index 6d7051058..d06d6487e 100644
--- a/contrib/seccomp/seccomp_default_unsupported.go
+++ b/contrib/seccomp/seccomp_default_unsupported.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 /*
diff --git a/defaults/defaults_unix.go b/defaults/defaults_unix.go
index 2b485803b..8e2619a38 100644
--- a/defaults/defaults_unix.go
+++ b/defaults/defaults_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows && !darwin
 // +build !windows,!darwin
 
 /*
diff --git a/diff/apply/apply_other.go b/diff/apply/apply_other.go
index 01e0f11bb..615d1aa92 100644
--- a/diff/apply/apply_other.go
+++ b/diff/apply/apply_other.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 /*
diff --git a/diff/stream_unix.go b/diff/stream_unix.go
index d79fd7154..37d0709b7 100644
--- a/diff/stream_unix.go
+++ b/diff/stream_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/integration/addition_gids_test.go b/integration/addition_gids_test.go
index f046378b4..9c481e5d7 100644
--- a/integration/addition_gids_test.go
+++ b/integration/addition_gids_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/integration/container_update_resources_test.go b/integration/container_update_resources_test.go
index 229021fe3..228075063 100644
--- a/integration/container_update_resources_test.go
+++ b/integration/container_update_resources_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/integration/remote/util/util_unix.go b/integration/remote/util/util_unix.go
index de6d2c81b..6ff278cfd 100644
--- a/integration/remote/util/util_unix.go
+++ b/integration/remote/util/util_unix.go
@@ -1,3 +1,4 @@
+//go:build freebsd || linux || darwin
 // +build freebsd linux darwin
 
 /*
diff --git a/integration/remote/util/util_unsupported.go b/integration/remote/util/util_unsupported.go
index 81f412172..99128fdb9 100644
--- a/integration/remote/util/util_unsupported.go
+++ b/integration/remote/util/util_unsupported.go
@@ -1,3 +1,4 @@
+//go:build !freebsd && !linux && !windows && !darwin
 // +build !freebsd,!linux,!windows,!darwin
 
 /*
diff --git a/integration/runtime_handler_test.go b/integration/runtime_handler_test.go
index fd616a1c6..479524825 100644
--- a/integration/runtime_handler_test.go
+++ b/integration/runtime_handler_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/integration/sandbox_clean_remove_test.go b/integration/sandbox_clean_remove_test.go
index 77f9b57c9..9a6ed5d4d 100644
--- a/integration/sandbox_clean_remove_test.go
+++ b/integration/sandbox_clean_remove_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/integration/util/boottime_util_linux.go b/integration/util/boottime_util_linux.go
index 2699ae5fe..e435d8ba6 100644
--- a/integration/util/boottime_util_linux.go
+++ b/integration/util/boottime_util_linux.go
@@ -1,3 +1,4 @@
+//go:build freebsd || linux
 // +build freebsd linux
 
 /*
diff --git a/integration/util/util_unix.go b/integration/util/util_unix.go
index fcf36d940..425e4d6a1 100644
--- a/integration/util/util_unix.go
+++ b/integration/util/util_unix.go
@@ -1,3 +1,4 @@
+//go:build freebsd || linux || darwin
 // +build freebsd linux darwin
 
 /*
diff --git a/integration/util/util_unsupported.go b/integration/util/util_unsupported.go
index 81f412172..99128fdb9 100644
--- a/integration/util/util_unsupported.go
+++ b/integration/util/util_unsupported.go
@@ -1,3 +1,4 @@
+//go:build !freebsd && !linux && !windows && !darwin
 // +build !freebsd,!linux,!windows,!darwin
 
 /*
diff --git a/metrics/cgroups/cgroups.go b/metrics/cgroups/cgroups.go
index d2f3fb2df..4d2e1284a 100644
--- a/metrics/cgroups/cgroups.go
+++ b/metrics/cgroups/cgroups.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/metrics/cgroups/v1/blkio.go b/metrics/cgroups/v1/blkio.go
index d532bc7a7..2348f37cd 100644
--- a/metrics/cgroups/v1/blkio.go
+++ b/metrics/cgroups/v1/blkio.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/metrics/cgroups/v1/cgroups.go b/metrics/cgroups/v1/cgroups.go
index 080a2d586..d80d13e0d 100644
--- a/metrics/cgroups/v1/cgroups.go
+++ b/metrics/cgroups/v1/cgroups.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/metrics/cgroups/v1/cpu.go b/metrics/cgroups/v1/cpu.go
index 0abe0fb7f..77996d940 100644
--- a/metrics/cgroups/v1/cpu.go
+++ b/metrics/cgroups/v1/cpu.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/metrics/cgroups/v1/hugetlb.go b/metrics/cgroups/v1/hugetlb.go
index 97ca890a6..e29b05701 100644
--- a/metrics/cgroups/v1/hugetlb.go
+++ b/metrics/cgroups/v1/hugetlb.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/metrics/cgroups/v1/memory.go b/metrics/cgroups/v1/memory.go
index 915a36c7f..86f6196ce 100644
--- a/metrics/cgroups/v1/memory.go
+++ b/metrics/cgroups/v1/memory.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/metrics/cgroups/v1/metric.go b/metrics/cgroups/v1/metric.go
index dd9c30314..c4f2947cd 100644
--- a/metrics/cgroups/v1/metric.go
+++ b/metrics/cgroups/v1/metric.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/metrics/cgroups/v1/metrics.go b/metrics/cgroups/v1/metrics.go
index c373d4f6e..a620bdddd 100644
--- a/metrics/cgroups/v1/metrics.go
+++ b/metrics/cgroups/v1/metrics.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/metrics/cgroups/v1/oom.go b/metrics/cgroups/v1/oom.go
index a31b813f2..a7fa2658a 100644
--- a/metrics/cgroups/v1/oom.go
+++ b/metrics/cgroups/v1/oom.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/metrics/cgroups/v1/pids.go b/metrics/cgroups/v1/pids.go
index 6bb1876e6..3d60cd49a 100644
--- a/metrics/cgroups/v1/pids.go
+++ b/metrics/cgroups/v1/pids.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/metrics/cgroups/v2/cgroups.go b/metrics/cgroups/v2/cgroups.go
index bf0fef358..f8a6aa9da 100644
--- a/metrics/cgroups/v2/cgroups.go
+++ b/metrics/cgroups/v2/cgroups.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/metrics/cgroups/v2/cpu.go b/metrics/cgroups/v2/cpu.go
index c9a48ad33..29f3dd36d 100644
--- a/metrics/cgroups/v2/cpu.go
+++ b/metrics/cgroups/v2/cpu.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/metrics/cgroups/v2/io.go b/metrics/cgroups/v2/io.go
index 79980a580..b62673799 100644
--- a/metrics/cgroups/v2/io.go
+++ b/metrics/cgroups/v2/io.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/metrics/cgroups/v2/memory.go b/metrics/cgroups/v2/memory.go
index 7d0332a29..41813a348 100644
--- a/metrics/cgroups/v2/memory.go
+++ b/metrics/cgroups/v2/memory.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/metrics/cgroups/v2/metric.go b/metrics/cgroups/v2/metric.go
index ea995d243..f42b70d5a 100644
--- a/metrics/cgroups/v2/metric.go
+++ b/metrics/cgroups/v2/metric.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/metrics/cgroups/v2/metrics.go b/metrics/cgroups/v2/metrics.go
index 77dbc8df9..61cdb2cc8 100644
--- a/metrics/cgroups/v2/metrics.go
+++ b/metrics/cgroups/v2/metrics.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/metrics/cgroups/v2/pids.go b/metrics/cgroups/v2/pids.go
index f1028b067..78f90ca97 100644
--- a/metrics/cgroups/v2/pids.go
+++ b/metrics/cgroups/v2/pids.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/metrics/types/v1/types.go b/metrics/types/v1/types.go
index 025c1f4d3..69b1b6571 100644
--- a/metrics/types/v1/types.go
+++ b/metrics/types/v1/types.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/metrics/types/v2/types.go b/metrics/types/v2/types.go
index eac8d4602..8b5b59654 100644
--- a/metrics/types/v2/types.go
+++ b/metrics/types/v2/types.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/mount/lookup_unix.go b/mount/lookup_unix.go
index a2d51ce58..7a4683e95 100644
--- a/mount/lookup_unix.go
+++ b/mount/lookup_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/mount/lookup_unsupported.go b/mount/lookup_unsupported.go
index 46ec66a90..2e954b1ae 100644
--- a/mount/lookup_unsupported.go
+++ b/mount/lookup_unsupported.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 /*
diff --git a/mount/mount_unix.go b/mount/mount_unix.go
index ecf569d9c..0e5306073 100644
--- a/mount/mount_unix.go
+++ b/mount/mount_unix.go
@@ -1,3 +1,4 @@
+//go:build darwin || openbsd
 // +build darwin openbsd
 
 /*
diff --git a/mount/temp_unix.go b/mount/temp_unix.go
index fe162c067..e96970081 100644
--- a/mount/temp_unix.go
+++ b/mount/temp_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows && !darwin
 // +build !windows,!darwin
 
 /*
diff --git a/mount/temp_unsupported.go b/mount/temp_unsupported.go
index 75a678f8e..feec90a76 100644
--- a/mount/temp_unsupported.go
+++ b/mount/temp_unsupported.go
@@ -1,3 +1,4 @@
+//go:build windows || darwin
 // +build windows darwin
 
 /*
diff --git a/oci/mounts.go b/oci/mounts.go
index 1011396bf..83dd0d0b1 100644
--- a/oci/mounts.go
+++ b/oci/mounts.go
@@ -1,3 +1,4 @@
+//go:build !freebsd
 // +build !freebsd
 
 /*
diff --git a/oci/spec_opts_nonlinux.go b/oci/spec_opts_nonlinux.go
index 85dee007f..db37651b3 100644
--- a/oci/spec_opts_nonlinux.go
+++ b/oci/spec_opts_nonlinux.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 /*
diff --git a/oci/spec_opts_unix.go b/oci/spec_opts_unix.go
index 80a522356..609684a75 100644
--- a/oci/spec_opts_unix.go
+++ b/oci/spec_opts_unix.go
@@ -1,3 +1,4 @@
+//go:build !linux && !windows
 // +build !linux,!windows
 
 /*
diff --git a/oci/spec_opts_unix_test.go b/oci/spec_opts_unix_test.go
index 4dd9a48ab..85d15bdd0 100644
--- a/oci/spec_opts_unix_test.go
+++ b/oci/spec_opts_unix_test.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/oci/utils_unix.go b/oci/utils_unix.go
index 108cacf5b..0e28fe45f 100644
--- a/oci/utils_unix.go
+++ b/oci/utils_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/pkg/apparmor/apparmor_unsupported.go b/pkg/apparmor/apparmor_unsupported.go
index 428d36424..833170338 100644
--- a/pkg/apparmor/apparmor_unsupported.go
+++ b/pkg/apparmor/apparmor_unsupported.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 /*
diff --git a/pkg/cri/config/config_unix.go b/pkg/cri/config/config_unix.go
index 3ca123236..2d62cfd8b 100644
--- a/pkg/cri/config/config_unix.go
+++ b/pkg/cri/config/config_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/pkg/cri/io/helpers_unix.go b/pkg/cri/io/helpers_unix.go
index 2780b958a..f0f908401 100644
--- a/pkg/cri/io/helpers_unix.go
+++ b/pkg/cri/io/helpers_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/pkg/cri/server/bandwidth/linux.go b/pkg/cri/server/bandwidth/linux.go
index e8d710825..6456c4a6a 100644
--- a/pkg/cri/server/bandwidth/linux.go
+++ b/pkg/cri/server/bandwidth/linux.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/pkg/cri/server/bandwidth/unsupported.go b/pkg/cri/server/bandwidth/unsupported.go
index 12c5ad83b..998207039 100644
--- a/pkg/cri/server/bandwidth/unsupported.go
+++ b/pkg/cri/server/bandwidth/unsupported.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 /*
diff --git a/pkg/cri/server/container_create_other.go b/pkg/cri/server/container_create_other.go
index 5b76a922b..21b2cb60a 100644
--- a/pkg/cri/server/container_create_other.go
+++ b/pkg/cri/server/container_create_other.go
@@ -1,3 +1,4 @@
+//go:build !windows && !linux
 // +build !windows,!linux
 
 /*
diff --git a/pkg/cri/server/container_create_other_test.go b/pkg/cri/server/container_create_other_test.go
index 2b215c03f..50be4cc99 100644
--- a/pkg/cri/server/container_create_other_test.go
+++ b/pkg/cri/server/container_create_other_test.go
@@ -1,3 +1,4 @@
+//go:build !windows && !linux
 // +build !windows,!linux
 
 /*
diff --git a/pkg/cri/server/container_stats_list_other.go b/pkg/cri/server/container_stats_list_other.go
index 38c0e52ba..b86926128 100644
--- a/pkg/cri/server/container_stats_list_other.go
+++ b/pkg/cri/server/container_stats_list_other.go
@@ -1,3 +1,4 @@
+//go:build !windows && !linux
 // +build !windows,!linux
 
 /*
diff --git a/pkg/cri/server/container_update_resources_other.go b/pkg/cri/server/container_update_resources_other.go
index a04016733..b8142de23 100644
--- a/pkg/cri/server/container_update_resources_other.go
+++ b/pkg/cri/server/container_update_resources_other.go
@@ -1,3 +1,4 @@
+//go:build !windows && !linux
 // +build !windows,!linux
 
 /*
diff --git a/pkg/cri/server/helpers_other.go b/pkg/cri/server/helpers_other.go
index 6a67375d7..99df63e9b 100644
--- a/pkg/cri/server/helpers_other.go
+++ b/pkg/cri/server/helpers_other.go
@@ -1,3 +1,4 @@
+//go:build !windows && !linux
 // +build !windows,!linux
 
 /*
diff --git a/pkg/cri/server/sandbox_portforward_other.go b/pkg/cri/server/sandbox_portforward_other.go
index 1b88170ed..e449d607a 100644
--- a/pkg/cri/server/sandbox_portforward_other.go
+++ b/pkg/cri/server/sandbox_portforward_other.go
@@ -1,3 +1,4 @@
+//go:build !windows && !linux
 // +build !windows,!linux
 
 /*
diff --git a/pkg/cri/server/sandbox_run_other.go b/pkg/cri/server/sandbox_run_other.go
index a2c638503..ce5ff1964 100644
--- a/pkg/cri/server/sandbox_run_other.go
+++ b/pkg/cri/server/sandbox_run_other.go
@@ -1,3 +1,4 @@
+//go:build !windows && !linux
 // +build !windows,!linux
 
 /*
diff --git a/pkg/cri/server/sandbox_run_other_test.go b/pkg/cri/server/sandbox_run_other_test.go
index 1a382e1e1..b87508959 100644
--- a/pkg/cri/server/sandbox_run_other_test.go
+++ b/pkg/cri/server/sandbox_run_other_test.go
@@ -1,3 +1,4 @@
+//go:build !windows && !linux
 // +build !windows,!linux
 
 /*
diff --git a/pkg/cri/server/service_other.go b/pkg/cri/server/service_other.go
index fc6cd51f7..35c57259b 100644
--- a/pkg/cri/server/service_other.go
+++ b/pkg/cri/server/service_other.go
@@ -1,3 +1,4 @@
+//go:build !windows && !linux
 // +build !windows,!linux
 
 /*
diff --git a/pkg/dialer/dialer_unix.go b/pkg/dialer/dialer_unix.go
index e7d195833..b4304ffbf 100644
--- a/pkg/dialer/dialer_unix.go
+++ b/pkg/dialer/dialer_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/pkg/netns/netns_other.go b/pkg/netns/netns_other.go
index e2000bf7f..01bad803c 100644
--- a/pkg/netns/netns_other.go
+++ b/pkg/netns/netns_other.go
@@ -1,3 +1,4 @@
+//go:build !windows && !linux
 // +build !windows,!linux
 
 /*
diff --git a/pkg/oom/oom.go b/pkg/oom/oom.go
index 6d5bf270c..bbc46f818 100644
--- a/pkg/oom/oom.go
+++ b/pkg/oom/oom.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/pkg/oom/v1/v1.go b/pkg/oom/v1/v1.go
index be8de74db..f133efb87 100644
--- a/pkg/oom/v1/v1.go
+++ b/pkg/oom/v1/v1.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/pkg/oom/v2/v2.go b/pkg/oom/v2/v2.go
index a956b1c86..479300f21 100644
--- a/pkg/oom/v2/v2.go
+++ b/pkg/oom/v2/v2.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/pkg/os/mount_other.go b/pkg/os/mount_other.go
index 3a778d058..eb8500465 100644
--- a/pkg/os/mount_other.go
+++ b/pkg/os/mount_other.go
@@ -1,3 +1,4 @@
+//go:build !windows && !linux
 // +build !windows,!linux
 
 /*
diff --git a/pkg/os/mount_unix.go b/pkg/os/mount_unix.go
index e81def359..27ec8a9ef 100644
--- a/pkg/os/mount_unix.go
+++ b/pkg/os/mount_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows && !linux
 // +build !windows,!linux
 
 /*
diff --git a/pkg/os/os_unix.go b/pkg/os/os_unix.go
index 6b3b85755..429a901ac 100644
--- a/pkg/os/os_unix.go
+++ b/pkg/os/os_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/pkg/os/testing/fake_os_unix.go b/pkg/os/testing/fake_os_unix.go
index 9a1639489..2cc3c166a 100644
--- a/pkg/os/testing/fake_os_unix.go
+++ b/pkg/os/testing/fake_os_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/pkg/process/deleted_state.go b/pkg/process/deleted_state.go
index eb7baf737..5f1cdb121 100644
--- a/pkg/process/deleted_state.go
+++ b/pkg/process/deleted_state.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/pkg/process/exec.go b/pkg/process/exec.go
index 7790a4979..db0b3f8c8 100644
--- a/pkg/process/exec.go
+++ b/pkg/process/exec.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/pkg/process/exec_state.go b/pkg/process/exec_state.go
index c97b4001b..60b504699 100644
--- a/pkg/process/exec_state.go
+++ b/pkg/process/exec_state.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/pkg/process/init.go b/pkg/process/init.go
index a9462384f..bb6edde39 100644
--- a/pkg/process/init.go
+++ b/pkg/process/init.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/pkg/process/init_state.go b/pkg/process/init_state.go
index 5273a5d73..7ea4c6b12 100644
--- a/pkg/process/init_state.go
+++ b/pkg/process/init_state.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/pkg/process/io.go b/pkg/process/io.go
index d1c5b9633..e54c3e5f6 100644
--- a/pkg/process/io.go
+++ b/pkg/process/io.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/pkg/process/io_test.go b/pkg/process/io_test.go
index 21b4144f5..7e472f026 100644
--- a/pkg/process/io_test.go
+++ b/pkg/process/io_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/pkg/process/utils.go b/pkg/process/utils.go
index 6536ac5a8..b99bf547b 100644
--- a/pkg/process/utils.go
+++ b/pkg/process/utils.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/pkg/seccomp/seccomp_unsupported.go b/pkg/seccomp/seccomp_unsupported.go
index 87b133426..4458c1c70 100644
--- a/pkg/seccomp/seccomp_unsupported.go
+++ b/pkg/seccomp/seccomp_unsupported.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 /*
diff --git a/pkg/seed/seed_other.go b/pkg/seed/seed_other.go
index 30ba9e9e4..ddefd74a9 100644
--- a/pkg/seed/seed_other.go
+++ b/pkg/seed/seed_other.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 /*
diff --git a/pkg/testutil/helpers_unix.go b/pkg/testutil/helpers_unix.go
index eee004af8..b4385bfec 100644
--- a/pkg/testutil/helpers_unix.go
+++ b/pkg/testutil/helpers_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/pkg/testutil/mount_other.go b/pkg/testutil/mount_other.go
index 57424c837..412d72bca 100644
--- a/pkg/testutil/mount_other.go
+++ b/pkg/testutil/mount_other.go
@@ -1,3 +1,4 @@
+//go:build !linux && !windows
 // +build !linux,!windows
 
 /*
diff --git a/pkg/userns/userns_unsupported.go b/pkg/userns/userns_unsupported.go
index aab756fd2..4f8d7dd2d 100644
--- a/pkg/userns/userns_unsupported.go
+++ b/pkg/userns/userns_unsupported.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 /*
diff --git a/platforms/defaults_unix.go b/platforms/defaults_unix.go
index e8a7d5ffa..359063efd 100644
--- a/platforms/defaults_unix.go
+++ b/platforms/defaults_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/plugin/plugin_go18.go b/plugin/plugin_go18.go
index 927fe6196..0df0669d2 100644
--- a/plugin/plugin_go18.go
+++ b/plugin/plugin_go18.go
@@ -1,3 +1,4 @@
+//go:build go1.8 && !windows && amd64 && !static_build && !gccgo
 // +build go1.8,!windows,amd64,!static_build,!gccgo
 
 /*
diff --git a/plugin/plugin_other.go b/plugin/plugin_other.go
index 0c5e14165..a2883bbba 100644
--- a/plugin/plugin_other.go
+++ b/plugin/plugin_other.go
@@ -1,3 +1,4 @@
+//go:build !go1.8 || windows || !amd64 || static_build || gccgo
 // +build !go1.8 windows !amd64 static_build gccgo
 
 /*
diff --git a/remotes/docker/config/config_unix.go b/remotes/docker/config/config_unix.go
index 8245c4d70..092b82a87 100644
--- a/remotes/docker/config/config_unix.go
+++ b/remotes/docker/config/config_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/rootfs/init_other.go b/rootfs/init_other.go
index 261121085..d8e38d4c7 100644
--- a/rootfs/init_other.go
+++ b/rootfs/init_other.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 /*
diff --git a/runtime/v1/linux/bundle.go b/runtime/v1/linux/bundle.go
index 9d0a6c447..deb94d285 100644
--- a/runtime/v1/linux/bundle.go
+++ b/runtime/v1/linux/bundle.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/runtime/v1/linux/process.go b/runtime/v1/linux/process.go
index c2777452d..cf01abe89 100644
--- a/runtime/v1/linux/process.go
+++ b/runtime/v1/linux/process.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/runtime/v1/linux/runtime.go b/runtime/v1/linux/runtime.go
index 1fba68e11..d49818153 100644
--- a/runtime/v1/linux/runtime.go
+++ b/runtime/v1/linux/runtime.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/runtime/v1/linux/task.go b/runtime/v1/linux/task.go
index b1ece32f2..b359cc550 100644
--- a/runtime/v1/linux/task.go
+++ b/runtime/v1/linux/task.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/runtime/v1/shim.go b/runtime/v1/shim.go
index 0a2018b4c..34d0dbcd0 100644
--- a/runtime/v1/shim.go
+++ b/runtime/v1/shim.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/runtime/v1/shim/client/client.go b/runtime/v1/shim/client/client.go
index a8afb0e48..3185294b8 100644
--- a/runtime/v1/shim/client/client.go
+++ b/runtime/v1/shim/client/client.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/runtime/v1/shim/client/client_unix.go b/runtime/v1/shim/client/client_unix.go
index 8a5b22fb7..2280b991e 100644
--- a/runtime/v1/shim/client/client_unix.go
+++ b/runtime/v1/shim/client/client_unix.go
@@ -1,3 +1,4 @@
+//go:build !linux && !windows
 // +build !linux,!windows
 
 /*
diff --git a/runtime/v1/shim/local.go b/runtime/v1/shim/local.go
index 97f652c77..f9a271e09 100644
--- a/runtime/v1/shim/local.go
+++ b/runtime/v1/shim/local.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/runtime/v1/shim/service.go b/runtime/v1/shim/service.go
index 50ac869d4..ca59e6752 100644
--- a/runtime/v1/shim/service.go
+++ b/runtime/v1/shim/service.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/runtime/v1/shim/service_unix.go b/runtime/v1/shim/service_unix.go
index d96ecd60d..95f90ea2d 100644
--- a/runtime/v1/shim/service_unix.go
+++ b/runtime/v1/shim/service_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows && !linux
 // +build !windows,!linux
 
 /*
diff --git a/runtime/v2/example/cmd/main.go b/runtime/v2/example/cmd/main.go
index fcef0d25b..7a59d721d 100644
--- a/runtime/v2/example/cmd/main.go
+++ b/runtime/v2/example/cmd/main.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/runtime/v2/example/example.go b/runtime/v2/example/example.go
index 995b3cc47..85ce9302e 100644
--- a/runtime/v2/example/example.go
+++ b/runtime/v2/example/example.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/runtime/v2/logging/logging_unix.go b/runtime/v2/logging/logging_unix.go
index cde7179ee..f04fcc770 100644
--- a/runtime/v2/logging/logging_unix.go
+++ b/runtime/v2/logging/logging_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/runtime/v2/manager_unix.go b/runtime/v2/manager_unix.go
index 4e74125d7..eb87c20da 100644
--- a/runtime/v2/manager_unix.go
+++ b/runtime/v2/manager_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/runtime/v2/runc/container.go b/runtime/v2/runc/container.go
index cdfb0874f..90b3bbc31 100644
--- a/runtime/v2/runc/container.go
+++ b/runtime/v2/runc/container.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/runtime/v2/runc/platform.go b/runtime/v2/runc/platform.go
index 2ded840c6..77d050a58 100644
--- a/runtime/v2/runc/platform.go
+++ b/runtime/v2/runc/platform.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/runtime/v2/runc/util.go b/runtime/v2/runc/util.go
index 166597d49..73eebe2f7 100644
--- a/runtime/v2/runc/util.go
+++ b/runtime/v2/runc/util.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/runtime/v2/runc/v1/service.go b/runtime/v2/runc/v1/service.go
index 71f2346d3..0b3c0f19d 100644
--- a/runtime/v2/runc/v1/service.go
+++ b/runtime/v2/runc/v1/service.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/runtime/v2/runc/v2/service.go b/runtime/v2/runc/v2/service.go
index 83a250a7e..ac6b00ab7 100644
--- a/runtime/v2/runc/v2/service.go
+++ b/runtime/v2/runc/v2/service.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/runtime/v2/shim/shim_unix.go b/runtime/v2/shim/shim_unix.go
index a61b64208..cbab4f929 100644
--- a/runtime/v2/shim/shim_unix.go
+++ b/runtime/v2/shim/shim_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/runtime/v2/shim/util_unix.go b/runtime/v2/shim/util_unix.go
index 5bd6facfe..b14cfb685 100644
--- a/runtime/v2/shim/util_unix.go
+++ b/runtime/v2/shim/util_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/runtime/v2/shim_unix.go b/runtime/v2/shim_unix.go
index e5d830590..ba49dfb1b 100644
--- a/runtime/v2/shim_unix.go
+++ b/runtime/v2/shim_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/runtime/v2/shim_unix_test.go b/runtime/v2/shim_unix_test.go
index a14357e37..dba47c88f 100644
--- a/runtime/v2/shim_unix_test.go
+++ b/runtime/v2/shim_unix_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/services/diff/service_unix.go b/services/diff/service_unix.go
index 04a85f7c4..defea4bae 100644
--- a/services/diff/service_unix.go
+++ b/services/diff/service_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/services/opt/path_unix.go b/services/opt/path_unix.go
index b4d996cad..7d21e0dfe 100644
--- a/services/opt/path_unix.go
+++ b/services/opt/path_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/services/server/server_unsupported.go b/services/server/server_unsupported.go
index 80674e69e..c3eb53b54 100644
--- a/services/server/server_unsupported.go
+++ b/services/server/server_unsupported.go
@@ -1,3 +1,4 @@
+//go:build !linux && !windows && !solaris
 // +build !linux,!windows,!solaris
 
 /*
diff --git a/services/tasks/local_unix.go b/services/tasks/local_unix.go
index 14ce94fbe..bf0410407 100644
--- a/services/tasks/local_unix.go
+++ b/services/tasks/local_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows && !freebsd
 // +build !windows,!freebsd
 
 /*
diff --git a/snapshots/benchsuite/benchmark.go b/snapshots/benchsuite/benchmark.go
index be17d5e01..6b37bdafb 100644
--- a/snapshots/benchsuite/benchmark.go
+++ b/snapshots/benchsuite/benchmark.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/snapshots/benchsuite/benchmark_test.go b/snapshots/benchsuite/benchmark_test.go
index 40514d54d..27a3ac7c4 100644
--- a/snapshots/benchsuite/benchmark_test.go
+++ b/snapshots/benchsuite/benchmark_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/snapshots/btrfs/btrfs.go b/snapshots/btrfs/btrfs.go
index 3096989ae..534b1c1e8 100644
--- a/snapshots/btrfs/btrfs.go
+++ b/snapshots/btrfs/btrfs.go
@@ -1,3 +1,4 @@
+//go:build linux && !no_btrfs && cgo
 // +build linux,!no_btrfs,cgo
 
 /*
diff --git a/snapshots/btrfs/btrfs_test.go b/snapshots/btrfs/btrfs_test.go
index 434aa86a9..ecf831c8d 100644
--- a/snapshots/btrfs/btrfs_test.go
+++ b/snapshots/btrfs/btrfs_test.go
@@ -1,3 +1,4 @@
+//go:build linux && !no_btrfs && cgo
 // +build linux,!no_btrfs,cgo
 
 /*
diff --git a/snapshots/btrfs/plugin/plugin.go b/snapshots/btrfs/plugin/plugin.go
index a70af5842..7e39dc1e0 100644
--- a/snapshots/btrfs/plugin/plugin.go
+++ b/snapshots/btrfs/plugin/plugin.go
@@ -1,3 +1,4 @@
+//go:build linux && !no_btrfs && cgo
 // +build linux,!no_btrfs,cgo
 
 /*
diff --git a/snapshots/devmapper/blkdiscard/blkdiscard.go b/snapshots/devmapper/blkdiscard/blkdiscard.go
index f04b8ce25..b6bcd4422 100644
--- a/snapshots/devmapper/blkdiscard/blkdiscard.go
+++ b/snapshots/devmapper/blkdiscard/blkdiscard.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/snapshots/devmapper/config.go b/snapshots/devmapper/config.go
index 8f9aaa6ae..3d9558dd8 100644
--- a/snapshots/devmapper/config.go
+++ b/snapshots/devmapper/config.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/snapshots/devmapper/config_test.go b/snapshots/devmapper/config_test.go
index 02ad8360e..a7195675f 100644
--- a/snapshots/devmapper/config_test.go
+++ b/snapshots/devmapper/config_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/snapshots/devmapper/device_info.go b/snapshots/devmapper/device_info.go
index e9dea3455..37e0dbfd6 100644
--- a/snapshots/devmapper/device_info.go
+++ b/snapshots/devmapper/device_info.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/snapshots/devmapper/dmsetup/dmsetup.go b/snapshots/devmapper/dmsetup/dmsetup.go
index f39067e41..a6a920db8 100644
--- a/snapshots/devmapper/dmsetup/dmsetup.go
+++ b/snapshots/devmapper/dmsetup/dmsetup.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/snapshots/devmapper/dmsetup/dmsetup_test.go b/snapshots/devmapper/dmsetup/dmsetup_test.go
index 9f64f9cc0..7eb478637 100644
--- a/snapshots/devmapper/dmsetup/dmsetup_test.go
+++ b/snapshots/devmapper/dmsetup/dmsetup_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/snapshots/devmapper/metadata.go b/snapshots/devmapper/metadata.go
index 01cdb7970..e66e57356 100644
--- a/snapshots/devmapper/metadata.go
+++ b/snapshots/devmapper/metadata.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/snapshots/devmapper/metadata_test.go b/snapshots/devmapper/metadata_test.go
index 0489a68dc..a621ae3f0 100644
--- a/snapshots/devmapper/metadata_test.go
+++ b/snapshots/devmapper/metadata_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/snapshots/devmapper/plugin/plugin.go b/snapshots/devmapper/plugin/plugin.go
index ea8d3059f..ad74e1fe1 100644
--- a/snapshots/devmapper/plugin/plugin.go
+++ b/snapshots/devmapper/plugin/plugin.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/snapshots/devmapper/pool_device.go b/snapshots/devmapper/pool_device.go
index c5ef52695..fdb57bc18 100644
--- a/snapshots/devmapper/pool_device.go
+++ b/snapshots/devmapper/pool_device.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/snapshots/devmapper/pool_device_test.go b/snapshots/devmapper/pool_device_test.go
index f1b21c0b4..d44ed1cc7 100644
--- a/snapshots/devmapper/pool_device_test.go
+++ b/snapshots/devmapper/pool_device_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/snapshots/devmapper/snapshotter.go b/snapshots/devmapper/snapshotter.go
index cfc471e16..5670b6b02 100644
--- a/snapshots/devmapper/snapshotter.go
+++ b/snapshots/devmapper/snapshotter.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/snapshots/devmapper/snapshotter_test.go b/snapshots/devmapper/snapshotter_test.go
index 7a3c64d74..e89503009 100644
--- a/snapshots/devmapper/snapshotter_test.go
+++ b/snapshots/devmapper/snapshotter_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/snapshots/native/native_default.go b/snapshots/native/native_default.go
index ee594baae..b51bf4869 100644
--- a/snapshots/native/native_default.go
+++ b/snapshots/native/native_default.go
@@ -1,3 +1,4 @@
+//go:build !freebsd
 // +build !freebsd
 
 /*
diff --git a/snapshots/overlay/overlay.go b/snapshots/overlay/overlay.go
index a07906f57..f85bf93c0 100644
--- a/snapshots/overlay/overlay.go
+++ b/snapshots/overlay/overlay.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/snapshots/overlay/overlay_test.go b/snapshots/overlay/overlay_test.go
index af9d876bc..defdfdbc9 100644
--- a/snapshots/overlay/overlay_test.go
+++ b/snapshots/overlay/overlay_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/snapshots/overlay/overlayutils/check.go b/snapshots/overlay/overlayutils/check.go
index bbe2a7de1..602b1f46c 100644
--- a/snapshots/overlay/overlayutils/check.go
+++ b/snapshots/overlay/overlayutils/check.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/snapshots/overlay/overlayutils/check_test.go b/snapshots/overlay/overlayutils/check_test.go
index 77a287296..34863e774 100644
--- a/snapshots/overlay/overlayutils/check_test.go
+++ b/snapshots/overlay/overlayutils/check_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/snapshots/overlay/plugin/plugin.go b/snapshots/overlay/plugin/plugin.go
index c6584a819..460ede81e 100644
--- a/snapshots/overlay/plugin/plugin.go
+++ b/snapshots/overlay/plugin/plugin.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/snapshots/testsuite/helpers_other.go b/snapshots/testsuite/helpers_other.go
index aeebd7da1..2c5f65a96 100644
--- a/snapshots/testsuite/helpers_other.go
+++ b/snapshots/testsuite/helpers_other.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 /*
diff --git a/snapshots/testsuite/testsuite_unix.go b/snapshots/testsuite/testsuite_unix.go
index adc0ef478..94b8218e2 100644
--- a/snapshots/testsuite/testsuite_unix.go
+++ b/snapshots/testsuite/testsuite_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/snapshotter_default_unix.go b/snapshotter_default_unix.go
index eb001c7d3..dcba4792c 100644
--- a/snapshotter_default_unix.go
+++ b/snapshotter_default_unix.go
@@ -1,3 +1,4 @@
+//go:build darwin || freebsd || solaris
 // +build darwin freebsd solaris
 
 /*
diff --git a/snapshotter_opts_unix.go b/snapshotter_opts_unix.go
index 1964379d4..2a2c829f0 100644
--- a/snapshotter_opts_unix.go
+++ b/snapshotter_opts_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/sys/epoll.go b/sys/epoll.go
index 28d6c2cab..73a57013f 100644
--- a/sys/epoll.go
+++ b/sys/epoll.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/sys/fds.go b/sys/fds.go
index db3cf702f..8b1ba8d70 100644
--- a/sys/fds.go
+++ b/sys/fds.go
@@ -1,3 +1,4 @@
+//go:build !windows && !darwin
 // +build !windows,!darwin
 
 /*
diff --git a/sys/filesys_unix.go b/sys/filesys_unix.go
index d8329af9f..805a7a736 100644
--- a/sys/filesys_unix.go
+++ b/sys/filesys_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/sys/oom_unsupported.go b/sys/oom_unsupported.go
index f5d7e9786..fa0db5a10 100644
--- a/sys/oom_unsupported.go
+++ b/sys/oom_unsupported.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 /*
diff --git a/sys/reaper/reaper_unix.go b/sys/reaper/reaper_unix.go
index 0033178df..41f905f6b 100644
--- a/sys/reaper/reaper_unix.go
+++ b/sys/reaper/reaper_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/sys/socket_unix.go b/sys/socket_unix.go
index b67cc1fa3..eb803503e 100644
--- a/sys/socket_unix.go
+++ b/sys/socket_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*
diff --git a/task_opts_unix.go b/task_opts_unix.go
index a710b358f..639fb7c53 100644
--- a/task_opts_unix.go
+++ b/task_opts_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*