diff --git a/archive/tar_mostunix.go b/archive/tar_mostunix.go
index d2d970356..ca5e602a0 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 78dfbea76..01b00e43f 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 7029e56e6..8e883eee6 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 043e37453..b5a10d528 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 5606cc88a..fddbe58c5 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 53766179f..ec94392f1 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 9db509290..4843c3ae6 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 c5454bba3..b57ed16ef 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 c6235f7cf..94a9f0ca4 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 e8fa749a2..7c53f2adf 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 f7f77057c..f655215a3 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 a66ab284b..17bf8dfe9 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 5b9eced4b..f10915e4f 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 b1b0578f0..818ae1282 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 a1d068e56..9354bc7a7 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 48e47a6fd..5cd0869d1 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 bf068e586..927865a8d 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 76b3f8580..aeaebfc33 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 2ea02af6e..9cd011468 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 f922e4e04..d80726325 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 311131aa8..1265fa885 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 4e99d6000..c4c342d5e 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 de662a2b4..4ab8a7485 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 337c76250..4b3881263 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 7806ad88f..f85c1d2c3 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 c4f9e22e7..f69d9980f 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 1e0fbe66b..48f32b8f8 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 9114ebfa2..a833779c8 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 b6fc37db9..016c1a925 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 8e2619a38..c79f9ba7d 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 6e0a44e01..dbc11a54f 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 2c3ae037b..d57fe0984 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 e61df1868..f243be540 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 95e5a49cb..5b369d8ee 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 8a1606d5b..74a7db693 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 a2e2c497d..d581c9159 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 981fe0575..aef3f4862 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 1dc76abc6..b72535df6 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 3ea5b2b18..a2c719d96 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 7fe651795..f47a49003 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 733458d81..b36c929c1 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 44881750b..6fb16f6dd 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 2e954b1ae..1daf96d5c 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 795bb4bfe..68d1119a3 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 e96970081..5ddd2cd16 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 feec90a76..3ccc0444f 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 83dd0d0b1..934d45166 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 30aedd6cd..eb6de026a 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 a6165777f..e1c66bfaa 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 85d15bdd0..cf7f768bf 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 306f09814..b3cb8a600 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 b1fa01b19..bd6b41f4a 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 20ef980ce..166dfa0c7 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 49a5071db..18d4e944e 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 1ee97d0ba..8d1def4f0 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 dad45de2c..0e8b393af 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 7852b5607..1cccd5501 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 6456c4a6a..ebf38cb9f 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 f7b3bccaf..f10747175 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 20503c2ce..0f17d54ed 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 d89516e40..9cfb15a04 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 50be4cc99..5a539e457 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 bed0b6b6a..7f1fe2e3c 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 3ca2bbee5..88edcdf00 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 b59c470d8..4bf801ec2 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 eed1b7a86..347be7feb 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 99df63e9b..f877539a7 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 38a9395c5..ac8241163 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 179493562..16d3e606e 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 9ce3e4812..9ba3fe162 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 cd39d6fe5..150cc917d 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 b87508959..b3a293fa3 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 e99539903..f28753a0e 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 35c57259b..3b57c12c0 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 eb8500465..71ab91c99 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 27ec8a9ef..bc3423797 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 429a901ac..be64d9c94 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 2cc3c166a..0f65f3ac8 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 e249fe48d..72355ca85 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 34ae08131..44acc47eb 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 a718c5c73..8aba95877 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 71edbe290..03f4dcd99 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 0df0669d2..0ee442d95 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 a2883bbba..c0b53a6b4 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 d8e38d4c7..049cff288 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 34d0dbcd0..1e55a0eb1 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 45b1a5c16..7e743d8c8 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 2e6bfb2f0..09aa96303 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 43df6801c..95cdbbbcf 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 4febbbee0..e9f7c9aee 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 0eb039f8c..fba7f6a24 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 db2625473..e595075a1 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 1d6c09a67..ac470f914 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 dcba4792c..8e191ca6a 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 2a2c829f0..e25588b09 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 4624f7253..333e85ceb 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 fa0db5a10..f57977466 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 367e19cad..5ecbeddc9 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 1d5983b62..5e5e66a6f 100644
--- a/task_opts_unix.go
+++ b/task_opts_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.