diff --git a/archive/tar_mostunix.go b/archive/tar_mostunix.go
index d2d970356c..ca5e602a03 100644
--- a/archive/tar_mostunix.go
+++ b/archive/tar_mostunix.go
@@ -1,5 +1,4 @@
 //go:build !windows && !freebsd
-// +build !windows,!freebsd
 
 /*
    Copyright The containerd Authors.
diff --git a/archive/tar_test.go b/archive/tar_test.go
index 78dfbea764..01b00e43f3 100644
--- a/archive/tar_test.go
+++ b/archive/tar_test.go
@@ -1,5 +1,4 @@
 //go:build !windows && !darwin
-// +build !windows,!darwin
 
 /*
    Copyright The containerd Authors.
diff --git a/archive/tar_unix.go b/archive/tar_unix.go
index 7029e56e62..8e883eee62 100644
--- a/archive/tar_unix.go
+++ b/archive/tar_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/archive/time_unix.go b/archive/time_unix.go
index 043e374538..b5a10d528f 100644
--- a/archive/time_unix.go
+++ b/archive/time_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/cio/io_unix.go b/cio/io_unix.go
index 5606cc88a9..fddbe58c5f 100644
--- a/cio/io_unix.go
+++ b/cio/io_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/cio/io_unix_test.go b/cio/io_unix_test.go
index 53766179fa..ec94392f13 100644
--- a/cio/io_unix_test.go
+++ b/cio/io_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/cmd/containerd-shim-runc-v1/main.go b/cmd/containerd-shim-runc-v1/main.go
index 9db5092904..4843c3ae69 100644
--- a/cmd/containerd-shim-runc-v1/main.go
+++ b/cmd/containerd-shim-runc-v1/main.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/cmd/containerd-shim-runc-v2/main.go b/cmd/containerd-shim-runc-v2/main.go
index c5454bba31..b57ed16ef4 100644
--- a/cmd/containerd-shim-runc-v2/main.go
+++ b/cmd/containerd-shim-runc-v2/main.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/cmd/containerd-shim/main_unix.go b/cmd/containerd-shim/main_unix.go
index c6235f7cfc..94a9f0ca4c 100644
--- a/cmd/containerd-shim/main_unix.go
+++ b/cmd/containerd-shim/main_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/cmd/containerd-stress/rlimit_unix.go b/cmd/containerd-stress/rlimit_unix.go
index e8fa749a23..7c53f2adfc 100644
--- a/cmd/containerd-stress/rlimit_unix.go
+++ b/cmd/containerd-stress/rlimit_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows && !freebsd
-// +build !windows,!freebsd
 
 /*
    Copyright The containerd Authors.
diff --git a/cmd/containerd/builtins/aufs_linux.go b/cmd/containerd/builtins/aufs_linux.go
index f7f77057cc..f655215a35 100644
--- a/cmd/containerd/builtins/aufs_linux.go
+++ b/cmd/containerd/builtins/aufs_linux.go
@@ -1,5 +1,4 @@
 //go:build !no_aufs
-// +build !no_aufs
 
 /*
    Copyright The containerd Authors.
diff --git a/cmd/containerd/builtins/btrfs_linux.go b/cmd/containerd/builtins/btrfs_linux.go
index a66ab284bc..17bf8dfe95 100644
--- a/cmd/containerd/builtins/btrfs_linux.go
+++ b/cmd/containerd/builtins/btrfs_linux.go
@@ -1,5 +1,4 @@
 //go:build !no_btrfs && cgo
-// +build !no_btrfs,cgo
 
 /*
    Copyright The containerd Authors.
diff --git a/cmd/containerd/builtins/builtins_unix.go b/cmd/containerd/builtins/builtins_unix.go
index 5b9eced4b8..f10915e4f2 100644
--- a/cmd/containerd/builtins/builtins_unix.go
+++ b/cmd/containerd/builtins/builtins_unix.go
@@ -1,5 +1,4 @@
 //go:build darwin || freebsd || solaris
-// +build darwin freebsd solaris
 
 /*
    Copyright The containerd Authors.
diff --git a/cmd/containerd/builtins/devmapper_linux.go b/cmd/containerd/builtins/devmapper_linux.go
index b1b0578f06..818ae12827 100644
--- a/cmd/containerd/builtins/devmapper_linux.go
+++ b/cmd/containerd/builtins/devmapper_linux.go
@@ -1,5 +1,4 @@
 //go:build !no_devmapper
-// +build !no_devmapper
 
 /*
    Copyright The containerd Authors.
diff --git a/cmd/containerd/builtins/tracing.go b/cmd/containerd/builtins/tracing.go
index a1d068e561..9354bc7a79 100644
--- a/cmd/containerd/builtins/tracing.go
+++ b/cmd/containerd/builtins/tracing.go
@@ -1,5 +1,4 @@
 //go:build !no_tracing
-// +build !no_tracing
 
 /*
    Copyright The containerd Authors.
diff --git a/cmd/containerd/builtins/zfs_linux.go b/cmd/containerd/builtins/zfs_linux.go
index 48e47a6fd2..5cd0869d18 100644
--- a/cmd/containerd/builtins/zfs_linux.go
+++ b/cmd/containerd/builtins/zfs_linux.go
@@ -1,5 +1,4 @@
 //go:build !no_zfs
-// +build !no_zfs
 
 /*
    Copyright The containerd Authors.
diff --git a/cmd/containerd/command/main_unix.go b/cmd/containerd/command/main_unix.go
index bf068e5864..927865a8d2 100644
--- a/cmd/containerd/command/main_unix.go
+++ b/cmd/containerd/command/main_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || darwin || freebsd || solaris
-// +build linux darwin freebsd solaris
 
 /*
    Copyright The containerd Authors.
diff --git a/cmd/containerd/command/notify_unsupported.go b/cmd/containerd/command/notify_unsupported.go
index 76b3f8580e..aeaebfc339 100644
--- a/cmd/containerd/command/notify_unsupported.go
+++ b/cmd/containerd/command/notify_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 /*
    Copyright The containerd Authors.
diff --git a/cmd/containerd/command/service_unsupported.go b/cmd/containerd/command/service_unsupported.go
index 2ea02af6e0..9cd0114681 100644
--- a/cmd/containerd/command/service_unsupported.go
+++ b/cmd/containerd/command/service_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/cmd/ctr/app/main_unix.go b/cmd/ctr/app/main_unix.go
index f922e4e04c..d807263255 100644
--- a/cmd/ctr/app/main_unix.go
+++ b/cmd/ctr/app/main_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/cmd/ctr/commands/commands_unix.go b/cmd/ctr/commands/commands_unix.go
index 311131aa89..1265fa8858 100644
--- a/cmd/ctr/commands/commands_unix.go
+++ b/cmd/ctr/commands/commands_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/cmd/ctr/commands/namespaces/namespaces_other.go b/cmd/ctr/commands/namespaces/namespaces_other.go
index 4e99d60007..c4c342d5ea 100644
--- a/cmd/ctr/commands/namespaces/namespaces_other.go
+++ b/cmd/ctr/commands/namespaces/namespaces_other.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 /*
    Copyright The containerd Authors.
diff --git a/cmd/ctr/commands/pprof/pprof_unix.go b/cmd/ctr/commands/pprof/pprof_unix.go
index de662a2b48..4ab8a74853 100644
--- a/cmd/ctr/commands/pprof/pprof_unix.go
+++ b/cmd/ctr/commands/pprof/pprof_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/cmd/ctr/commands/run/run_unix.go b/cmd/ctr/commands/run/run_unix.go
index 337c762505..4b3881263c 100644
--- a/cmd/ctr/commands/run/run_unix.go
+++ b/cmd/ctr/commands/run/run_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/cmd/ctr/commands/shim/io_unix.go b/cmd/ctr/commands/shim/io_unix.go
index 7806ad88f5..f85c1d2c32 100644
--- a/cmd/ctr/commands/shim/io_unix.go
+++ b/cmd/ctr/commands/shim/io_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/cmd/ctr/commands/shim/shim.go b/cmd/ctr/commands/shim/shim.go
index c4f9e22e75..f69d9980f0 100644
--- a/cmd/ctr/commands/shim/shim.go
+++ b/cmd/ctr/commands/shim/shim.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/cmd/ctr/commands/signals_notlinux.go b/cmd/ctr/commands/signals_notlinux.go
index 1e0fbe66b0..48f32b8f8d 100644
--- a/cmd/ctr/commands/signals_notlinux.go
+++ b/cmd/ctr/commands/signals_notlinux.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 /*
    Copyright The containerd Authors.
diff --git a/cmd/ctr/commands/tasks/tasks_unix.go b/cmd/ctr/commands/tasks/tasks_unix.go
index 9114ebfa26..a833779c8a 100644
--- a/cmd/ctr/commands/tasks/tasks_unix.go
+++ b/cmd/ctr/commands/tasks/tasks_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/container_opts_unix.go b/container_opts_unix.go
index b6fc37db92..016c1a9258 100644
--- a/container_opts_unix.go
+++ b/container_opts_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/defaults/defaults_unix.go b/defaults/defaults_unix.go
index 8e2619a381..c79f9ba7df 100644
--- a/defaults/defaults_unix.go
+++ b/defaults/defaults_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows && !darwin
-// +build !windows,!darwin
 
 /*
    Copyright The containerd Authors.
diff --git a/diff/stream_unix.go b/diff/stream_unix.go
index 6e0a44e017..dbc11a54f5 100644
--- a/diff/stream_unix.go
+++ b/diff/stream_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/integration/addition_gids_test.go b/integration/addition_gids_test.go
index 2c3ae037b4..d57fe0984b 100644
--- a/integration/addition_gids_test.go
+++ b/integration/addition_gids_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/integration/container_update_resources_test.go b/integration/container_update_resources_test.go
index e61df18684..f243be540b 100644
--- a/integration/container_update_resources_test.go
+++ b/integration/container_update_resources_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/integration/sandbox_clean_remove_test.go b/integration/sandbox_clean_remove_test.go
index 95e5a49cbc..5b369d8ee5 100644
--- a/integration/sandbox_clean_remove_test.go
+++ b/integration/sandbox_clean_remove_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/integration/sandbox_clean_remove_windows_test.go b/integration/sandbox_clean_remove_windows_test.go
index 8a1606d5bb..74a7db693f 100644
--- a/integration/sandbox_clean_remove_windows_test.go
+++ b/integration/sandbox_clean_remove_windows_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 /*
    Copyright The containerd Authors.
diff --git a/integration/sandbox_run_rollback_test.go b/integration/sandbox_run_rollback_test.go
index a2e2c497db..d581c91595 100644
--- a/integration/sandbox_run_rollback_test.go
+++ b/integration/sandbox_run_rollback_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/integration/shim_dial_unix_test.go b/integration/shim_dial_unix_test.go
index 981fe05759..aef3f48624 100644
--- a/integration/shim_dial_unix_test.go
+++ b/integration/shim_dial_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/integration/volume_copy_up_unix_test.go b/integration/volume_copy_up_unix_test.go
index 1dc76abc6b..b72535df66 100644
--- a/integration/volume_copy_up_unix_test.go
+++ b/integration/volume_copy_up_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/integration/volume_copy_up_windows_test.go b/integration/volume_copy_up_windows_test.go
index 3ea5b2b185..a2c719d964 100644
--- a/integration/volume_copy_up_windows_test.go
+++ b/integration/volume_copy_up_windows_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 /*
    Copyright The containerd Authors.
diff --git a/integration/windows_hostprocess_test.go b/integration/windows_hostprocess_test.go
index 7fe6517955..f47a490030 100644
--- a/integration/windows_hostprocess_test.go
+++ b/integration/windows_hostprocess_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 /*
    Copyright The containerd Authors.
diff --git a/integration/windows_rootfs_size_test.go b/integration/windows_rootfs_size_test.go
index 733458d819..b36c929c17 100644
--- a/integration/windows_rootfs_size_test.go
+++ b/integration/windows_rootfs_size_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 /*
    Copyright The containerd Authors.
diff --git a/mount/lookup_unix.go b/mount/lookup_unix.go
index 44881750b2..6fb16f6dd1 100644
--- a/mount/lookup_unix.go
+++ b/mount/lookup_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/mount/lookup_unsupported.go b/mount/lookup_unsupported.go
index 2e954b1ae5..1daf96d5c9 100644
--- a/mount/lookup_unsupported.go
+++ b/mount/lookup_unsupported.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 /*
    Copyright The containerd Authors.
diff --git a/mount/mount_unix.go b/mount/mount_unix.go
index 795bb4bfe1..68d1119a3f 100644
--- a/mount/mount_unix.go
+++ b/mount/mount_unix.go
@@ -1,5 +1,4 @@
 //go:build darwin || openbsd
-// +build darwin openbsd
 
 /*
    Copyright The containerd Authors.
diff --git a/mount/temp_unix.go b/mount/temp_unix.go
index e969700818..5ddd2cd160 100644
--- a/mount/temp_unix.go
+++ b/mount/temp_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows && !darwin
-// +build !windows,!darwin
 
 /*
    Copyright The containerd Authors.
diff --git a/mount/temp_unsupported.go b/mount/temp_unsupported.go
index feec90a76f..3ccc0444ff 100644
--- a/mount/temp_unsupported.go
+++ b/mount/temp_unsupported.go
@@ -1,5 +1,4 @@
 //go:build windows || darwin
-// +build windows darwin
 
 /*
    Copyright The containerd Authors.
diff --git a/oci/mounts.go b/oci/mounts.go
index 83dd0d0b10..934d451669 100644
--- a/oci/mounts.go
+++ b/oci/mounts.go
@@ -1,5 +1,4 @@
 //go:build !freebsd
-// +build !freebsd
 
 /*
    Copyright The containerd Authors.
diff --git a/oci/spec_opts_nonlinux.go b/oci/spec_opts_nonlinux.go
index 30aedd6cdd..eb6de026a1 100644
--- a/oci/spec_opts_nonlinux.go
+++ b/oci/spec_opts_nonlinux.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 /*
    Copyright The containerd Authors.
diff --git a/oci/spec_opts_unix.go b/oci/spec_opts_unix.go
index a6165777fe..e1c66bfaa9 100644
--- a/oci/spec_opts_unix.go
+++ b/oci/spec_opts_unix.go
@@ -1,5 +1,4 @@
 //go:build !linux && !windows
-// +build !linux,!windows
 
 /*
    Copyright The containerd Authors.
diff --git a/oci/spec_opts_unix_test.go b/oci/spec_opts_unix_test.go
index 85d15bdd06..cf7f768bff 100644
--- a/oci/spec_opts_unix_test.go
+++ b/oci/spec_opts_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/oci/utils_unix.go b/oci/utils_unix.go
index 306f098146..b3cb8a600d 100644
--- a/oci/utils_unix.go
+++ b/oci/utils_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/oci/utils_unix_go116_test.go b/oci/utils_unix_go116_test.go
index b1fa01b19d..bd6b41f4ad 100644
--- a/oci/utils_unix_go116_test.go
+++ b/oci/utils_unix_go116_test.go
@@ -1,5 +1,4 @@
 //go:build !go1.17 && !windows && !darwin
-// +build !go1.17,!windows,!darwin
 
 /*
    Copyright The containerd Authors.
diff --git a/oci/utils_unix_go117_test.go b/oci/utils_unix_go117_test.go
index 20ef980ce8..166dfa0c7a 100644
--- a/oci/utils_unix_go117_test.go
+++ b/oci/utils_unix_go117_test.go
@@ -1,5 +1,4 @@
 //go:build go1.17 && !windows && !darwin
-// +build go1.17,!windows,!darwin
 
 /*
    Copyright The containerd Authors.
diff --git a/oci/utils_unix_test.go b/oci/utils_unix_test.go
index 49a5071dbf..18d4e944ec 100644
--- a/oci/utils_unix_test.go
+++ b/oci/utils_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows && !darwin
-// +build !windows,!darwin
 
 /*
    Copyright The containerd Authors.
diff --git a/oss_fuzz.go b/oss_fuzz.go
index 1ee97d0ba2..8d1def4f09 100644
--- a/oss_fuzz.go
+++ b/oss_fuzz.go
@@ -1,5 +1,4 @@
 //go:build gofuzz
-// +build gofuzz
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/config/config_unix.go b/pkg/cri/config/config_unix.go
index dad45de2cc..0e8b393af0 100644
--- a/pkg/cri/config/config_unix.go
+++ b/pkg/cri/config/config_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/io/helpers_unix.go b/pkg/cri/io/helpers_unix.go
index 7852b5607e..1cccd5501d 100644
--- a/pkg/cri/io/helpers_unix.go
+++ b/pkg/cri/io/helpers_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/server/bandwidth/linux.go b/pkg/cri/server/bandwidth/linux.go
index 6456c4a6a8..ebf38cb9f5 100644
--- a/pkg/cri/server/bandwidth/linux.go
+++ b/pkg/cri/server/bandwidth/linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/server/blockio_linux.go b/pkg/cri/server/blockio_linux.go
index f7b3bccafb..f107471758 100644
--- a/pkg/cri/server/blockio_linux.go
+++ b/pkg/cri/server/blockio_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/server/blockio_stub_linux.go b/pkg/cri/server/blockio_stub_linux.go
index 20503c2ce1..0f17d54ed4 100644
--- a/pkg/cri/server/blockio_stub_linux.go
+++ b/pkg/cri/server/blockio_stub_linux.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/server/container_create_other.go b/pkg/cri/server/container_create_other.go
index d89516e40f..9cfb15a04a 100644
--- a/pkg/cri/server/container_create_other.go
+++ b/pkg/cri/server/container_create_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/server/container_create_other_test.go b/pkg/cri/server/container_create_other_test.go
index 50be4cc991..5a539e4571 100644
--- a/pkg/cri/server/container_create_other_test.go
+++ b/pkg/cri/server/container_create_other_test.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/server/container_stats_list_other.go b/pkg/cri/server/container_stats_list_other.go
index bed0b6b6a6..7f1fe2e3c8 100644
--- a/pkg/cri/server/container_stats_list_other.go
+++ b/pkg/cri/server/container_stats_list_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/server/container_update_resources.go b/pkg/cri/server/container_update_resources.go
index 3ca2bbee54..88edcdf006 100644
--- a/pkg/cri/server/container_update_resources.go
+++ b/pkg/cri/server/container_update_resources.go
@@ -1,5 +1,4 @@
 //go:build !darwin && !freebsd
-// +build !darwin,!freebsd
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/server/container_update_resources_other.go b/pkg/cri/server/container_update_resources_other.go
index b59c470d82..4bf801ec24 100644
--- a/pkg/cri/server/container_update_resources_other.go
+++ b/pkg/cri/server/container_update_resources_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/server/fuzz.go b/pkg/cri/server/fuzz.go
index eed1b7a862..347be7feb1 100644
--- a/pkg/cri/server/fuzz.go
+++ b/pkg/cri/server/fuzz.go
@@ -1,5 +1,4 @@
 //go:build gofuzz
-// +build gofuzz
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/server/helpers_other.go b/pkg/cri/server/helpers_other.go
index 99df63e9b9..f877539a72 100644
--- a/pkg/cri/server/helpers_other.go
+++ b/pkg/cri/server/helpers_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/server/rdt_linux.go b/pkg/cri/server/rdt_linux.go
index 38a9395c57..ac82411637 100644
--- a/pkg/cri/server/rdt_linux.go
+++ b/pkg/cri/server/rdt_linux.go
@@ -1,5 +1,4 @@
 //go:build !no_rdt
-// +build !no_rdt
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/server/rdt_stub_linux.go b/pkg/cri/server/rdt_stub_linux.go
index 179493562e..16d3e606e7 100644
--- a/pkg/cri/server/rdt_stub_linux.go
+++ b/pkg/cri/server/rdt_stub_linux.go
@@ -1,5 +1,4 @@
 //go:build no_rdt
-// +build no_rdt
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/server/sandbox_portforward_other.go b/pkg/cri/server/sandbox_portforward_other.go
index 9ce3e48126..9ba3fe1628 100644
--- a/pkg/cri/server/sandbox_portforward_other.go
+++ b/pkg/cri/server/sandbox_portforward_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/server/sandbox_run_other.go b/pkg/cri/server/sandbox_run_other.go
index cd39d6fe53..150cc917d2 100644
--- a/pkg/cri/server/sandbox_run_other.go
+++ b/pkg/cri/server/sandbox_run_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/server/sandbox_run_other_test.go b/pkg/cri/server/sandbox_run_other_test.go
index b87508959c..b3a293fa3e 100644
--- a/pkg/cri/server/sandbox_run_other_test.go
+++ b/pkg/cri/server/sandbox_run_other_test.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/server/sandbox_stats_other.go b/pkg/cri/server/sandbox_stats_other.go
index e995399037..f28753a0e6 100644
--- a/pkg/cri/server/sandbox_stats_other.go
+++ b/pkg/cri/server/sandbox_stats_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/server/service_other.go b/pkg/cri/server/service_other.go
index 35c57259be..3b57c12c0b 100644
--- a/pkg/cri/server/service_other.go
+++ b/pkg/cri/server/service_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/os/mount_other.go b/pkg/os/mount_other.go
index eb85004659..71ab91c99c 100644
--- a/pkg/os/mount_other.go
+++ b/pkg/os/mount_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/os/mount_unix.go b/pkg/os/mount_unix.go
index 27ec8a9ef5..bc3423797d 100644
--- a/pkg/os/mount_unix.go
+++ b/pkg/os/mount_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/os/os_unix.go b/pkg/os/os_unix.go
index 429a901ac3..be64d9c947 100644
--- a/pkg/os/os_unix.go
+++ b/pkg/os/os_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/os/testing/fake_os_unix.go b/pkg/os/testing/fake_os_unix.go
index 2cc3c166a4..0f65f3ac8b 100644
--- a/pkg/os/testing/fake_os_unix.go
+++ b/pkg/os/testing/fake_os_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/platforms/defaults_darwin.go b/platforms/defaults_darwin.go
index e249fe48d3..72355ca85f 100644
--- a/platforms/defaults_darwin.go
+++ b/platforms/defaults_darwin.go
@@ -1,5 +1,4 @@
 //go:build darwin
-// +build darwin
 
 /*
    Copyright The containerd Authors.
diff --git a/platforms/defaults_unix.go b/platforms/defaults_unix.go
index 34ae081315..44acc47eb3 100644
--- a/platforms/defaults_unix.go
+++ b/platforms/defaults_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows && !darwin && !freebsd
-// +build !windows,!darwin,!freebsd
 
 /*
    Copyright The containerd Authors.
diff --git a/platforms/defaults_unix_test.go b/platforms/defaults_unix_test.go
index a718c5c735..8aba958772 100644
--- a/platforms/defaults_unix_test.go
+++ b/platforms/defaults_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/platforms/platforms_other.go b/platforms/platforms_other.go
index 71edbe2903..03f4dcd998 100644
--- a/platforms/platforms_other.go
+++ b/platforms/platforms_other.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/plugin/plugin_go18.go b/plugin/plugin_go18.go
index 0df0669d29..0ee442d955 100644
--- a/plugin/plugin_go18.go
+++ b/plugin/plugin_go18.go
@@ -1,5 +1,4 @@
 //go:build go1.8 && !windows && amd64 && !static_build && !gccgo
-// +build go1.8,!windows,amd64,!static_build,!gccgo
 
 /*
    Copyright The containerd Authors.
diff --git a/plugin/plugin_other.go b/plugin/plugin_other.go
index a2883bbbad..c0b53a6b4d 100644
--- a/plugin/plugin_other.go
+++ b/plugin/plugin_other.go
@@ -1,5 +1,4 @@
 //go:build !go1.8 || windows || !amd64 || static_build || gccgo
-// +build !go1.8 windows !amd64 static_build gccgo
 
 /*
    Copyright The containerd Authors.
diff --git a/rootfs/init_other.go b/rootfs/init_other.go
index d8e38d4c78..049cff2880 100644
--- a/rootfs/init_other.go
+++ b/rootfs/init_other.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 /*
    Copyright The containerd Authors.
diff --git a/runtime/v1/shim.go b/runtime/v1/shim.go
index 34d0dbcd04..1e55a0eb1f 100644
--- a/runtime/v1/shim.go
+++ b/runtime/v1/shim.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/runtime/v1/shim/service.go b/runtime/v1/shim/service.go
index 45b1a5c16d..7e743d8c8b 100644
--- a/runtime/v1/shim/service.go
+++ b/runtime/v1/shim/service.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/runtime/v1/shim/service_unix.go b/runtime/v1/shim/service_unix.go
index 2e6bfb2f01..09aa963034 100644
--- a/runtime/v1/shim/service_unix.go
+++ b/runtime/v1/shim/service_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux
 
 /*
    Copyright The containerd Authors.
diff --git a/runtime/v2/runc/container.go b/runtime/v2/runc/container.go
index 43df6801cc..95cdbbbcfe 100644
--- a/runtime/v2/runc/container.go
+++ b/runtime/v2/runc/container.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/runtime/v2/runc/task/service.go b/runtime/v2/runc/task/service.go
index 4febbbee09..e9f7c9aee0 100644
--- a/runtime/v2/runc/task/service.go
+++ b/runtime/v2/runc/task/service.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/runtime/v2/runc/v1/service.go b/runtime/v2/runc/v1/service.go
index 0eb039f8c0..fba7f6a24f 100644
--- a/runtime/v2/runc/v1/service.go
+++ b/runtime/v2/runc/v1/service.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/runtime/v2/runc/v2/service.go b/runtime/v2/runc/v2/service.go
index db2625473d..e595075a11 100644
--- a/runtime/v2/runc/v2/service.go
+++ b/runtime/v2/runc/v2/service.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/runtime/v2/shim/util_unix.go b/runtime/v2/shim/util_unix.go
index 1d6c09a67b..ac470f914c 100644
--- a/runtime/v2/shim/util_unix.go
+++ b/runtime/v2/shim/util_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/snapshotter_default_unix.go b/snapshotter_default_unix.go
index dcba4792cc..8e191ca6ac 100644
--- a/snapshotter_default_unix.go
+++ b/snapshotter_default_unix.go
@@ -1,5 +1,4 @@
 //go:build darwin || freebsd || solaris
-// +build darwin freebsd solaris
 
 /*
    Copyright The containerd Authors.
diff --git a/snapshotter_opts_unix.go b/snapshotter_opts_unix.go
index 2a2c829f01..e25588b090 100644
--- a/snapshotter_opts_unix.go
+++ b/snapshotter_opts_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/sys/filesys_unix.go b/sys/filesys_unix.go
index 4624f7253a..333e85ceb4 100644
--- a/sys/filesys_unix.go
+++ b/sys/filesys_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/sys/oom_unsupported.go b/sys/oom_unsupported.go
index fa0db5a10e..f579774663 100644
--- a/sys/oom_unsupported.go
+++ b/sys/oom_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 /*
    Copyright The containerd Authors.
diff --git a/sys/socket_unix.go b/sys/socket_unix.go
index 367e19cad8..5ecbeddc91 100644
--- a/sys/socket_unix.go
+++ b/sys/socket_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/task_opts_unix.go b/task_opts_unix.go
index 1d5983b629..5e5e66a6f8 100644
--- a/task_opts_unix.go
+++ b/task_opts_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.