diff --git a/cache/blobs_linux.go b/cache/blobs_linux.go
index 15ec1696b691..2231373ea79c 100644
--- a/cache/blobs_linux.go
+++ b/cache/blobs_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package cache
 
diff --git a/cache/blobs_nolinux.go b/cache/blobs_nolinux.go
index 0c1c99efee57..da6554e89cb5 100644
--- a/cache/blobs_nolinux.go
+++ b/cache/blobs_nolinux.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package cache
 
diff --git a/cache/compression_nydus.go b/cache/compression_nydus.go
index 3dfdaef16264..d15b341ea715 100644
--- a/cache/compression_nydus.go
+++ b/cache/compression_nydus.go
@@ -1,5 +1,4 @@
 //go:build nydus
-// +build nydus
 
 package cache
 
diff --git a/cache/contenthash/checksum_unix.go b/cache/contenthash/checksum_unix.go
index 444518ddd814..3918918d8362 100644
--- a/cache/contenthash/checksum_unix.go
+++ b/cache/contenthash/checksum_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package contenthash
 
diff --git a/cache/contenthash/filehash_unix.go b/cache/contenthash/filehash_unix.go
index a566f2fd7760..a34ec626542d 100644
--- a/cache/contenthash/filehash_unix.go
+++ b/cache/contenthash/filehash_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package contenthash
 
diff --git a/cache/contenthash/filehash_windows.go b/cache/contenthash/filehash_windows.go
index 3913b9a56fc1..7870eccc7978 100644
--- a/cache/contenthash/filehash_windows.go
+++ b/cache/contenthash/filehash_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package contenthash
 
diff --git a/client/client_nydus_test.go b/client/client_nydus_test.go
index 5a4294b540e9..cbdfcf32f46b 100644
--- a/client/client_nydus_test.go
+++ b/client/client_nydus_test.go
@@ -1,5 +1,4 @@
 //go:build nydus
-// +build nydus
 
 package client
 
diff --git a/client/mergediff_linux_test.go b/client/mergediff_linux_test.go
index 578530085bee..8e35d9e7190a 100644
--- a/client/mergediff_linux_test.go
+++ b/client/mergediff_linux_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package client
 
diff --git a/client/mergediff_nolinux_test.go b/client/mergediff_nolinux_test.go
index 18da8cd2b9bf..e9dc8b98678c 100644
--- a/client/mergediff_nolinux_test.go
+++ b/client/mergediff_nolinux_test.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package client
 
diff --git a/cmd/buildctl/main_unix.go b/cmd/buildctl/main_unix.go
index 9ac70d3e434c..58dea3d4a6a9 100644
--- a/cmd/buildctl/main_unix.go
+++ b/cmd/buildctl/main_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 
diff --git a/cmd/buildkitd/config/gcpolicy_unix.go b/cmd/buildkitd/config/gcpolicy_unix.go
index ce86993cdb95..78f5e0c96fda 100644
--- a/cmd/buildkitd/config/gcpolicy_unix.go
+++ b/cmd/buildkitd/config/gcpolicy_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package config
 
diff --git a/cmd/buildkitd/config/gcpolicy_windows.go b/cmd/buildkitd/config/gcpolicy_windows.go
index 429307a4c8f9..e7af6fef2431 100644
--- a/cmd/buildkitd/config/gcpolicy_windows.go
+++ b/cmd/buildkitd/config/gcpolicy_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package config
 
diff --git a/cmd/buildkitd/main_containerd_worker_unix.go b/cmd/buildkitd/main_containerd_worker_unix.go
index a17052142e5c..d530e6f42540 100644
--- a/cmd/buildkitd/main_containerd_worker_unix.go
+++ b/cmd/buildkitd/main_containerd_worker_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 
diff --git a/cmd/buildkitd/main_oci_worker.go b/cmd/buildkitd/main_oci_worker.go
index 91d4d3d2aa8a..2107116fb28d 100644
--- a/cmd/buildkitd/main_oci_worker.go
+++ b/cmd/buildkitd/main_oci_worker.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package main
 
diff --git a/cmd/buildkitd/main_unix.go b/cmd/buildkitd/main_unix.go
index 1dc3a2ed35c9..7312aa4cc8d4 100644
--- a/cmd/buildkitd/main_unix.go
+++ b/cmd/buildkitd/main_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 
diff --git a/cmd/buildkitd/main_windows.go b/cmd/buildkitd/main_windows.go
index 55aca0a7fa32..35fc19de0c8b 100644
--- a/cmd/buildkitd/main_windows.go
+++ b/cmd/buildkitd/main_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package main
 
diff --git a/cmd/buildkitd/service_unix.go b/cmd/buildkitd/service_unix.go
index 6a243b87d609..120cba88c7ec 100644
--- a/cmd/buildkitd/service_unix.go
+++ b/cmd/buildkitd/service_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 
diff --git a/errdefs/internal_linux.go b/errdefs/internal_linux.go
index ba246c597a73..5134ed5ccc56 100644
--- a/errdefs/internal_linux.go
+++ b/errdefs/internal_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package errdefs
 
diff --git a/errdefs/internal_nolinux.go b/errdefs/internal_nolinux.go
index 5348b32ee7cb..787192d6a540 100644
--- a/errdefs/internal_nolinux.go
+++ b/errdefs/internal_nolinux.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package errdefs
 
diff --git a/examples/gobuild/main.go b/examples/gobuild/main.go
index 8754a78a03f9..420e7090168a 100644
--- a/examples/gobuild/main.go
+++ b/examples/gobuild/main.go
@@ -1,5 +1,4 @@
 //go:build ignore
-// +build ignore
 
 package main
 
diff --git a/executor/containerdexecutor/executor_unix.go b/executor/containerdexecutor/executor_unix.go
index 3f9b98dd227f..f1c5e1f1bee5 100644
--- a/executor/containerdexecutor/executor_unix.go
+++ b/executor/containerdexecutor/executor_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package containerdexecutor
 
diff --git a/executor/oci/spec_windows.go b/executor/oci/spec_windows.go
index f2fd6757c5ab..c02e98dea568 100644
--- a/executor/oci/spec_windows.go
+++ b/executor/oci/spec_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package oci
 
diff --git a/executor/resources/monitor_linux.go b/executor/resources/monitor_linux.go
index aefc2adce7d5..b7e1a260b521 100644
--- a/executor/resources/monitor_linux.go
+++ b/executor/resources/monitor_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package resources
 
diff --git a/executor/resources/monitor_nolinux.go b/executor/resources/monitor_nolinux.go
index 20a50a648cb6..376768c1d150 100644
--- a/executor/resources/monitor_nolinux.go
+++ b/executor/resources/monitor_nolinux.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package resources
 
diff --git a/executor/runcexecutor/executor.go b/executor/runcexecutor/executor.go
index f1a8eab8364e..3f401eb230b9 100644
--- a/executor/runcexecutor/executor.go
+++ b/executor/runcexecutor/executor.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package runcexecutor
 
diff --git a/exporter/containerimage/patch.go b/exporter/containerimage/patch.go
index 14fc34e7065d..dfd5ee9bd028 100644
--- a/exporter/containerimage/patch.go
+++ b/exporter/containerimage/patch.go
@@ -1,5 +1,4 @@
 //go:build !nydus
-// +build !nydus
 
 package containerimage
 
diff --git a/exporter/containerimage/patch_nydus.go b/exporter/containerimage/patch_nydus.go
index 3a9336a66f64..653e41aef155 100644
--- a/exporter/containerimage/patch_nydus.go
+++ b/exporter/containerimage/patch_nydus.go
@@ -1,5 +1,4 @@
 //go:build nydus
-// +build nydus
 
 package containerimage
 
diff --git a/exporter/tar/export_unix.go b/exporter/tar/export_unix.go
index 61a7a5ef1e3a..c8696860b26f 100644
--- a/exporter/tar/export_unix.go
+++ b/exporter/tar/export_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package local
 
diff --git a/frontend/dockerfile/dockerfile2llb/convert_norunsecurity.go b/frontend/dockerfile/dockerfile2llb/convert_norunsecurity.go
index c6f4c68bd1ac..80a2ff9d53f0 100644
--- a/frontend/dockerfile/dockerfile2llb/convert_norunsecurity.go
+++ b/frontend/dockerfile/dockerfile2llb/convert_norunsecurity.go
@@ -1,5 +1,4 @@
 //go:build !dfrunsecurity
-// +build !dfrunsecurity
 
 package dockerfile2llb
 
diff --git a/frontend/dockerfile/dockerfile2llb/convert_runsecurity.go b/frontend/dockerfile/dockerfile2llb/convert_runsecurity.go
index 55c675e7973d..030f237d5c52 100644
--- a/frontend/dockerfile/dockerfile2llb/convert_runsecurity.go
+++ b/frontend/dockerfile/dockerfile2llb/convert_runsecurity.go
@@ -1,5 +1,4 @@
 //go:build dfrunsecurity
-// +build dfrunsecurity
 
 package dockerfile2llb
 
diff --git a/frontend/dockerfile/dockerfile2llb/copy_chmod_non_octal_disabled.go b/frontend/dockerfile/dockerfile2llb/copy_chmod_non_octal_disabled.go
index 81cc54844f80..4866678a2ad6 100644
--- a/frontend/dockerfile/dockerfile2llb/copy_chmod_non_octal_disabled.go
+++ b/frontend/dockerfile/dockerfile2llb/copy_chmod_non_octal_disabled.go
@@ -1,5 +1,4 @@
 //go:build !dfcopychmodnonoctal
-// +build !dfcopychmodnonoctal
 
 package dockerfile2llb
 
diff --git a/frontend/dockerfile/dockerfile2llb/copy_chmod_non_octal_enabled.go b/frontend/dockerfile/dockerfile2llb/copy_chmod_non_octal_enabled.go
index fca2d88428e4..26bebf71450a 100644
--- a/frontend/dockerfile/dockerfile2llb/copy_chmod_non_octal_enabled.go
+++ b/frontend/dockerfile/dockerfile2llb/copy_chmod_non_octal_enabled.go
@@ -1,5 +1,4 @@
 //go:build dfcopychmodnonoctal
-// +build dfcopychmodnonoctal
 
 package dockerfile2llb
 
diff --git a/frontend/dockerfile/dockerfile2llb/exclude_patterns_test.go b/frontend/dockerfile/dockerfile2llb/exclude_patterns_test.go
index 2e20e71b9599..12864bb3258e 100644
--- a/frontend/dockerfile/dockerfile2llb/exclude_patterns_test.go
+++ b/frontend/dockerfile/dockerfile2llb/exclude_patterns_test.go
@@ -1,5 +1,4 @@
 //go:build dfexcludepatterns
-// +build dfexcludepatterns
 
 package dockerfile2llb
 
diff --git a/frontend/dockerfile/dockerfile_chmod_non_octal_test.go b/frontend/dockerfile/dockerfile_chmod_non_octal_test.go
index 25713dfd3999..210db264c52a 100644
--- a/frontend/dockerfile/dockerfile_chmod_non_octal_test.go
+++ b/frontend/dockerfile/dockerfile_chmod_non_octal_test.go
@@ -1,5 +1,4 @@
 //go:build dfcopychmodnonoctal
-// +build dfcopychmodnonoctal
 
 package dockerfile
 
diff --git a/frontend/dockerfile/dockerfile_parents_test.go b/frontend/dockerfile/dockerfile_parents_test.go
index 47f06e803924..7a6ac2612231 100644
--- a/frontend/dockerfile/dockerfile_parents_test.go
+++ b/frontend/dockerfile/dockerfile_parents_test.go
@@ -1,5 +1,4 @@
 //go:build dfparents
-// +build dfparents
 
 package dockerfile
 
diff --git a/frontend/dockerfile/dockerfile_runsecurity_test.go b/frontend/dockerfile/dockerfile_runsecurity_test.go
index 325a0e1d3651..2b1cdbe03130 100644
--- a/frontend/dockerfile/dockerfile_runsecurity_test.go
+++ b/frontend/dockerfile/dockerfile_runsecurity_test.go
@@ -1,5 +1,4 @@
 //go:build dfrunsecurity
-// +build dfrunsecurity
 
 package dockerfile
 
diff --git a/frontend/dockerfile/exclude_patterns_test.go b/frontend/dockerfile/exclude_patterns_test.go
index d02950bea8e2..6a28df1565f0 100644
--- a/frontend/dockerfile/exclude_patterns_test.go
+++ b/frontend/dockerfile/exclude_patterns_test.go
@@ -1,5 +1,4 @@
 //go:build dfexcludepatterns
-// +build dfexcludepatterns
 
 package dockerfile
 
diff --git a/frontend/dockerfile/instructions/commands_runsecurity.go b/frontend/dockerfile/instructions/commands_runsecurity.go
index ce243b6d83b6..8ecf3d67ca06 100644
--- a/frontend/dockerfile/instructions/commands_runsecurity.go
+++ b/frontend/dockerfile/instructions/commands_runsecurity.go
@@ -1,5 +1,4 @@
 //go:build dfrunsecurity
-// +build dfrunsecurity
 
 package instructions
 
diff --git a/frontend/dockerfile/instructions/errors_unix.go b/frontend/dockerfile/instructions/errors_unix.go
index 7f1eaa5deb3d..14da9b3729b2 100644
--- a/frontend/dockerfile/instructions/errors_unix.go
+++ b/frontend/dockerfile/instructions/errors_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package instructions
 
diff --git a/frontend/dockerfile/instructions/exclude_pattern_feature.go b/frontend/dockerfile/instructions/exclude_pattern_feature.go
index 0c1421b40d47..a1a7342f3364 100644
--- a/frontend/dockerfile/instructions/exclude_pattern_feature.go
+++ b/frontend/dockerfile/instructions/exclude_pattern_feature.go
@@ -1,5 +1,4 @@
 //go:build dfexcludepatterns
-// +build dfexcludepatterns
 
 package instructions
 
diff --git a/frontend/dockerfile/instructions/parse_parents.go b/frontend/dockerfile/instructions/parse_parents.go
index 0995d35654bc..97912e750dfb 100644
--- a/frontend/dockerfile/instructions/parse_parents.go
+++ b/frontend/dockerfile/instructions/parse_parents.go
@@ -1,5 +1,4 @@
 //go:build dfparents
-// +build dfparents
 
 package instructions
 
diff --git a/frontend/dockerfile/linter/generate.go b/frontend/dockerfile/linter/generate.go
index 8068947092f4..7c039967daea 100644
--- a/frontend/dockerfile/linter/generate.go
+++ b/frontend/dockerfile/linter/generate.go
@@ -1,5 +1,4 @@
 //go:build ignore
-// +build ignore
 
 package main
 
diff --git a/frontend/dockerfile/shell/equal_env_unix.go b/frontend/dockerfile/shell/equal_env_unix.go
index ec0c8fc744d5..1fee9f3f28e8 100644
--- a/frontend/dockerfile/shell/equal_env_unix.go
+++ b/frontend/dockerfile/shell/equal_env_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package shell
 
diff --git a/session/filesync/diffcopy_unix.go b/session/filesync/diffcopy_unix.go
index d80489d0d560..704bba4c840c 100644
--- a/session/filesync/diffcopy_unix.go
+++ b/session/filesync/diffcopy_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package filesync
 
diff --git a/session/filesync/diffcopy_windows.go b/session/filesync/diffcopy_windows.go
index 0054e75da5e5..48055b75d445 100644
--- a/session/filesync/diffcopy_windows.go
+++ b/session/filesync/diffcopy_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package filesync
 
diff --git a/session/sshforward/sshprovider/agentprovider_unix.go b/session/sshforward/sshprovider/agentprovider_unix.go
index 01552c305259..95b2591e1328 100644
--- a/session/sshforward/sshprovider/agentprovider_unix.go
+++ b/session/sshforward/sshprovider/agentprovider_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package sshprovider
 
diff --git a/session/sshforward/sshprovider/agentprovider_windows.go b/session/sshforward/sshprovider/agentprovider_windows.go
index f74b0df4a887..eef27b2e573d 100644
--- a/session/sshforward/sshprovider/agentprovider_windows.go
+++ b/session/sshforward/sshprovider/agentprovider_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package sshprovider
 
diff --git a/snapshot/diffapply_unsupported.go b/snapshot/diffapply_unsupported.go
index cdc697587b71..ed27048befc4 100644
--- a/snapshot/diffapply_unsupported.go
+++ b/snapshot/diffapply_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package snapshot
 
diff --git a/snapshot/snapshotter_test.go b/snapshot/snapshotter_test.go
index fbafa25d888d..ed1a6ec652c9 100644
--- a/snapshot/snapshotter_test.go
+++ b/snapshot/snapshotter_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package snapshot
 
diff --git a/solver/llbsolver/file/backend_unix.go b/solver/llbsolver/file/backend_unix.go
index 8f3c94b4cb20..f515d7db62f3 100644
--- a/solver/llbsolver/file/backend_unix.go
+++ b/solver/llbsolver/file/backend_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package file
 
diff --git a/solver/llbsolver/ops/user_other.go b/solver/llbsolver/ops/user_other.go
index aff743b77d20..a8b01f97686a 100644
--- a/solver/llbsolver/ops/user_other.go
+++ b/solver/llbsolver/ops/user_other.go
@@ -1,5 +1,4 @@
 //go:build !linux && !windows
-// +build !linux,!windows
 
 package ops
 
diff --git a/source/git/source_unix_test.go b/source/git/source_unix_test.go
index 82cb546beb2d..50ca2e80747c 100644
--- a/source/git/source_unix_test.go
+++ b/source/git/source_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package git
 
diff --git a/source/git/source_windows.go b/source/git/source_windows.go
index 8c8a1d3dcf26..f54132bde836 100644
--- a/source/git/source_windows.go
+++ b/source/git/source_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package git
 
diff --git a/tools/tools.go b/tools/tools.go
index 8ad9fe1faf8c..3c0893c31139 100644
--- a/tools/tools.go
+++ b/tools/tools.go
@@ -1,5 +1,4 @@
 //go:build tools
-// +build tools
 
 // Package tools tracks dependencies on binaries not referenced in this codebase.
 // https://github.com/golang/go/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module
diff --git a/util/appcontext/appcontext_unix.go b/util/appcontext/appcontext_unix.go
index 366edc68b399..994d87de0ea6 100644
--- a/util/appcontext/appcontext_unix.go
+++ b/util/appcontext/appcontext_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package appcontext
 
diff --git a/util/appdefaults/appdefaults_unix.go b/util/appdefaults/appdefaults_unix.go
index 447a3cfbcf49..cb1aa06d18a2 100644
--- a/util/appdefaults/appdefaults_unix.go
+++ b/util/appdefaults/appdefaults_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package appdefaults
 
diff --git a/util/archutil/386_binary.go b/util/archutil/386_binary.go
index 8f06a84eb153..b2959bd46cec 100644
--- a/util/archutil/386_binary.go
+++ b/util/archutil/386_binary.go
@@ -1,5 +1,4 @@
 //go:build !386
-// +build !386
 
 package archutil
 
diff --git a/util/archutil/386_check.go b/util/archutil/386_check.go
index 858c62f538b3..c8f343c7469a 100644
--- a/util/archutil/386_check.go
+++ b/util/archutil/386_check.go
@@ -1,5 +1,4 @@
 //go:build !386
-// +build !386
 
 package archutil
 
diff --git a/util/archutil/386_check_386.go b/util/archutil/386_check_386.go
index afcd02699493..f9d4be2e5fbb 100644
--- a/util/archutil/386_check_386.go
+++ b/util/archutil/386_check_386.go
@@ -1,5 +1,4 @@
 //go:build 386
-// +build 386
 
 package archutil
 
diff --git a/util/archutil/amd64_binary.go b/util/archutil/amd64_binary.go
index 0ecf8fc5106f..41930c636d76 100644
--- a/util/archutil/amd64_binary.go
+++ b/util/archutil/amd64_binary.go
@@ -1,5 +1,4 @@
 //go:build !amd64
-// +build !amd64
 
 package archutil
 
diff --git a/util/archutil/amd64_check.go b/util/archutil/amd64_check.go
index 215b8aebfb87..417d7437f0c9 100644
--- a/util/archutil/amd64_check.go
+++ b/util/archutil/amd64_check.go
@@ -1,5 +1,4 @@
 //go:build !amd64
-// +build !amd64
 
 package archutil
 
diff --git a/util/archutil/amd64_check_amd64.go b/util/archutil/amd64_check_amd64.go
index c1b59a51ca42..c88dc30930da 100644
--- a/util/archutil/amd64_check_amd64.go
+++ b/util/archutil/amd64_check_amd64.go
@@ -1,5 +1,4 @@
 //go:build amd64
-// +build amd64
 
 package archutil
 
diff --git a/util/archutil/arm64_binary.go b/util/archutil/arm64_binary.go
index 3ef0d104783a..02f367acba64 100644
--- a/util/archutil/arm64_binary.go
+++ b/util/archutil/arm64_binary.go
@@ -1,5 +1,4 @@
 //go:build !arm64
-// +build !arm64
 
 package archutil
 
diff --git a/util/archutil/arm64_check.go b/util/archutil/arm64_check.go
index b6103f6434df..83e81502fd4e 100644
--- a/util/archutil/arm64_check.go
+++ b/util/archutil/arm64_check.go
@@ -1,5 +1,4 @@
 //go:build !arm64
-// +build !arm64
 
 package archutil
 
diff --git a/util/archutil/arm64_check_arm64.go b/util/archutil/arm64_check_arm64.go
index ff134f9d125e..ecb73dbb59b5 100644
--- a/util/archutil/arm64_check_arm64.go
+++ b/util/archutil/arm64_check_arm64.go
@@ -1,5 +1,4 @@
 //go:build arm64
-// +build arm64
 
 package archutil
 
diff --git a/util/archutil/arm_binary.go b/util/archutil/arm_binary.go
index 19a9298c0aec..7e9d8008cc40 100644
--- a/util/archutil/arm_binary.go
+++ b/util/archutil/arm_binary.go
@@ -1,5 +1,4 @@
 //go:build !arm
-// +build !arm
 
 package archutil
 
diff --git a/util/archutil/arm_check.go b/util/archutil/arm_check.go
index 6ccd88753377..ce9fc00fd281 100644
--- a/util/archutil/arm_check.go
+++ b/util/archutil/arm_check.go
@@ -1,5 +1,4 @@
 //go:build !arm
-// +build !arm
 
 package archutil
 
diff --git a/util/archutil/arm_check_arm.go b/util/archutil/arm_check_arm.go
index e0ab2241dfcd..d19084930d03 100644
--- a/util/archutil/arm_check_arm.go
+++ b/util/archutil/arm_check_arm.go
@@ -1,5 +1,4 @@
 //go:build arm
-// +build arm
 
 package archutil
 
diff --git a/util/archutil/check_unix.go b/util/archutil/check_unix.go
index 91be4d80260f..f99decd64827 100644
--- a/util/archutil/check_unix.go
+++ b/util/archutil/check_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package archutil
 
diff --git a/util/archutil/check_windows.go b/util/archutil/check_windows.go
index 76c27fbb26ed..ad634e42d757 100644
--- a/util/archutil/check_windows.go
+++ b/util/archutil/check_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package archutil
 
diff --git a/util/archutil/generate.go b/util/archutil/generate.go
index 3fc244a766fb..c7a0bc41108d 100644
--- a/util/archutil/generate.go
+++ b/util/archutil/generate.go
@@ -1,5 +1,4 @@
 //go:build ignore
-// +build ignore
 
 package main
 
@@ -84,7 +83,6 @@ func (w *hexStringWriter) Write(d []byte) (int, error) {
 }
 
 var tmpl = template.Must(template.New("pause").Parse(`//go:build !{{.Arch}}
-// +build !{{.Arch}}
 
 package {{.Package}}
 
diff --git a/util/archutil/loong64_binary.go b/util/archutil/loong64_binary.go
index 01d4454310df..249a2592dd15 100644
--- a/util/archutil/loong64_binary.go
+++ b/util/archutil/loong64_binary.go
@@ -1,5 +1,4 @@
 //go:build !loong64
-// +build !loong64
 
 package archutil
 
diff --git a/util/archutil/loong64_check.go b/util/archutil/loong64_check.go
index 9bc966ce245a..d1ed9fd21ccf 100644
--- a/util/archutil/loong64_check.go
+++ b/util/archutil/loong64_check.go
@@ -1,5 +1,4 @@
 //go:build !loong64
-// +build !loong64
 
 package archutil
 
diff --git a/util/archutil/mips64_binary.go b/util/archutil/mips64_binary.go
index 86b5139744b3..5c09a71cf534 100644
--- a/util/archutil/mips64_binary.go
+++ b/util/archutil/mips64_binary.go
@@ -1,5 +1,4 @@
 //go:build !mips64
-// +build !mips64
 
 package archutil
 
diff --git a/util/archutil/mips64_check.go b/util/archutil/mips64_check.go
index ddd71de532a5..79c164d7ce95 100644
--- a/util/archutil/mips64_check.go
+++ b/util/archutil/mips64_check.go
@@ -1,5 +1,4 @@
 //go:build !mips64
-// +build !mips64
 
 package archutil
 
diff --git a/util/archutil/mips64_check_mips64.go b/util/archutil/mips64_check_mips64.go
index ae1c71c5f276..c455ac71578a 100644
--- a/util/archutil/mips64_check_mips64.go
+++ b/util/archutil/mips64_check_mips64.go
@@ -1,5 +1,4 @@
 //go:build mips64
-// +build mips64
 
 package archutil
 
diff --git a/util/archutil/mips64le_binary.go b/util/archutil/mips64le_binary.go
index a6e090583b31..17f5f3525210 100644
--- a/util/archutil/mips64le_binary.go
+++ b/util/archutil/mips64le_binary.go
@@ -1,5 +1,4 @@
 //go:build !mips64le
-// +build !mips64le
 
 package archutil
 
diff --git a/util/archutil/mips64le_check.go b/util/archutil/mips64le_check.go
index f97d335b2abf..7a6f20a95612 100644
--- a/util/archutil/mips64le_check.go
+++ b/util/archutil/mips64le_check.go
@@ -1,5 +1,4 @@
 //go:build !mips64le
-// +build !mips64le
 
 package archutil
 
diff --git a/util/archutil/mips64le_check_mips64le.go b/util/archutil/mips64le_check_mips64le.go
index 4df415b17201..fa3a06821079 100644
--- a/util/archutil/mips64le_check_mips64le.go
+++ b/util/archutil/mips64le_check_mips64le.go
@@ -1,5 +1,4 @@
 //go:build mips64le
-// +build mips64le
 
 package archutil
 
diff --git a/util/archutil/ppc64_binary.go b/util/archutil/ppc64_binary.go
index 6158d92b9f74..bbabcf773aae 100644
--- a/util/archutil/ppc64_binary.go
+++ b/util/archutil/ppc64_binary.go
@@ -1,5 +1,4 @@
 //go:build !ppc64
-// +build !ppc64
 
 package archutil
 
diff --git a/util/archutil/ppc64_check.go b/util/archutil/ppc64_check.go
index 00fe3e16fffe..3aa26561d7c1 100644
--- a/util/archutil/ppc64_check.go
+++ b/util/archutil/ppc64_check.go
@@ -1,5 +1,4 @@
 //go:build !ppc64
-// +build !ppc64
 
 package archutil
 
diff --git a/util/archutil/ppc64_check_ppc64.go b/util/archutil/ppc64_check_ppc64.go
index 82e6958454ce..f26804868a66 100644
--- a/util/archutil/ppc64_check_ppc64.go
+++ b/util/archutil/ppc64_check_ppc64.go
@@ -1,5 +1,4 @@
 //go:build ppc64
-// +build ppc64
 
 package archutil
 
diff --git a/util/archutil/ppc64le_binary.go b/util/archutil/ppc64le_binary.go
index b9254b730868..53a48a1b83e4 100644
--- a/util/archutil/ppc64le_binary.go
+++ b/util/archutil/ppc64le_binary.go
@@ -1,5 +1,4 @@
 //go:build !ppc64le
-// +build !ppc64le
 
 package archutil
 
diff --git a/util/archutil/ppc64le_check.go b/util/archutil/ppc64le_check.go
index 4a846c5cfb03..e931f0443ae3 100644
--- a/util/archutil/ppc64le_check.go
+++ b/util/archutil/ppc64le_check.go
@@ -1,5 +1,4 @@
 //go:build !ppc64le
-// +build !ppc64le
 
 package archutil
 
diff --git a/util/archutil/ppc64le_check_ppc64le.go b/util/archutil/ppc64le_check_ppc64le.go
index 54e05f05498c..920c09f35f24 100644
--- a/util/archutil/ppc64le_check_ppc64le.go
+++ b/util/archutil/ppc64le_check_ppc64le.go
@@ -1,5 +1,4 @@
 //go:build ppc64le
-// +build ppc64le
 
 package archutil
 
diff --git a/util/archutil/riscv64_binary.go b/util/archutil/riscv64_binary.go
index 72c9f5023234..93bece1810a3 100644
--- a/util/archutil/riscv64_binary.go
+++ b/util/archutil/riscv64_binary.go
@@ -1,5 +1,4 @@
 //go:build !riscv64
-// +build !riscv64
 
 package archutil
 
diff --git a/util/archutil/riscv64_check.go b/util/archutil/riscv64_check.go
index 63dd5a5b46ef..57eaa198629f 100644
--- a/util/archutil/riscv64_check.go
+++ b/util/archutil/riscv64_check.go
@@ -1,5 +1,4 @@
 //go:build !riscv64
-// +build !riscv64
 
 package archutil
 
diff --git a/util/archutil/riscv64_check_riscv64.go b/util/archutil/riscv64_check_riscv64.go
index 959f6de3bcad..4d92c598ba6d 100644
--- a/util/archutil/riscv64_check_riscv64.go
+++ b/util/archutil/riscv64_check_riscv64.go
@@ -1,5 +1,4 @@
 //go:build riscv64
-// +build riscv64
 
 package archutil
 
diff --git a/util/archutil/s390x_binary.go b/util/archutil/s390x_binary.go
index 4e0474e57b6a..f09bf25f1583 100644
--- a/util/archutil/s390x_binary.go
+++ b/util/archutil/s390x_binary.go
@@ -1,5 +1,4 @@
 //go:build !s390x
-// +build !s390x
 
 package archutil
 
diff --git a/util/archutil/s390x_check.go b/util/archutil/s390x_check.go
index 1c2dd9fbea37..a99c834d8403 100644
--- a/util/archutil/s390x_check.go
+++ b/util/archutil/s390x_check.go
@@ -1,5 +1,4 @@
 //go:build !s390x
-// +build !s390x
 
 package archutil
 
diff --git a/util/archutil/s390x_check_s390x.go b/util/archutil/s390x_check_s390x.go
index d8e8c2e6bb45..8b2b47427d66 100644
--- a/util/archutil/s390x_check_s390x.go
+++ b/util/archutil/s390x_check_s390x.go
@@ -1,5 +1,4 @@
 //go:build s390x
-// +build s390x
 
 package archutil
 
diff --git a/util/compression/nydus.go b/util/compression/nydus.go
index a80be43debe8..85c68301230e 100644
--- a/util/compression/nydus.go
+++ b/util/compression/nydus.go
@@ -1,5 +1,4 @@
 //go:build nydus
-// +build nydus
 
 package compression
 
diff --git a/util/compression/parse.go b/util/compression/parse.go
index 6567da4e877d..8a9db02fe774 100644
--- a/util/compression/parse.go
+++ b/util/compression/parse.go
@@ -1,5 +1,4 @@
 //go:build !nydus
-// +build !nydus
 
 package compression
 
diff --git a/util/disk/disk_openbsd.go b/util/disk/disk_openbsd.go
index a76664548001..bfa738c52610 100644
--- a/util/disk/disk_openbsd.go
+++ b/util/disk/disk_openbsd.go
@@ -1,5 +1,4 @@
 //go:build openbsd
-// +build openbsd
 
 package disk
 
diff --git a/util/disk/disk_unix.go b/util/disk/disk_unix.go
index 00d111142c70..47e6cb4390a0 100644
--- a/util/disk/disk_unix.go
+++ b/util/disk/disk_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows && !openbsd
-// +build !windows,!openbsd
 
 package disk
 
diff --git a/util/disk/disk_windows.go b/util/disk/disk_windows.go
index 7f36e6198824..ccaa341fa242 100644
--- a/util/disk/disk_windows.go
+++ b/util/disk/disk_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package disk
 
diff --git a/util/network/cniprovider/bridge.go b/util/network/cniprovider/bridge.go
index 476da9cc5d1b..d6f730c7b421 100644
--- a/util/network/cniprovider/bridge.go
+++ b/util/network/cniprovider/bridge.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package cniprovider
 
diff --git a/util/network/cniprovider/cni_nolinux.go b/util/network/cniprovider/cni_nolinux.go
index 3713e00cbc15..526f07817f5f 100644
--- a/util/network/cniprovider/cni_nolinux.go
+++ b/util/network/cniprovider/cni_nolinux.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package cniprovider
 
diff --git a/util/network/cniprovider/createns_linux.go b/util/network/cniprovider/createns_linux.go
index e8a3d5054fdd..87513047ce9c 100644
--- a/util/network/cniprovider/createns_linux.go
+++ b/util/network/cniprovider/createns_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package cniprovider
 
diff --git a/util/network/cniprovider/createns_unix.go b/util/network/cniprovider/createns_unix.go
index dda416babc9c..a185a5481e9a 100644
--- a/util/network/cniprovider/createns_unix.go
+++ b/util/network/cniprovider/createns_unix.go
@@ -1,5 +1,4 @@
 //go:build !linux && !windows
-// +build !linux,!windows
 
 package cniprovider
 
diff --git a/util/network/cniprovider/createns_windows.go b/util/network/cniprovider/createns_windows.go
index 093aed7b30b0..ea233d619d6f 100644
--- a/util/network/cniprovider/createns_windows.go
+++ b/util/network/cniprovider/createns_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package cniprovider
 
diff --git a/util/network/host.go b/util/network/host.go
index c8af23c437ef..e57e1ca21cf2 100644
--- a/util/network/host.go
+++ b/util/network/host.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package network
 
diff --git a/util/network/netproviders/network_linux.go b/util/network/netproviders/network_linux.go
index 8ce861e34bf3..9d02de7cc746 100644
--- a/util/network/netproviders/network_linux.go
+++ b/util/network/netproviders/network_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package netproviders
 
diff --git a/util/network/netproviders/network_nobridge.go b/util/network/netproviders/network_nobridge.go
index 748545ccd1d6..9bce41c31751 100644
--- a/util/network/netproviders/network_nobridge.go
+++ b/util/network/netproviders/network_nobridge.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package netproviders
 
diff --git a/util/network/netproviders/network_unix.go b/util/network/netproviders/network_unix.go
index d52173932291..01e42c74f12d 100644
--- a/util/network/netproviders/network_unix.go
+++ b/util/network/netproviders/network_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package netproviders
 
diff --git a/util/network/netproviders/network_windows.go b/util/network/netproviders/network_windows.go
index 0a17a36db36a..001033b0e7ca 100644
--- a/util/network/netproviders/network_windows.go
+++ b/util/network/netproviders/network_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package netproviders
 
diff --git a/util/overlay/overlay_linux.go b/util/overlay/overlay_linux.go
index a5d4ed472196..1785c74c1748 100644
--- a/util/overlay/overlay_linux.go
+++ b/util/overlay/overlay_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package overlay
 
diff --git a/util/overlay/overlay_linux_test.go b/util/overlay/overlay_linux_test.go
index b6fd6d118367..0b626e07170c 100644
--- a/util/overlay/overlay_linux_test.go
+++ b/util/overlay/overlay_linux_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package overlay
 
diff --git a/util/rootless/mountopts/mountopts_others.go b/util/rootless/mountopts/mountopts_others.go
index 956c8041ffa6..bd13b8f2795c 100644
--- a/util/rootless/mountopts/mountopts_others.go
+++ b/util/rootless/mountopts/mountopts_others.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package mountopts
 
diff --git a/util/rootless/specconv/specconv_nonlinux.go b/util/rootless/specconv/specconv_nonlinux.go
index fbc607a975ad..c200057e319e 100644
--- a/util/rootless/specconv/specconv_nonlinux.go
+++ b/util/rootless/specconv/specconv_nonlinux.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package specconv
 
diff --git a/util/testutil/integration/pins.go b/util/testutil/integration/pins.go
index 494d4fa4bb6b..8dd9cfe12636 100644
--- a/util/testutil/integration/pins.go
+++ b/util/testutil/integration/pins.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package integration
 
diff --git a/util/testutil/integration/run_unix.go b/util/testutil/integration/run_unix.go
index 138a6a1cdbcd..67c7a57824f6 100644
--- a/util/testutil/integration/run_unix.go
+++ b/util/testutil/integration/run_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package integration
 
diff --git a/util/testutil/integration/util_unix.go b/util/testutil/integration/util_unix.go
index f096f954779e..0716ab23ed96 100644
--- a/util/testutil/integration/util_unix.go
+++ b/util/testutil/integration/util_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package integration
 
diff --git a/util/testutil/workers/oci_unix.go b/util/testutil/workers/oci_unix.go
index bc9adddd8960..7331e9f18ee1 100644
--- a/util/testutil/workers/oci_unix.go
+++ b/util/testutil/workers/oci_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package workers
 
diff --git a/util/testutil/workers/util_unix.go b/util/testutil/workers/util_unix.go
index 76d5c8b516b5..2a7fbb4519a4 100644
--- a/util/testutil/workers/util_unix.go
+++ b/util/testutil/workers/util_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package workers
 
diff --git a/util/winlayers/apply.go b/util/winlayers/apply.go
index 20b2faa03818..ef4b5a49f489 100644
--- a/util/winlayers/apply.go
+++ b/util/winlayers/apply.go
@@ -1,5 +1,4 @@
 //go:build !nydus
-// +build !nydus
 
 package winlayers
 
diff --git a/util/winlayers/apply_nydus.go b/util/winlayers/apply_nydus.go
index 1ef61b5bca0a..c1577a676f32 100644
--- a/util/winlayers/apply_nydus.go
+++ b/util/winlayers/apply_nydus.go
@@ -1,5 +1,4 @@
 //go:build nydus
-// +build nydus
 
 package winlayers
 
diff --git a/worker/containerd/containerd_test.go b/worker/containerd/containerd_test.go
index 24b3f12b8b8f..f8e7cbae1048 100644
--- a/worker/containerd/containerd_test.go
+++ b/worker/containerd/containerd_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package containerd
 
diff --git a/worker/containerd/containerd_test_unix.go b/worker/containerd/containerd_test_unix.go
index 0e08990c2017..a8c2be8d463b 100644
--- a/worker/containerd/containerd_test_unix.go
+++ b/worker/containerd/containerd_test_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package containerd
 
diff --git a/worker/runc/runc.go b/worker/runc/runc.go
index ce756ce3754e..7e2ad9086ca1 100644
--- a/worker/runc/runc.go
+++ b/worker/runc/runc.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package runc
 
diff --git a/worker/runc/runc_test.go b/worker/runc/runc_test.go
index e47f56f0361d..64fb9d5ae870 100644
--- a/worker/runc/runc_test.go
+++ b/worker/runc/runc_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package runc