diff --git a/api/common_unix.go b/api/common_unix.go
index 19fc63d658..0f77352d7e 100644
--- a/api/common_unix.go
+++ b/api/common_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package api // import "github.com/docker/docker/api"
 
diff --git a/api/types/container/hostconfig_unix.go b/api/types/container/hostconfig_unix.go
index 24c4fa8d90..a14fe8d1af 100644
--- a/api/types/container/hostconfig_unix.go
+++ b/api/types/container/hostconfig_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package container // import "github.com/docker/docker/api/types/container"
 
diff --git a/api/types/container/hostconfig_unix_test.go b/api/types/container/hostconfig_unix_test.go
index b8cf287200..d65e054abd 100644
--- a/api/types/container/hostconfig_unix_test.go
+++ b/api/types/container/hostconfig_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package container
 
diff --git a/builder/builder-next/executor_unix.go b/builder/builder-next/executor_unix.go
index 4a1d93c25f..60c4f8ddf1 100644
--- a/builder/builder-next/executor_unix.go
+++ b/builder/builder-next/executor_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package buildkit
 
diff --git a/builder/builder-next/worker/gc_unix.go b/builder/builder-next/worker/gc_unix.go
index b25906b828..41a2c181b6 100644
--- a/builder/builder-next/worker/gc_unix.go
+++ b/builder/builder-next/worker/gc_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package worker
 
diff --git a/builder/builder-next/worker/gc_windows.go b/builder/builder-next/worker/gc_windows.go
index 748be9041d..3141c9ee18 100644
--- a/builder/builder-next/worker/gc_windows.go
+++ b/builder/builder-next/worker/gc_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package worker
 
diff --git a/builder/dockerfile/builder_unix.go b/builder/dockerfile/builder_unix.go
index 7d10028575..881d2ce6bd 100644
--- a/builder/dockerfile/builder_unix.go
+++ b/builder/dockerfile/builder_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 
diff --git a/builder/dockerfile/copy_unix.go b/builder/dockerfile/copy_unix.go
index d13d7a9890..a90afb98cb 100644
--- a/builder/dockerfile/copy_unix.go
+++ b/builder/dockerfile/copy_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 
diff --git a/builder/dockerfile/dispatchers_unix.go b/builder/dockerfile/dispatchers_unix.go
index 87dbe72192..ba8e1d9053 100644
--- a/builder/dockerfile/dispatchers_unix.go
+++ b/builder/dockerfile/dispatchers_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 
diff --git a/builder/dockerfile/dispatchers_unix_test.go b/builder/dockerfile/dispatchers_unix_test.go
index 3f39e26929..c2ad1243da 100644
--- a/builder/dockerfile/dispatchers_unix_test.go
+++ b/builder/dockerfile/dispatchers_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 
diff --git a/builder/dockerfile/dispatchers_windows_test.go b/builder/dockerfile/dispatchers_windows_test.go
index aef8b047dd..8adcbaa86f 100644
--- a/builder/dockerfile/dispatchers_windows_test.go
+++ b/builder/dockerfile/dispatchers_windows_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 
diff --git a/builder/dockerfile/internals_windows_test.go b/builder/dockerfile/internals_windows_test.go
index 59d84e5cce..9b371854eb 100644
--- a/builder/dockerfile/internals_windows_test.go
+++ b/builder/dockerfile/internals_windows_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 
diff --git a/client/client_unix.go b/client/client_unix.go
index 319b738d3e..9fe78ea43a 100644
--- a/client/client_unix.go
+++ b/client/client_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package client // import "github.com/docker/docker/client"
 
diff --git a/cmd/dockerd/config_unix.go b/cmd/dockerd/config_unix.go
index f7aac2c0f3..00f5a9be5e 100644
--- a/cmd/dockerd/config_unix.go
+++ b/cmd/dockerd/config_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package main
 
diff --git a/cmd/dockerd/config_unix_test.go b/cmd/dockerd/config_unix_test.go
index b07ce8a24b..adb2b61eb2 100644
--- a/cmd/dockerd/config_unix_test.go
+++ b/cmd/dockerd/config_unix_test.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package main
 
diff --git a/cmd/dockerd/daemon_unix.go b/cmd/dockerd/daemon_unix.go
index c25cddb7bc..f9ab3dcc4e 100644
--- a/cmd/dockerd/daemon_unix.go
+++ b/cmd/dockerd/daemon_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 
diff --git a/cmd/dockerd/daemon_unix_test.go b/cmd/dockerd/daemon_unix_test.go
index 81cf0d1c05..df61485986 100644
--- a/cmd/dockerd/daemon_unix_test.go
+++ b/cmd/dockerd/daemon_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 
diff --git a/cmd/dockerd/docker_unix.go b/cmd/dockerd/docker_unix.go
index b7e30350ea..61de0578b1 100644
--- a/cmd/dockerd/docker_unix.go
+++ b/cmd/dockerd/docker_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 
diff --git a/cmd/dockerd/service_unsupported.go b/cmd/dockerd/service_unsupported.go
index 907fd6ebca..500f40d46d 100644
--- a/cmd/dockerd/service_unsupported.go
+++ b/cmd/dockerd/service_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 
diff --git a/cmd/dockerd/trap/trap_linux_test.go b/cmd/dockerd/trap/trap_linux_test.go
index 1ef9833132..7d52205a79 100644
--- a/cmd/dockerd/trap/trap_linux_test.go
+++ b/cmd/dockerd/trap/trap_linux_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package trap // import "github.com/docker/docker/cmd/dockerd/trap"
 
diff --git a/container/container_unix.go b/container/container_unix.go
index 3dced869c4..ae771e2d4d 100644
--- a/container/container_unix.go
+++ b/container/container_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package container // import "github.com/docker/docker/container"
 
diff --git a/container/mounts_unix.go b/container/mounts_unix.go
index 168286889a..438b289cf4 100644
--- a/container/mounts_unix.go
+++ b/container/mounts_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package container // import "github.com/docker/docker/container"
 
diff --git a/daemon/apparmor_default.go b/daemon/apparmor_default.go
index 6376001613..81e10b6cbe 100644
--- a/daemon/apparmor_default.go
+++ b/daemon/apparmor_default.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package daemon // import "github.com/docker/docker/daemon"
 
diff --git a/daemon/apparmor_default_unsupported.go b/daemon/apparmor_default_unsupported.go
index e3dc18b32b..be4938f5b6 100644
--- a/daemon/apparmor_default_unsupported.go
+++ b/daemon/apparmor_default_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package daemon // import "github.com/docker/docker/daemon"
 
diff --git a/daemon/archive_tarcopyoptions_unix.go b/daemon/archive_tarcopyoptions_unix.go
index 52f1ce7dbe..b2aaab04f6 100644
--- a/daemon/archive_tarcopyoptions_unix.go
+++ b/daemon/archive_tarcopyoptions_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package daemon // import "github.com/docker/docker/daemon"
 
diff --git a/daemon/archive_unix.go b/daemon/archive_unix.go
index 3098dbeadf..ebb56382a9 100644
--- a/daemon/archive_unix.go
+++ b/daemon/archive_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package daemon // import "github.com/docker/docker/daemon"
 
diff --git a/daemon/cluster/executor/container/health_test.go b/daemon/cluster/executor/container/health_test.go
index f68eb3c969..9219bb7616 100644
--- a/daemon/cluster/executor/container/health_test.go
+++ b/daemon/cluster/executor/container/health_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package container // import "github.com/docker/docker/daemon/cluster/executor/container"
 
diff --git a/daemon/cluster/executor/container/validate_unix_test.go b/daemon/cluster/executor/container/validate_unix_test.go
index bf57b9c7ff..1bf74b49fb 100644
--- a/daemon/cluster/executor/container/validate_unix_test.go
+++ b/daemon/cluster/executor/container/validate_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package container // import "github.com/docker/docker/daemon/cluster/executor/container"
 
diff --git a/daemon/cluster/executor/container/validate_windows_test.go b/daemon/cluster/executor/container/validate_windows_test.go
index 1b1b2f13f6..1d0f465b6c 100644
--- a/daemon/cluster/executor/container/validate_windows_test.go
+++ b/daemon/cluster/executor/container/validate_windows_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package container // import "github.com/docker/docker/daemon/cluster/executor/container"
 import (
diff --git a/daemon/cluster/listen_addr_others.go b/daemon/cluster/listen_addr_others.go
index de3d25381b..20004fac50 100644
--- a/daemon/cluster/listen_addr_others.go
+++ b/daemon/cluster/listen_addr_others.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package cluster // import "github.com/docker/docker/daemon/cluster"
 
diff --git a/daemon/configs_unsupported.go b/daemon/configs_unsupported.go
index ce98148ee7..cb6c59ac29 100644
--- a/daemon/configs_unsupported.go
+++ b/daemon/configs_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux && !windows
-// +build !linux,!windows
 
 package daemon // import "github.com/docker/docker/daemon"
 
diff --git a/daemon/container_linux.go b/daemon/container_linux.go
index 2a0b928aea..18ae63df21 100644
--- a/daemon/container_linux.go
+++ b/daemon/container_linux.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package daemon // import "github.com/docker/docker/daemon"
 
diff --git a/daemon/container_operations_unix.go b/daemon/container_operations_unix.go
index 290ec59a34..bff747bf91 100644
--- a/daemon/container_operations_unix.go
+++ b/daemon/container_operations_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package daemon // import "github.com/docker/docker/daemon"
 
diff --git a/daemon/container_unix_test.go b/daemon/container_unix_test.go
index dbe7b04b2c..3366390fbc 100644
--- a/daemon/container_unix_test.go
+++ b/daemon/container_unix_test.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package daemon
 
diff --git a/daemon/create_unix.go b/daemon/create_unix.go
index 118c427aac..46ebc32555 100644
--- a/daemon/create_unix.go
+++ b/daemon/create_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package daemon // import "github.com/docker/docker/daemon"
 
diff --git a/daemon/daemon_linux_test.go b/daemon/daemon_linux_test.go
index cd5f3804d6..08f55a58e8 100644
--- a/daemon/daemon_linux_test.go
+++ b/daemon/daemon_linux_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package daemon // import "github.com/docker/docker/daemon"
 
diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go
index 1638b5ad94..93e21cda8f 100644
--- a/daemon/daemon_unix.go
+++ b/daemon/daemon_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package daemon // import "github.com/docker/docker/daemon"
 
diff --git a/daemon/daemon_unix_test.go b/daemon/daemon_unix_test.go
index f44c0be48f..2dd79d424c 100644
--- a/daemon/daemon_unix_test.go
+++ b/daemon/daemon_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package daemon // import "github.com/docker/docker/daemon"
 
diff --git a/daemon/daemon_unsupported.go b/daemon/daemon_unsupported.go
index f66713dbb4..c3d419306c 100644
--- a/daemon/daemon_unsupported.go
+++ b/daemon/daemon_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux && !freebsd && !windows
-// +build !linux,!freebsd,!windows
 
 package daemon // import "github.com/docker/docker/daemon"
 
diff --git a/daemon/daemon_windows_test.go b/daemon/daemon_windows_test.go
index 32ee182588..2027c9a7ad 100644
--- a/daemon/daemon_windows_test.go
+++ b/daemon/daemon_windows_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package daemon // import "github.com/docker/docker/daemon"
 
diff --git a/daemon/debugtrap_unix.go b/daemon/debugtrap_unix.go
index 4ed710cb47..467e5118a2 100644
--- a/daemon/debugtrap_unix.go
+++ b/daemon/debugtrap_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package daemon // import "github.com/docker/docker/daemon"
 
diff --git a/daemon/debugtrap_unsupported.go b/daemon/debugtrap_unsupported.go
index 79e27ba6ed..c20de3633b 100644
--- a/daemon/debugtrap_unsupported.go
+++ b/daemon/debugtrap_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux && !darwin && !freebsd && !windows
-// +build !linux,!darwin,!freebsd,!windows
 
 package daemon // import "github.com/docker/docker/daemon"
 
diff --git a/daemon/exec_linux_test.go b/daemon/exec_linux_test.go
index 1375eb788b..a479ffb454 100644
--- a/daemon/exec_linux_test.go
+++ b/daemon/exec_linux_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package daemon
 
diff --git a/daemon/graphdriver/btrfs/btrfs.go b/daemon/graphdriver/btrfs/btrfs.go
index d88efc4be2..fe349bcaaa 100644
--- a/daemon/graphdriver/btrfs/btrfs.go
+++ b/daemon/graphdriver/btrfs/btrfs.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs"
 
diff --git a/daemon/graphdriver/btrfs/btrfs_test.go b/daemon/graphdriver/btrfs/btrfs_test.go
index 511f29af7d..2ce06d79a7 100644
--- a/daemon/graphdriver/btrfs/btrfs_test.go
+++ b/daemon/graphdriver/btrfs/btrfs_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs"
 
diff --git a/daemon/graphdriver/btrfs/dummy_unsupported.go b/daemon/graphdriver/btrfs/dummy_unsupported.go
index 490ba4c901..ea10326f2c 100644
--- a/daemon/graphdriver/btrfs/dummy_unsupported.go
+++ b/daemon/graphdriver/btrfs/dummy_unsupported.go
@@ -1,4 +1,3 @@
 //go:build !linux || !cgo
-// +build !linux !cgo
 
 package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs"
diff --git a/daemon/graphdriver/driver_unsupported.go b/daemon/graphdriver/driver_unsupported.go
index 60aea63b9c..ada47f9aaa 100644
--- a/daemon/graphdriver/driver_unsupported.go
+++ b/daemon/graphdriver/driver_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux && !windows && !freebsd
-// +build !linux,!windows,!freebsd
 
 package graphdriver // import "github.com/docker/docker/daemon/graphdriver"
 
diff --git a/daemon/graphdriver/fuse-overlayfs/fuseoverlayfs.go b/daemon/graphdriver/fuse-overlayfs/fuseoverlayfs.go
index 0607b8054b..431b1e1198 100644
--- a/daemon/graphdriver/fuse-overlayfs/fuseoverlayfs.go
+++ b/daemon/graphdriver/fuse-overlayfs/fuseoverlayfs.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package fuseoverlayfs // import "github.com/docker/docker/daemon/graphdriver/fuse-overlayfs"
 
diff --git a/daemon/graphdriver/fuse-overlayfs/fuseoverlayfs_test.go b/daemon/graphdriver/fuse-overlayfs/fuseoverlayfs_test.go
index 6c0ca01c5e..e70714bedd 100644
--- a/daemon/graphdriver/fuse-overlayfs/fuseoverlayfs_test.go
+++ b/daemon/graphdriver/fuse-overlayfs/fuseoverlayfs_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package fuseoverlayfs // import "github.com/docker/docker/daemon/graphdriver/fuse-overlayfs"
 
diff --git a/daemon/graphdriver/fuse-overlayfs/fuseoverlayfs_unsupported.go b/daemon/graphdriver/fuse-overlayfs/fuseoverlayfs_unsupported.go
index 1b115345e9..efa297fd60 100644
--- a/daemon/graphdriver/fuse-overlayfs/fuseoverlayfs_unsupported.go
+++ b/daemon/graphdriver/fuse-overlayfs/fuseoverlayfs_unsupported.go
@@ -1,4 +1,3 @@
 //go:build !linux
-// +build !linux
 
 package fuseoverlayfs // import "github.com/docker/docker/daemon/graphdriver/fuse-overlayfs"
diff --git a/daemon/graphdriver/graphtest/graphbench_unix.go b/daemon/graphdriver/graphtest/graphbench_unix.go
index 3b312b375e..350879fca8 100644
--- a/daemon/graphdriver/graphtest/graphbench_unix.go
+++ b/daemon/graphdriver/graphtest/graphbench_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package graphtest // import "github.com/docker/docker/daemon/graphdriver/graphtest"
 
diff --git a/daemon/graphdriver/graphtest/graphtest_unix.go b/daemon/graphdriver/graphtest/graphtest_unix.go
index b0b93d281d..5e64f0efa3 100644
--- a/daemon/graphdriver/graphtest/graphtest_unix.go
+++ b/daemon/graphdriver/graphtest/graphtest_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package graphtest // import "github.com/docker/docker/daemon/graphdriver/graphtest"
 
diff --git a/daemon/graphdriver/graphtest/testutil_unix.go b/daemon/graphdriver/graphtest/testutil_unix.go
index d42682203e..127e2ba8e4 100644
--- a/daemon/graphdriver/graphtest/testutil_unix.go
+++ b/daemon/graphdriver/graphtest/testutil_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package graphtest // import "github.com/docker/docker/daemon/graphdriver/graphtest"
 
diff --git a/daemon/graphdriver/overlay2/check.go b/daemon/graphdriver/overlay2/check.go
index b8738700a8..a617b798a5 100644
--- a/daemon/graphdriver/overlay2/check.go
+++ b/daemon/graphdriver/overlay2/check.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package overlay2 // import "github.com/docker/docker/daemon/graphdriver/overlay2"
 
diff --git a/daemon/graphdriver/overlay2/mount.go b/daemon/graphdriver/overlay2/mount.go
index 8d6c99195e..99b2f40276 100644
--- a/daemon/graphdriver/overlay2/mount.go
+++ b/daemon/graphdriver/overlay2/mount.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package overlay2 // import "github.com/docker/docker/daemon/graphdriver/overlay2"
 
diff --git a/daemon/graphdriver/overlay2/overlay.go b/daemon/graphdriver/overlay2/overlay.go
index 08e739ca04..cfc93cb113 100644
--- a/daemon/graphdriver/overlay2/overlay.go
+++ b/daemon/graphdriver/overlay2/overlay.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package overlay2 // import "github.com/docker/docker/daemon/graphdriver/overlay2"
 
diff --git a/daemon/graphdriver/overlay2/overlay_test.go b/daemon/graphdriver/overlay2/overlay_test.go
index fbf25fe75b..9655bb77a9 100644
--- a/daemon/graphdriver/overlay2/overlay_test.go
+++ b/daemon/graphdriver/overlay2/overlay_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package overlay2 // import "github.com/docker/docker/daemon/graphdriver/overlay2"
 
diff --git a/daemon/graphdriver/overlay2/overlay_unsupported.go b/daemon/graphdriver/overlay2/overlay_unsupported.go
index e34c13df60..b4ea3907c9 100644
--- a/daemon/graphdriver/overlay2/overlay_unsupported.go
+++ b/daemon/graphdriver/overlay2/overlay_unsupported.go
@@ -1,4 +1,3 @@
 //go:build !linux
-// +build !linux
 
 package overlay2 // import "github.com/docker/docker/daemon/graphdriver/overlay2"
diff --git a/daemon/graphdriver/register/register_btrfs.go b/daemon/graphdriver/register/register_btrfs.go
index 5167f8553d..414677115f 100644
--- a/daemon/graphdriver/register/register_btrfs.go
+++ b/daemon/graphdriver/register/register_btrfs.go
@@ -1,5 +1,4 @@
 //go:build !exclude_graphdriver_btrfs && linux
-// +build !exclude_graphdriver_btrfs,linux
 
 package register // import "github.com/docker/docker/daemon/graphdriver/register"
 
diff --git a/daemon/graphdriver/register/register_fuseoverlayfs.go b/daemon/graphdriver/register/register_fuseoverlayfs.go
index c4ebdf2628..4d3a959b7d 100644
--- a/daemon/graphdriver/register/register_fuseoverlayfs.go
+++ b/daemon/graphdriver/register/register_fuseoverlayfs.go
@@ -1,5 +1,4 @@
 //go:build !exclude_graphdriver_fuseoverlayfs && linux
-// +build !exclude_graphdriver_fuseoverlayfs,linux
 
 package register // import "github.com/docker/docker/daemon/graphdriver/register"
 
diff --git a/daemon/graphdriver/register/register_overlay2.go b/daemon/graphdriver/register/register_overlay2.go
index 53233c5009..e23c127c64 100644
--- a/daemon/graphdriver/register/register_overlay2.go
+++ b/daemon/graphdriver/register/register_overlay2.go
@@ -1,5 +1,4 @@
 //go:build !exclude_graphdriver_overlay2 && linux
-// +build !exclude_graphdriver_overlay2,linux
 
 package register // import "github.com/docker/docker/daemon/graphdriver/register"
 
diff --git a/daemon/graphdriver/register/register_zfs.go b/daemon/graphdriver/register/register_zfs.go
index 2632864b4e..91d0de7f3e 100644
--- a/daemon/graphdriver/register/register_zfs.go
+++ b/daemon/graphdriver/register/register_zfs.go
@@ -1,5 +1,4 @@
 //go:build (!exclude_graphdriver_zfs && linux) || (!exclude_graphdriver_zfs && freebsd)
-// +build !exclude_graphdriver_zfs,linux !exclude_graphdriver_zfs,freebsd
 
 package register // import "github.com/docker/docker/daemon/graphdriver/register"
 
diff --git a/daemon/graphdriver/vfs/copy_unsupported.go b/daemon/graphdriver/vfs/copy_unsupported.go
index 92aac565ab..60c6b0a2ff 100644
--- a/daemon/graphdriver/vfs/copy_unsupported.go
+++ b/daemon/graphdriver/vfs/copy_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package vfs // import "github.com/docker/docker/daemon/graphdriver/vfs"
 
diff --git a/daemon/graphdriver/vfs/quota_unsupported.go b/daemon/graphdriver/vfs/quota_unsupported.go
index ecd16ebdda..ce414aa146 100644
--- a/daemon/graphdriver/vfs/quota_unsupported.go
+++ b/daemon/graphdriver/vfs/quota_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package vfs // import "github.com/docker/docker/daemon/graphdriver/vfs"
 
diff --git a/daemon/graphdriver/vfs/vfs_test.go b/daemon/graphdriver/vfs/vfs_test.go
index 47b02e1417..4bf303fcbc 100644
--- a/daemon/graphdriver/vfs/vfs_test.go
+++ b/daemon/graphdriver/vfs/vfs_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package vfs // import "github.com/docker/docker/daemon/graphdriver/vfs"
 
diff --git a/daemon/graphdriver/zfs/zfs.go b/daemon/graphdriver/zfs/zfs.go
index b704a79052..b166fca142 100644
--- a/daemon/graphdriver/zfs/zfs.go
+++ b/daemon/graphdriver/zfs/zfs.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package zfs // import "github.com/docker/docker/daemon/graphdriver/zfs"
 
diff --git a/daemon/graphdriver/zfs/zfs_test.go b/daemon/graphdriver/zfs/zfs_test.go
index f8bcdaf524..540bb91791 100644
--- a/daemon/graphdriver/zfs/zfs_test.go
+++ b/daemon/graphdriver/zfs/zfs_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package zfs // import "github.com/docker/docker/daemon/graphdriver/zfs"
 
diff --git a/daemon/graphdriver/zfs/zfs_unsupported.go b/daemon/graphdriver/zfs/zfs_unsupported.go
index a1eda73e69..7298c4284c 100644
--- a/daemon/graphdriver/zfs/zfs_unsupported.go
+++ b/daemon/graphdriver/zfs/zfs_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux && !freebsd
-// +build !linux,!freebsd
 
 package zfs // import "github.com/docker/docker/daemon/graphdriver/zfs"
 
diff --git a/daemon/images/image_unix.go b/daemon/images/image_unix.go
index dce61a5a30..8796eff6ed 100644
--- a/daemon/images/image_unix.go
+++ b/daemon/images/image_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package images // import "github.com/docker/docker/daemon/images"
 
diff --git a/daemon/info_unix.go b/daemon/info_unix.go
index a677b3ceb0..d89d526292 100644
--- a/daemon/info_unix.go
+++ b/daemon/info_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package daemon // import "github.com/docker/docker/daemon"
 
diff --git a/daemon/info_unix_test.go b/daemon/info_unix_test.go
index 4dfe6e4efa..a2f541bb8a 100644
--- a/daemon/info_unix_test.go
+++ b/daemon/info_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package daemon // import "github.com/docker/docker/daemon"
 
diff --git a/daemon/keys.go b/daemon/keys.go
index e736946355..810b42a591 100644
--- a/daemon/keys.go
+++ b/daemon/keys.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package daemon // import "github.com/docker/docker/daemon"
 
diff --git a/daemon/keys_unsupported.go b/daemon/keys_unsupported.go
index 917f94192c..ac031ce02a 100644
--- a/daemon/keys_unsupported.go
+++ b/daemon/keys_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package daemon // import "github.com/docker/docker/daemon"
 
diff --git a/daemon/list_unix.go b/daemon/list_unix.go
index af86834a10..7f37cd0a39 100644
--- a/daemon/list_unix.go
+++ b/daemon/list_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package daemon // import "github.com/docker/docker/daemon"
 
diff --git a/daemon/listeners/group_unix.go b/daemon/listeners/group_unix.go
index 546871ed87..c278651f8e 100644
--- a/daemon/listeners/group_unix.go
+++ b/daemon/listeners/group_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package listeners // import "github.com/docker/docker/daemon/listeners"
 
diff --git a/daemon/logger/gelf/gelf_test.go b/daemon/logger/gelf/gelf_test.go
index 144dc544d3..a8a5b2cb02 100644
--- a/daemon/logger/gelf/gelf_test.go
+++ b/daemon/logger/gelf/gelf_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package gelf // import "github.com/docker/docker/daemon/logger/gelf"
 
diff --git a/daemon/logger/journald/internal/sdjournal/sdjournal.go b/daemon/logger/journald/internal/sdjournal/sdjournal.go
index 5d78f17fdb..f3ea6826d8 100644
--- a/daemon/logger/journald/internal/sdjournal/sdjournal.go
+++ b/daemon/logger/journald/internal/sdjournal/sdjournal.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !static_build && journald
-// +build linux,cgo,!static_build,journald
 
 package sdjournal // import "github.com/docker/docker/daemon/logger/journald/internal/sdjournal"
 
diff --git a/daemon/logger/journald/journald.go b/daemon/logger/journald/journald.go
index fb04a45eb5..5d155e0ee4 100644
--- a/daemon/logger/journald/journald.go
+++ b/daemon/logger/journald/journald.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package journald // import "github.com/docker/docker/daemon/logger/journald"
 
diff --git a/daemon/logger/journald/journald_test.go b/daemon/logger/journald/journald_test.go
index 385e1db93d..6f67357617 100644
--- a/daemon/logger/journald/journald_test.go
+++ b/daemon/logger/journald/journald_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package journald // import "github.com/docker/docker/daemon/logger/journald"
 
diff --git a/daemon/logger/journald/read.go b/daemon/logger/journald/read.go
index 8c2b7db26a..5396345564 100644
--- a/daemon/logger/journald/read.go
+++ b/daemon/logger/journald/read.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !static_build && journald
-// +build linux,cgo,!static_build,journald
 
 package journald // import "github.com/docker/docker/daemon/logger/journald"
 
diff --git a/daemon/logger/journald/read_test.go b/daemon/logger/journald/read_test.go
index 2b3413a30e..86fc6b280d 100644
--- a/daemon/logger/journald/read_test.go
+++ b/daemon/logger/journald/read_test.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !static_build && journald
-// +build linux,cgo,!static_build,journald
 
 package journald // import "github.com/docker/docker/daemon/logger/journald"
 
diff --git a/daemon/logger/loggerutils/file_unix.go b/daemon/logger/loggerutils/file_unix.go
index 0deabefe1a..f505691c4d 100644
--- a/daemon/logger/loggerutils/file_unix.go
+++ b/daemon/logger/loggerutils/file_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package loggerutils
 
diff --git a/daemon/logger/loggerutils/logfile_race_test.go b/daemon/logger/loggerutils/logfile_race_test.go
index 8a0442d2ce..25850d996d 100644
--- a/daemon/logger/loggerutils/logfile_race_test.go
+++ b/daemon/logger/loggerutils/logfile_race_test.go
@@ -1,5 +1,4 @@
 //go:build race
-// +build race
 
 package loggerutils // import "github.com/docker/docker/daemon/logger/loggerutils"
 
diff --git a/daemon/logger/plugin_unix.go b/daemon/logger/plugin_unix.go
index a59fda860a..1670708fd8 100644
--- a/daemon/logger/plugin_unix.go
+++ b/daemon/logger/plugin_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package logger // import "github.com/docker/docker/daemon/logger"
 
diff --git a/daemon/logger/plugin_unsupported.go b/daemon/logger/plugin_unsupported.go
index fbbeba0c21..de2d4fb259 100644
--- a/daemon/logger/plugin_unsupported.go
+++ b/daemon/logger/plugin_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux && !freebsd
-// +build !linux,!freebsd
 
 package logger // import "github.com/docker/docker/daemon/logger"
 
diff --git a/daemon/metrics_unix.go b/daemon/metrics_unix.go
index 6acc469c9c..949280059c 100644
--- a/daemon/metrics_unix.go
+++ b/daemon/metrics_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package daemon // import "github.com/docker/docker/daemon"
 
diff --git a/daemon/metrics_unsupported.go b/daemon/metrics_unsupported.go
index 2a25b73d94..844143c71f 100644
--- a/daemon/metrics_unsupported.go
+++ b/daemon/metrics_unsupported.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package daemon // import "github.com/docker/docker/daemon"
 
diff --git a/daemon/network/filter_test.go b/daemon/network/filter_test.go
index f1cd345a5a..7fdd9dc2e4 100644
--- a/daemon/network/filter_test.go
+++ b/daemon/network/filter_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package network // import "github.com/docker/docker/daemon/network"
 
diff --git a/daemon/reload_unix.go b/daemon/reload_unix.go
index 4adde34643..bc48c13154 100644
--- a/daemon/reload_unix.go
+++ b/daemon/reload_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package daemon // import "github.com/docker/docker/daemon"
 
diff --git a/daemon/resize_test.go b/daemon/resize_test.go
index b17e1fc3d0..ec3c710fda 100644
--- a/daemon/resize_test.go
+++ b/daemon/resize_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package daemon
 
diff --git a/daemon/runtime_unix.go b/daemon/runtime_unix.go
index f9cb6bb08b..be42d29f34 100644
--- a/daemon/runtime_unix.go
+++ b/daemon/runtime_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package daemon
 
diff --git a/daemon/runtime_unix_test.go b/daemon/runtime_unix_test.go
index 570d353650..02a2569276 100644
--- a/daemon/runtime_unix_test.go
+++ b/daemon/runtime_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package daemon
 
diff --git a/daemon/seccomp_unsupported.go b/daemon/seccomp_unsupported.go
index 97fe70b30a..0fa73bd647 100644
--- a/daemon/seccomp_unsupported.go
+++ b/daemon/seccomp_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package daemon // import "github.com/docker/docker/daemon"
 
diff --git a/daemon/secrets_unsupported.go b/daemon/secrets_unsupported.go
index 678b7c34c0..d3bb1becad 100644
--- a/daemon/secrets_unsupported.go
+++ b/daemon/secrets_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux && !windows
-// +build !linux,!windows
 
 package daemon // import "github.com/docker/docker/daemon"
 
diff --git a/daemon/start_unix.go b/daemon/start_unix.go
index bfa187c80f..ef4dadb74b 100644
--- a/daemon/start_unix.go
+++ b/daemon/start_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package daemon // import "github.com/docker/docker/daemon"
 
diff --git a/daemon/stats/collector_unix.go b/daemon/stats/collector_unix.go
index 215fe26e46..27d33e941d 100644
--- a/daemon/stats/collector_unix.go
+++ b/daemon/stats/collector_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package stats // import "github.com/docker/docker/daemon/stats"
 
diff --git a/daemon/stats_unix.go b/daemon/stats_unix.go
index ebc4d31da6..3a64785254 100644
--- a/daemon/stats_unix.go
+++ b/daemon/stats_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package daemon // import "github.com/docker/docker/daemon"
 
diff --git a/daemon/top_unix.go b/daemon/top_unix.go
index 68da2596e4..b94216a255 100644
--- a/daemon/top_unix.go
+++ b/daemon/top_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package daemon // import "github.com/docker/docker/daemon"
 
diff --git a/daemon/top_unix_test.go b/daemon/top_unix_test.go
index a663323b67..0a7fd92b9c 100644
--- a/daemon/top_unix_test.go
+++ b/daemon/top_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package daemon // import "github.com/docker/docker/daemon"
 
diff --git a/daemon/volumes_unix.go b/daemon/volumes_unix.go
index 8e63203243..466f8bcbad 100644
--- a/daemon/volumes_unix.go
+++ b/daemon/volumes_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package daemon // import "github.com/docker/docker/daemon"
 
diff --git a/distribution/pull_v2_unix.go b/distribution/pull_v2_unix.go
index 1c1524bd15..b71719244f 100644
--- a/distribution/pull_v2_unix.go
+++ b/distribution/pull_v2_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package distribution // import "github.com/docker/docker/distribution"
 
diff --git a/integration-cli/docker_api_build_windows_test.go b/integration-cli/docker_api_build_windows_test.go
index e69586e8fd..397657620a 100644
--- a/integration-cli/docker_api_build_windows_test.go
+++ b/integration-cli/docker_api_build_windows_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package main
 
diff --git a/integration-cli/docker_api_containers_unix_test.go b/integration-cli/docker_api_containers_unix_test.go
index be0eb1eb4b..1477550bda 100644
--- a/integration-cli/docker_api_containers_unix_test.go
+++ b/integration-cli/docker_api_containers_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 
diff --git a/integration-cli/docker_api_containers_windows_test.go b/integration-cli/docker_api_containers_windows_test.go
index 88c2303c62..4512992d39 100644
--- a/integration-cli/docker_api_containers_windows_test.go
+++ b/integration-cli/docker_api_containers_windows_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package main
 
diff --git a/integration-cli/docker_api_swarm_node_test.go b/integration-cli/docker_api_swarm_node_test.go
index 0f2dffc7ae..925b08dda5 100644
--- a/integration-cli/docker_api_swarm_node_test.go
+++ b/integration-cli/docker_api_swarm_node_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 
diff --git a/integration-cli/docker_api_swarm_service_test.go b/integration-cli/docker_api_swarm_service_test.go
index 38078b76f4..a87ba4c942 100644
--- a/integration-cli/docker_api_swarm_service_test.go
+++ b/integration-cli/docker_api_swarm_service_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 
diff --git a/integration-cli/docker_api_swarm_test.go b/integration-cli/docker_api_swarm_test.go
index dc3d18c828..088a9eaf35 100644
--- a/integration-cli/docker_api_swarm_test.go
+++ b/integration-cli/docker_api_swarm_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 
diff --git a/integration-cli/docker_cli_attach_unix_test.go b/integration-cli/docker_cli_attach_unix_test.go
index 89d22b7a6a..c0db3f4a12 100644
--- a/integration-cli/docker_cli_attach_unix_test.go
+++ b/integration-cli/docker_cli_attach_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 
diff --git a/integration-cli/docker_cli_build_unix_test.go b/integration-cli/docker_cli_build_unix_test.go
index 3d59d62fcb..94909bd0b2 100644
--- a/integration-cli/docker_cli_build_unix_test.go
+++ b/integration-cli/docker_cli_build_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 
diff --git a/integration-cli/docker_cli_cp_to_container_unix_test.go b/integration-cli/docker_cli_cp_to_container_unix_test.go
index 68eb4b92f9..040b9322df 100644
--- a/integration-cli/docker_cli_cp_to_container_unix_test.go
+++ b/integration-cli/docker_cli_cp_to_container_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 
diff --git a/integration-cli/docker_cli_daemon_plugins_test.go b/integration-cli/docker_cli_daemon_plugins_test.go
index 55695b455a..de63c6f3a4 100644
--- a/integration-cli/docker_cli_daemon_plugins_test.go
+++ b/integration-cli/docker_cli_daemon_plugins_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package main
 
diff --git a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_cli_daemon_test.go
index 1131b1ea11..6908f55739 100644
--- a/integration-cli/docker_cli_daemon_test.go
+++ b/integration-cli/docker_cli_daemon_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package main
 
diff --git a/integration-cli/docker_cli_events_unix_test.go b/integration-cli/docker_cli_events_unix_test.go
index 355dda72c2..e98e0930c3 100644
--- a/integration-cli/docker_cli_events_unix_test.go
+++ b/integration-cli/docker_cli_events_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 
diff --git a/integration-cli/docker_cli_exec_unix_test.go b/integration-cli/docker_cli_exec_unix_test.go
index aea87e76a2..d0682cca34 100644
--- a/integration-cli/docker_cli_exec_unix_test.go
+++ b/integration-cli/docker_cli_exec_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 
diff --git a/integration-cli/docker_cli_info_unix_test.go b/integration-cli/docker_cli_info_unix_test.go
index 64b1dfc17e..b8cfc39187 100644
--- a/integration-cli/docker_cli_info_unix_test.go
+++ b/integration-cli/docker_cli_info_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 
diff --git a/integration-cli/docker_cli_network_unix_test.go b/integration-cli/docker_cli_network_unix_test.go
index 15baedf9fc..6cdfad02ff 100644
--- a/integration-cli/docker_cli_network_unix_test.go
+++ b/integration-cli/docker_cli_network_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 
diff --git a/integration-cli/docker_cli_prune_unix_test.go b/integration-cli/docker_cli_prune_unix_test.go
index 9e4512558e..1c029878e1 100644
--- a/integration-cli/docker_cli_prune_unix_test.go
+++ b/integration-cli/docker_cli_prune_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 
diff --git a/integration-cli/docker_cli_run_unix_test.go b/integration-cli/docker_cli_run_unix_test.go
index 381776b239..23a3e7388c 100644
--- a/integration-cli/docker_cli_run_unix_test.go
+++ b/integration-cli/docker_cli_run_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 
diff --git a/integration-cli/docker_cli_save_load_unix_test.go b/integration-cli/docker_cli_save_load_unix_test.go
index d0ae355a11..816f5cc7f6 100644
--- a/integration-cli/docker_cli_save_load_unix_test.go
+++ b/integration-cli/docker_cli_save_load_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 
diff --git a/integration-cli/docker_cli_service_create_test.go b/integration-cli/docker_cli_service_create_test.go
index 6d4dc3a375..a56fedc0d8 100644
--- a/integration-cli/docker_cli_service_create_test.go
+++ b/integration-cli/docker_cli_service_create_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 
diff --git a/integration-cli/docker_cli_service_health_test.go b/integration-cli/docker_cli_service_health_test.go
index 315ced6ee5..c5330a2a07 100644
--- a/integration-cli/docker_cli_service_health_test.go
+++ b/integration-cli/docker_cli_service_health_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 
diff --git a/integration-cli/docker_cli_service_logs_test.go b/integration-cli/docker_cli_service_logs_test.go
index 34f472a42a..aa5a0618cb 100644
--- a/integration-cli/docker_cli_service_logs_test.go
+++ b/integration-cli/docker_cli_service_logs_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 
diff --git a/integration-cli/docker_cli_service_scale_test.go b/integration-cli/docker_cli_service_scale_test.go
index 40afcc2a8f..4f7e114839 100644
--- a/integration-cli/docker_cli_service_scale_test.go
+++ b/integration-cli/docker_cli_service_scale_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 
diff --git a/integration-cli/docker_cli_swarm_test.go b/integration-cli/docker_cli_swarm_test.go
index 8f924b16a3..a4981b333b 100644
--- a/integration-cli/docker_cli_swarm_test.go
+++ b/integration-cli/docker_cli_swarm_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 
diff --git a/integration-cli/docker_cli_swarm_unix_test.go b/integration-cli/docker_cli_swarm_unix_test.go
index 23eadaad76..1ce31e5eba 100644
--- a/integration-cli/docker_cli_swarm_unix_test.go
+++ b/integration-cli/docker_cli_swarm_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 
diff --git a/integration-cli/docker_cli_update_unix_test.go b/integration-cli/docker_cli_update_unix_test.go
index 32ff33363f..ccde53182a 100644
--- a/integration-cli/docker_cli_update_unix_test.go
+++ b/integration-cli/docker_cli_update_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 
diff --git a/integration-cli/docker_cli_userns_test.go b/integration-cli/docker_cli_userns_test.go
index 8fb0b76608..b30387459c 100644
--- a/integration-cli/docker_cli_userns_test.go
+++ b/integration-cli/docker_cli_userns_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 
diff --git a/integration-cli/docker_deprecated_api_v124_unix_test.go b/integration-cli/docker_deprecated_api_v124_unix_test.go
index f8665f58b1..7012b6b073 100644
--- a/integration-cli/docker_deprecated_api_v124_unix_test.go
+++ b/integration-cli/docker_deprecated_api_v124_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 
diff --git a/integration-cli/requirements_unix_test.go b/integration-cli/requirements_unix_test.go
index cc7c911662..45e5e7204d 100644
--- a/integration-cli/requirements_unix_test.go
+++ b/integration-cli/requirements_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 
diff --git a/integration-cli/test_vars_unix_test.go b/integration-cli/test_vars_unix_test.go
index 57666fc143..4bee4429f8 100644
--- a/integration-cli/test_vars_unix_test.go
+++ b/integration-cli/test_vars_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 
diff --git a/integration-cli/test_vars_windows_test.go b/integration-cli/test_vars_windows_test.go
index c2d892f625..49ebdb3cd6 100644
--- a/integration-cli/test_vars_windows_test.go
+++ b/integration-cli/test_vars_windows_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package main
 
diff --git a/integration-cli/utils_unix_test.go b/integration-cli/utils_unix_test.go
index abb7d2ff83..b20b49958c 100644
--- a/integration-cli/utils_unix_test.go
+++ b/integration-cli/utils_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 
diff --git a/integration/image/remove_unix_test.go b/integration/image/remove_unix_test.go
index 046fa8532e..a82e29f577 100644
--- a/integration/image/remove_unix_test.go
+++ b/integration/image/remove_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package image // import "github.com/docker/docker/integration/image"
 
diff --git a/integration/internal/requirement/requirement_windows.go b/integration/internal/requirement/requirement_windows.go
index 7abcaa2990..6cdf298f69 100644
--- a/integration/internal/requirement/requirement_windows.go
+++ b/integration/internal/requirement/requirement_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package requirement // import "github.com/docker/docker/integration/internal/requirement"
 
diff --git a/integration/network/helpers.go b/integration/network/helpers.go
index ac015b1715..fe45bb4289 100644
--- a/integration/network/helpers.go
+++ b/integration/network/helpers.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package network
 
diff --git a/integration/network/ipvlan/ipvlan_test.go b/integration/network/ipvlan/ipvlan_test.go
index 969772fe96..fea2900a18 100644
--- a/integration/network/ipvlan/ipvlan_test.go
+++ b/integration/network/ipvlan/ipvlan_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package ipvlan // import "github.com/docker/docker/integration/network/ipvlan"
 
diff --git a/integration/network/ipvlan/main_test.go b/integration/network/ipvlan/main_test.go
index 470a75a90f..d4c7619e0f 100644
--- a/integration/network/ipvlan/main_test.go
+++ b/integration/network/ipvlan/main_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package ipvlan // import "github.com/docker/docker/integration/network/ipvlan"
 
diff --git a/integration/network/macvlan/macvlan_test.go b/integration/network/macvlan/macvlan_test.go
index d7dae5c86e..140411290a 100644
--- a/integration/network/macvlan/macvlan_test.go
+++ b/integration/network/macvlan/macvlan_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package macvlan // import "github.com/docker/docker/integration/network/macvlan"
 
diff --git a/integration/network/macvlan/main_test.go b/integration/network/macvlan/main_test.go
index c7adc4f907..d9f90b8ebe 100644
--- a/integration/network/macvlan/main_test.go
+++ b/integration/network/macvlan/main_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package macvlan // import "github.com/docker/docker/integration/network/macvlan"
 
diff --git a/integration/plugin/authz/authz_plugin_test.go b/integration/plugin/authz/authz_plugin_test.go
index 3c8cfc6a65..aeb2425973 100644
--- a/integration/plugin/authz/authz_plugin_test.go
+++ b/integration/plugin/authz/authz_plugin_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package authz // import "github.com/docker/docker/integration/plugin/authz"
 
diff --git a/integration/plugin/authz/authz_plugin_v2_test.go b/integration/plugin/authz/authz_plugin_v2_test.go
index c01f2e7af7..09706f1995 100644
--- a/integration/plugin/authz/authz_plugin_v2_test.go
+++ b/integration/plugin/authz/authz_plugin_v2_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package authz // import "github.com/docker/docker/integration/plugin/authz"
 
diff --git a/integration/plugin/authz/main_test.go b/integration/plugin/authz/main_test.go
index b4e6564081..9d693aa948 100644
--- a/integration/plugin/authz/main_test.go
+++ b/integration/plugin/authz/main_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package authz // import "github.com/docker/docker/integration/plugin/authz"
 
diff --git a/integration/plugin/logging/validation_test.go b/integration/plugin/logging/validation_test.go
index 9a0a46350d..1559d55b37 100644
--- a/integration/plugin/logging/validation_test.go
+++ b/integration/plugin/logging/validation_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package logging
 
diff --git a/integration/system/info_linux_test.go b/integration/system/info_linux_test.go
index 4b5cb5a051..6d31bab289 100644
--- a/integration/system/info_linux_test.go
+++ b/integration/system/info_linux_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package system // import "github.com/docker/docker/integration/system"
 
diff --git a/layer/layer_unix.go b/layer/layer_unix.go
index 24cb880092..989e9ddcf0 100644
--- a/layer/layer_unix.go
+++ b/layer/layer_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd || darwin || openbsd
-// +build linux freebsd darwin openbsd
 
 package layer // import "github.com/docker/docker/layer"
 
diff --git a/layer/layer_unix_test.go b/layer/layer_unix_test.go
index 66ff7c8d32..289cb5c935 100644
--- a/layer/layer_unix_test.go
+++ b/layer/layer_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package layer // import "github.com/docker/docker/layer"
 
diff --git a/libnetwork/drivers/bridge/bridge.go b/libnetwork/drivers/bridge/bridge.go
index 3dafb1e0fe..a71f097df9 100644
--- a/libnetwork/drivers/bridge/bridge.go
+++ b/libnetwork/drivers/bridge/bridge.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package bridge
 
diff --git a/libnetwork/drivers/bridge/bridge_store.go b/libnetwork/drivers/bridge/bridge_store.go
index 7578f964b9..42a53f7a09 100644
--- a/libnetwork/drivers/bridge/bridge_store.go
+++ b/libnetwork/drivers/bridge/bridge_store.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package bridge
 
diff --git a/libnetwork/drivers/bridge/bridge_test.go b/libnetwork/drivers/bridge/bridge_test.go
index 52e047087e..207af2a0e6 100644
--- a/libnetwork/drivers/bridge/bridge_test.go
+++ b/libnetwork/drivers/bridge/bridge_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package bridge
 
diff --git a/libnetwork/drivers/bridge/errors.go b/libnetwork/drivers/bridge/errors.go
index 5cb0692b56..bcf4068b0d 100644
--- a/libnetwork/drivers/bridge/errors.go
+++ b/libnetwork/drivers/bridge/errors.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package bridge
 
diff --git a/libnetwork/drivers/bridge/interface.go b/libnetwork/drivers/bridge/interface.go
index fce5874a38..abf6290826 100644
--- a/libnetwork/drivers/bridge/interface.go
+++ b/libnetwork/drivers/bridge/interface.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package bridge
 
diff --git a/libnetwork/drivers/bridge/interface_test.go b/libnetwork/drivers/bridge/interface_test.go
index 0d4e58bd2e..6c8f214270 100644
--- a/libnetwork/drivers/bridge/interface_test.go
+++ b/libnetwork/drivers/bridge/interface_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package bridge
 
diff --git a/libnetwork/drivers/bridge/link.go b/libnetwork/drivers/bridge/link.go
index 59fa94ba20..527b561b93 100644
--- a/libnetwork/drivers/bridge/link.go
+++ b/libnetwork/drivers/bridge/link.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package bridge
 
diff --git a/libnetwork/drivers/bridge/link_test.go b/libnetwork/drivers/bridge/link_test.go
index 3450292abd..3a1cbf14bd 100644
--- a/libnetwork/drivers/bridge/link_test.go
+++ b/libnetwork/drivers/bridge/link_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package bridge
 
diff --git a/libnetwork/drivers/bridge/network_test.go b/libnetwork/drivers/bridge/network_test.go
index 0c4525a563..0c872f5ac5 100644
--- a/libnetwork/drivers/bridge/network_test.go
+++ b/libnetwork/drivers/bridge/network_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package bridge
 
diff --git a/libnetwork/drivers/bridge/port_mapping.go b/libnetwork/drivers/bridge/port_mapping.go
index e36fe8a04b..b4c405e171 100644
--- a/libnetwork/drivers/bridge/port_mapping.go
+++ b/libnetwork/drivers/bridge/port_mapping.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package bridge
 
diff --git a/libnetwork/drivers/bridge/port_mapping_test.go b/libnetwork/drivers/bridge/port_mapping_test.go
index 17d6e19b51..5d37868b69 100644
--- a/libnetwork/drivers/bridge/port_mapping_test.go
+++ b/libnetwork/drivers/bridge/port_mapping_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package bridge
 
diff --git a/libnetwork/drivers/bridge/setup.go b/libnetwork/drivers/bridge/setup.go
index aa6b1fe9fb..7b5ca0ef1c 100644
--- a/libnetwork/drivers/bridge/setup.go
+++ b/libnetwork/drivers/bridge/setup.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package bridge
 
diff --git a/libnetwork/drivers/bridge/setup_bridgenetfiltering.go b/libnetwork/drivers/bridge/setup_bridgenetfiltering.go
index deac249727..58bbb52b30 100644
--- a/libnetwork/drivers/bridge/setup_bridgenetfiltering.go
+++ b/libnetwork/drivers/bridge/setup_bridgenetfiltering.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package bridge
 
diff --git a/libnetwork/drivers/bridge/setup_bridgenetfiltering_test.go b/libnetwork/drivers/bridge/setup_bridgenetfiltering_test.go
index 67290bde89..29f15847f3 100644
--- a/libnetwork/drivers/bridge/setup_bridgenetfiltering_test.go
+++ b/libnetwork/drivers/bridge/setup_bridgenetfiltering_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package bridge
 
diff --git a/libnetwork/drivers/bridge/setup_device.go b/libnetwork/drivers/bridge/setup_device.go
index 974115603b..12f211b836 100644
--- a/libnetwork/drivers/bridge/setup_device.go
+++ b/libnetwork/drivers/bridge/setup_device.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package bridge
 
diff --git a/libnetwork/drivers/bridge/setup_device_test.go b/libnetwork/drivers/bridge/setup_device_test.go
index 64d8b5b8ea..6bf03073ff 100644
--- a/libnetwork/drivers/bridge/setup_device_test.go
+++ b/libnetwork/drivers/bridge/setup_device_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package bridge
 
diff --git a/libnetwork/drivers/bridge/setup_firewalld.go b/libnetwork/drivers/bridge/setup_firewalld.go
index b0a1ebcaf9..1bd9ad9629 100644
--- a/libnetwork/drivers/bridge/setup_firewalld.go
+++ b/libnetwork/drivers/bridge/setup_firewalld.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package bridge
 
diff --git a/libnetwork/drivers/bridge/setup_ip_forwarding.go b/libnetwork/drivers/bridge/setup_ip_forwarding.go
index 1932b773be..f2d6a7df95 100644
--- a/libnetwork/drivers/bridge/setup_ip_forwarding.go
+++ b/libnetwork/drivers/bridge/setup_ip_forwarding.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package bridge
 
diff --git a/libnetwork/drivers/bridge/setup_ip_forwarding_test.go b/libnetwork/drivers/bridge/setup_ip_forwarding_test.go
index da0cd07d62..26be998080 100644
--- a/libnetwork/drivers/bridge/setup_ip_forwarding_test.go
+++ b/libnetwork/drivers/bridge/setup_ip_forwarding_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package bridge
 
diff --git a/libnetwork/drivers/bridge/setup_ip_tables.go b/libnetwork/drivers/bridge/setup_ip_tables.go
index bd2822e39c..f6e631d612 100644
--- a/libnetwork/drivers/bridge/setup_ip_tables.go
+++ b/libnetwork/drivers/bridge/setup_ip_tables.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package bridge
 
diff --git a/libnetwork/drivers/bridge/setup_ip_tables_test.go b/libnetwork/drivers/bridge/setup_ip_tables_test.go
index 9355be32cb..108c682d11 100644
--- a/libnetwork/drivers/bridge/setup_ip_tables_test.go
+++ b/libnetwork/drivers/bridge/setup_ip_tables_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package bridge
 
diff --git a/libnetwork/drivers/bridge/setup_ipv4.go b/libnetwork/drivers/bridge/setup_ipv4.go
index fc814e81d4..b8787c08b9 100644
--- a/libnetwork/drivers/bridge/setup_ipv4.go
+++ b/libnetwork/drivers/bridge/setup_ipv4.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package bridge
 
diff --git a/libnetwork/drivers/bridge/setup_ipv4_test.go b/libnetwork/drivers/bridge/setup_ipv4_test.go
index 750a75b7c9..e684d2f334 100644
--- a/libnetwork/drivers/bridge/setup_ipv4_test.go
+++ b/libnetwork/drivers/bridge/setup_ipv4_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package bridge
 
diff --git a/libnetwork/drivers/bridge/setup_ipv6.go b/libnetwork/drivers/bridge/setup_ipv6.go
index 0f1380ce55..cf3fbe3b21 100644
--- a/libnetwork/drivers/bridge/setup_ipv6.go
+++ b/libnetwork/drivers/bridge/setup_ipv6.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package bridge
 
diff --git a/libnetwork/drivers/bridge/setup_ipv6_test.go b/libnetwork/drivers/bridge/setup_ipv6_test.go
index be8da291bc..1a95d93d9b 100644
--- a/libnetwork/drivers/bridge/setup_ipv6_test.go
+++ b/libnetwork/drivers/bridge/setup_ipv6_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package bridge
 
diff --git a/libnetwork/drivers/bridge/setup_verify.go b/libnetwork/drivers/bridge/setup_verify.go
index e7fd1bf23c..5e5aacf6be 100644
--- a/libnetwork/drivers/bridge/setup_verify.go
+++ b/libnetwork/drivers/bridge/setup_verify.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package bridge
 
diff --git a/libnetwork/drivers/bridge/setup_verify_test.go b/libnetwork/drivers/bridge/setup_verify_test.go
index b949918b64..eb68f89bb1 100644
--- a/libnetwork/drivers/bridge/setup_verify_test.go
+++ b/libnetwork/drivers/bridge/setup_verify_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package bridge
 
diff --git a/libnetwork/drivers/overlay/encryption.go b/libnetwork/drivers/overlay/encryption.go
index 79f7169b6d..298814282c 100644
--- a/libnetwork/drivers/overlay/encryption.go
+++ b/libnetwork/drivers/overlay/encryption.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package overlay
 
diff --git a/libnetwork/drivers/overlay/joinleave.go b/libnetwork/drivers/overlay/joinleave.go
index f2b7969645..1d99e7d1a4 100644
--- a/libnetwork/drivers/overlay/joinleave.go
+++ b/libnetwork/drivers/overlay/joinleave.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package overlay
 
diff --git a/libnetwork/drivers/overlay/ostweaks_unsupported.go b/libnetwork/drivers/overlay/ostweaks_unsupported.go
index a90019e2d6..a2f9fa0ab0 100644
--- a/libnetwork/drivers/overlay/ostweaks_unsupported.go
+++ b/libnetwork/drivers/overlay/ostweaks_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package overlay
 
diff --git a/libnetwork/drivers/overlay/ov_endpoint.go b/libnetwork/drivers/overlay/ov_endpoint.go
index 24bfc9e8f4..4b51865c4c 100644
--- a/libnetwork/drivers/overlay/ov_endpoint.go
+++ b/libnetwork/drivers/overlay/ov_endpoint.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package overlay
 
diff --git a/libnetwork/drivers/overlay/ov_network.go b/libnetwork/drivers/overlay/ov_network.go
index 3961538b07..b83b31345a 100644
--- a/libnetwork/drivers/overlay/ov_network.go
+++ b/libnetwork/drivers/overlay/ov_network.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package overlay
 
diff --git a/libnetwork/drivers/overlay/ov_utils.go b/libnetwork/drivers/overlay/ov_utils.go
index 1babd8c4ff..21467cfc67 100644
--- a/libnetwork/drivers/overlay/ov_utils.go
+++ b/libnetwork/drivers/overlay/ov_utils.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package overlay
 
diff --git a/libnetwork/drivers/overlay/overlay.go b/libnetwork/drivers/overlay/overlay.go
index 722c36e320..ab77a714e8 100644
--- a/libnetwork/drivers/overlay/overlay.go
+++ b/libnetwork/drivers/overlay/overlay.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package overlay
 
diff --git a/libnetwork/drivers/overlay/overlay_test.go b/libnetwork/drivers/overlay/overlay_test.go
index c22e3f2fe2..fde9831ec0 100644
--- a/libnetwork/drivers/overlay/overlay_test.go
+++ b/libnetwork/drivers/overlay/overlay_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package overlay
 
diff --git a/libnetwork/drivers/overlay/peerdb.go b/libnetwork/drivers/overlay/peerdb.go
index af85f406fc..b233680a76 100644
--- a/libnetwork/drivers/overlay/peerdb.go
+++ b/libnetwork/drivers/overlay/peerdb.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package overlay
 
diff --git a/libnetwork/drivers/overlay/peerdb_test.go b/libnetwork/drivers/overlay/peerdb_test.go
index 1c924f61cf..dd412d0e85 100644
--- a/libnetwork/drivers/overlay/peerdb_test.go
+++ b/libnetwork/drivers/overlay/peerdb_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package overlay
 
diff --git a/libnetwork/drivers/windows/port_mapping.go b/libnetwork/drivers/windows/port_mapping.go
index 56933b62e8..e9037c88f6 100644
--- a/libnetwork/drivers/windows/port_mapping.go
+++ b/libnetwork/drivers/windows/port_mapping.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package windows
 
diff --git a/libnetwork/drivers/windows/windows.go b/libnetwork/drivers/windows/windows.go
index dc3e8e589b..707e788404 100644
--- a/libnetwork/drivers/windows/windows.go
+++ b/libnetwork/drivers/windows/windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 // Shim for the Host Network Service (HNS) to manage networking for
 // Windows Server containers and Hyper-V containers. This module
diff --git a/libnetwork/drivers/windows/windows_store.go b/libnetwork/drivers/windows/windows_store.go
index e5810443d0..988bf409fe 100644
--- a/libnetwork/drivers/windows/windows_store.go
+++ b/libnetwork/drivers/windows/windows_store.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package windows
 
diff --git a/libnetwork/drivers/windows/windows_test.go b/libnetwork/drivers/windows/windows_test.go
index ea248e9d79..1f289d328b 100644
--- a/libnetwork/drivers/windows/windows_test.go
+++ b/libnetwork/drivers/windows/windows_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package windows
 
diff --git a/libnetwork/drivers_unsupported.go b/libnetwork/drivers_unsupported.go
index fd71a1bbca..3157a4a32e 100644
--- a/libnetwork/drivers_unsupported.go
+++ b/libnetwork/drivers_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !freebsd && !linux && !windows
-// +build !freebsd,!linux,!windows
 
 package libnetwork
 
diff --git a/libnetwork/endpoint_info_unix.go b/libnetwork/endpoint_info_unix.go
index 384cd9ebe7..f4f32c16a4 100644
--- a/libnetwork/endpoint_info_unix.go
+++ b/libnetwork/endpoint_info_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package libnetwork
 
diff --git a/libnetwork/endpoint_info_windows.go b/libnetwork/endpoint_info_windows.go
index 1be88fb8e0..595d2ca54f 100644
--- a/libnetwork/endpoint_info_windows.go
+++ b/libnetwork/endpoint_info_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package libnetwork
 
diff --git a/libnetwork/endpoint_test.go b/libnetwork/endpoint_test.go
index be05653d5b..c81c1c8d88 100644
--- a/libnetwork/endpoint_test.go
+++ b/libnetwork/endpoint_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package libnetwork
 
diff --git a/libnetwork/firewall_others.go b/libnetwork/firewall_others.go
index 72aabda0a6..47f1168206 100644
--- a/libnetwork/firewall_others.go
+++ b/libnetwork/firewall_others.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package libnetwork
 
diff --git a/libnetwork/ipams/builtin/builtin_unix.go b/libnetwork/ipams/builtin/builtin_unix.go
index 8cf37499dc..7efcf35525 100644
--- a/libnetwork/ipams/builtin/builtin_unix.go
+++ b/libnetwork/ipams/builtin/builtin_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd || darwin
-// +build linux freebsd darwin
 
 package builtin
 
diff --git a/libnetwork/ipams/builtin/builtin_windows.go b/libnetwork/ipams/builtin/builtin_windows.go
index 84d2e4ae89..55d10cfe5c 100644
--- a/libnetwork/ipams/builtin/builtin_windows.go
+++ b/libnetwork/ipams/builtin/builtin_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package builtin
 
diff --git a/libnetwork/libnetwork_test.go b/libnetwork/libnetwork_test.go
index e3207d4f5c..b284133986 100644
--- a/libnetwork/libnetwork_test.go
+++ b/libnetwork/libnetwork_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package libnetwork_test
 
diff --git a/libnetwork/libnetwork_unix_test.go b/libnetwork/libnetwork_unix_test.go
index e039fa9065..e93bfb9e98 100644
--- a/libnetwork/libnetwork_unix_test.go
+++ b/libnetwork/libnetwork_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package libnetwork_test
 
diff --git a/libnetwork/netutils/utils_linux.go b/libnetwork/netutils/utils_linux.go
index 019309d61b..b5488aa6bb 100644
--- a/libnetwork/netutils/utils_linux.go
+++ b/libnetwork/netutils/utils_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 // Network utility functions.
 
diff --git a/libnetwork/network_unix.go b/libnetwork/network_unix.go
index 8b529b8644..3d95e651a0 100644
--- a/libnetwork/network_unix.go
+++ b/libnetwork/network_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package libnetwork
 
diff --git a/libnetwork/network_windows.go b/libnetwork/network_windows.go
index 75e28113e8..09aaa7ce3c 100644
--- a/libnetwork/network_windows.go
+++ b/libnetwork/network_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package libnetwork
 
diff --git a/libnetwork/osl/interface_unsupported.go b/libnetwork/osl/interface_unsupported.go
index 55a6ae73f1..64b25aaba2 100644
--- a/libnetwork/osl/interface_unsupported.go
+++ b/libnetwork/osl/interface_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package osl
 
diff --git a/libnetwork/osl/kernel/knobs_unsupported.go b/libnetwork/osl/kernel/knobs_unsupported.go
index f0403b7ce0..89e7bfdcaf 100644
--- a/libnetwork/osl/kernel/knobs_unsupported.go
+++ b/libnetwork/osl/kernel/knobs_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package kernel
 
diff --git a/libnetwork/osl/namespace_unsupported.go b/libnetwork/osl/namespace_unsupported.go
index 4179459c13..3e93d837f0 100644
--- a/libnetwork/osl/namespace_unsupported.go
+++ b/libnetwork/osl/namespace_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux && !windows && !freebsd
-// +build !linux,!windows,!freebsd
 
 package osl
 
diff --git a/libnetwork/osl/neigh_unsupported.go b/libnetwork/osl/neigh_unsupported.go
index 6d2f285698..2d40685db7 100644
--- a/libnetwork/osl/neigh_unsupported.go
+++ b/libnetwork/osl/neigh_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package osl
 
diff --git a/libnetwork/osl/sandbox_unsupported.go b/libnetwork/osl/sandbox_unsupported.go
index 8e811a4617..7daf03fb42 100644
--- a/libnetwork/osl/sandbox_unsupported.go
+++ b/libnetwork/osl/sandbox_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux && !windows && !freebsd
-// +build !linux,!windows,!freebsd
 
 package osl
 
diff --git a/libnetwork/osl/sandbox_unsupported_test.go b/libnetwork/osl/sandbox_unsupported_test.go
index 32b4657f2b..0e3c769ddf 100644
--- a/libnetwork/osl/sandbox_unsupported_test.go
+++ b/libnetwork/osl/sandbox_unsupported_test.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package osl
 
diff --git a/libnetwork/portallocator/portallocator_unix.go b/libnetwork/portallocator/portallocator_unix.go
index ac8e863de9..6b297d6af5 100644
--- a/libnetwork/portallocator/portallocator_unix.go
+++ b/libnetwork/portallocator/portallocator_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package portallocator
 
diff --git a/libnetwork/resolvconf/resolvconf_unix_test.go b/libnetwork/resolvconf/resolvconf_unix_test.go
index 7919bfdf79..bd37de4833 100644
--- a/libnetwork/resolvconf/resolvconf_unix_test.go
+++ b/libnetwork/resolvconf/resolvconf_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package resolvconf
 
diff --git a/libnetwork/resolver_unix.go b/libnetwork/resolver_unix.go
index 7b0511bcff..62ced7d520 100644
--- a/libnetwork/resolver_unix.go
+++ b/libnetwork/resolver_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package libnetwork
 
diff --git a/libnetwork/resolver_windows.go b/libnetwork/resolver_windows.go
index a3b17fcb4d..df08ec3a75 100644
--- a/libnetwork/resolver_windows.go
+++ b/libnetwork/resolver_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package libnetwork
 
diff --git a/libnetwork/sandbox_dns_unix.go b/libnetwork/sandbox_dns_unix.go
index 2218c6960e..b809e8c3b8 100644
--- a/libnetwork/sandbox_dns_unix.go
+++ b/libnetwork/sandbox_dns_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package libnetwork
 
diff --git a/libnetwork/sandbox_dns_windows.go b/libnetwork/sandbox_dns_windows.go
index 2eab97e4f9..35e0a49de4 100644
--- a/libnetwork/sandbox_dns_windows.go
+++ b/libnetwork/sandbox_dns_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package libnetwork
 
diff --git a/libnetwork/sandbox_externalkey_unix.go b/libnetwork/sandbox_externalkey_unix.go
index bb64e23889..0138e6b7ed 100644
--- a/libnetwork/sandbox_externalkey_unix.go
+++ b/libnetwork/sandbox_externalkey_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package libnetwork
 
diff --git a/libnetwork/sandbox_externalkey_unsupported.go b/libnetwork/sandbox_externalkey_unsupported.go
index 5edb72011d..499c38adc7 100644
--- a/libnetwork/sandbox_externalkey_unsupported.go
+++ b/libnetwork/sandbox_externalkey_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux && !freebsd
-// +build !linux,!freebsd
 
 package libnetwork
 
diff --git a/libnetwork/service_common.go b/libnetwork/service_common.go
index e04f4048ed..9c8b4c3dcf 100644
--- a/libnetwork/service_common.go
+++ b/libnetwork/service_common.go
@@ -1,5 +1,4 @@
 //go:build linux || windows
-// +build linux windows
 
 package libnetwork
 
diff --git a/libnetwork/service_unsupported.go b/libnetwork/service_unsupported.go
index 2fcfa99a90..87d48a1704 100644
--- a/libnetwork/service_unsupported.go
+++ b/libnetwork/service_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux && !windows
-// +build !linux,!windows
 
 package libnetwork
 
diff --git a/libnetwork/testutils/context_unix.go b/libnetwork/testutils/context_unix.go
index c60cd915c3..a9c92c6f8d 100644
--- a/libnetwork/testutils/context_unix.go
+++ b/libnetwork/testutils/context_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package testutils
 
diff --git a/oci/caps/utils_other.go b/oci/caps/utils_other.go
index 5634a65720..03c3d9df9f 100644
--- a/oci/caps/utils_other.go
+++ b/oci/caps/utils_other.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package caps // import "github.com/docker/docker/oci/caps"
 
diff --git a/oci/seccomp_test.go b/oci/seccomp_test.go
index 814cdaa7c0..7fc1af9b9b 100644
--- a/oci/seccomp_test.go
+++ b/oci/seccomp_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package oci
 
diff --git a/opts/hosts_unix.go b/opts/hosts_unix.go
index 4b1c8512e2..2024465cfd 100644
--- a/opts/hosts_unix.go
+++ b/opts/hosts_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package opts // import "github.com/docker/docker/opts"
 
diff --git a/pkg/archive/archive_other.go b/pkg/archive/archive_other.go
index 28ae2769c5..3de1d64c80 100644
--- a/pkg/archive/archive_other.go
+++ b/pkg/archive/archive_other.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package archive // import "github.com/docker/docker/pkg/archive"
 
diff --git a/pkg/archive/archive_unix.go b/pkg/archive/archive_unix.go
index 92d8e23dd0..09bd00c882 100644
--- a/pkg/archive/archive_unix.go
+++ b/pkg/archive/archive_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package archive // import "github.com/docker/docker/pkg/archive"
 
diff --git a/pkg/archive/archive_unix_test.go b/pkg/archive/archive_unix_test.go
index 2e9726b729..38c16be73a 100644
--- a/pkg/archive/archive_unix_test.go
+++ b/pkg/archive/archive_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package archive // import "github.com/docker/docker/pkg/archive"
 
diff --git a/pkg/archive/archive_windows_test.go b/pkg/archive/archive_windows_test.go
index 89c8de5142..85a0b7ac41 100644
--- a/pkg/archive/archive_windows_test.go
+++ b/pkg/archive/archive_windows_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package archive // import "github.com/docker/docker/pkg/archive"
 
diff --git a/pkg/archive/changes_other.go b/pkg/archive/changes_other.go
index 833798bd11..13a7d3c0c6 100644
--- a/pkg/archive/changes_other.go
+++ b/pkg/archive/changes_other.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package archive // import "github.com/docker/docker/pkg/archive"
 
diff --git a/pkg/archive/changes_unix.go b/pkg/archive/changes_unix.go
index 54aace970e..853c73ee8c 100644
--- a/pkg/archive/changes_unix.go
+++ b/pkg/archive/changes_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package archive // import "github.com/docker/docker/pkg/archive"
 
diff --git a/pkg/archive/copy_unix.go b/pkg/archive/copy_unix.go
index 2ac7729f4c..065bd4adda 100644
--- a/pkg/archive/copy_unix.go
+++ b/pkg/archive/copy_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package archive // import "github.com/docker/docker/pkg/archive"
 
diff --git a/pkg/archive/copy_unix_test.go b/pkg/archive/copy_unix_test.go
index 99e195bebf..e479f7564e 100644
--- a/pkg/archive/copy_unix_test.go
+++ b/pkg/archive/copy_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 // TODO Windows: Some of these tests may be salvageable and portable to Windows.
 
diff --git a/pkg/archive/diff_unix.go b/pkg/archive/diff_unix.go
index d7f806445e..7216f2f4f9 100644
--- a/pkg/archive/diff_unix.go
+++ b/pkg/archive/diff_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package archive
 
diff --git a/pkg/archive/example_changes.go b/pkg/archive/example_changes.go
index 36cb6c3cb5..73caff86f4 100644
--- a/pkg/archive/example_changes.go
+++ b/pkg/archive/example_changes.go
@@ -1,5 +1,4 @@
 //go:build ignore
-// +build ignore
 
 // Simple tool to create an archive stream from an old and new directory
 //
diff --git a/pkg/archive/path_unix.go b/pkg/archive/path_unix.go
index 0b135aea75..390264bf85 100644
--- a/pkg/archive/path_unix.go
+++ b/pkg/archive/path_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package archive
 
diff --git a/pkg/archive/time_unsupported.go b/pkg/archive/time_unsupported.go
index d087796861..14c4ceb1d8 100644
--- a/pkg/archive/time_unsupported.go
+++ b/pkg/archive/time_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package archive // import "github.com/docker/docker/pkg/archive"
 
diff --git a/pkg/authorization/authz_unix_test.go b/pkg/authorization/authz_unix_test.go
index 835cb70383..c9b18d96e9 100644
--- a/pkg/authorization/authz_unix_test.go
+++ b/pkg/authorization/authz_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 // TODO Windows: This uses a Unix socket for testing. This might be possible
 // to port to Windows using a named pipe instead.
diff --git a/pkg/authorization/middleware_unix_test.go b/pkg/authorization/middleware_unix_test.go
index b29e7d272d..680baf83a2 100644
--- a/pkg/authorization/middleware_unix_test.go
+++ b/pkg/authorization/middleware_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package authorization // import "github.com/docker/docker/pkg/authorization"
 
diff --git a/pkg/chrootarchive/archive_unix.go b/pkg/chrootarchive/archive_unix.go
index 1e0e2382ec..13d10d5c8e 100644
--- a/pkg/chrootarchive/archive_unix.go
+++ b/pkg/chrootarchive/archive_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package chrootarchive // import "github.com/docker/docker/pkg/chrootarchive"
 
diff --git a/pkg/chrootarchive/archive_unix_test.go b/pkg/chrootarchive/archive_unix_test.go
index 6a3ca974fc..e0ab69780a 100644
--- a/pkg/chrootarchive/archive_unix_test.go
+++ b/pkg/chrootarchive/archive_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package chrootarchive
 
diff --git a/pkg/chrootarchive/diff_unix.go b/pkg/chrootarchive/diff_unix.go
index 873390c57f..9f7c808ba6 100644
--- a/pkg/chrootarchive/diff_unix.go
+++ b/pkg/chrootarchive/diff_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package chrootarchive // import "github.com/docker/docker/pkg/chrootarchive"
 
diff --git a/pkg/containerfs/containerfs_unix.go b/pkg/containerfs/containerfs_unix.go
index 3e18599989..1e0b8a99a6 100644
--- a/pkg/containerfs/containerfs_unix.go
+++ b/pkg/containerfs/containerfs_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package containerfs // import "github.com/docker/docker/pkg/containerfs"
 
diff --git a/pkg/containerfs/rm.go b/pkg/containerfs/rm.go
index 7abca3a804..303714a180 100644
--- a/pkg/containerfs/rm.go
+++ b/pkg/containerfs/rm.go
@@ -1,5 +1,4 @@
 //go:build !darwin && !windows
-// +build !darwin,!windows
 
 package containerfs // import "github.com/docker/docker/pkg/containerfs"
 
diff --git a/pkg/containerfs/rm_nodarwin_test.go b/pkg/containerfs/rm_nodarwin_test.go
index 03828970cb..dcb5aae211 100644
--- a/pkg/containerfs/rm_nodarwin_test.go
+++ b/pkg/containerfs/rm_nodarwin_test.go
@@ -1,5 +1,4 @@
 //go:build !darwin
-// +build !darwin
 
 package containerfs // import "github.com/docker/docker/pkg/containerfs"
 
diff --git a/pkg/containerfs/rm_test.go b/pkg/containerfs/rm_test.go
index 6734d8ec04..4924134dcd 100644
--- a/pkg/containerfs/rm_test.go
+++ b/pkg/containerfs/rm_test.go
@@ -1,5 +1,4 @@
 //go:build !darwin && !windows
-// +build !darwin,!windows
 
 package containerfs // import "github.com/docker/docker/pkg/containerfs"
 
diff --git a/pkg/directory/directory_unix.go b/pkg/directory/directory_unix.go
index 4592205f63..548c6e117f 100644
--- a/pkg/directory/directory_unix.go
+++ b/pkg/directory/directory_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd || darwin
-// +build linux freebsd darwin
 
 package directory // import "github.com/docker/docker/pkg/directory"
 
diff --git a/pkg/fileutils/fileutils_unix.go b/pkg/fileutils/fileutils_unix.go
index f782b4266a..fbdbfd04a2 100644
--- a/pkg/fileutils/fileutils_unix.go
+++ b/pkg/fileutils/fileutils_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package fileutils // import "github.com/docker/docker/pkg/fileutils"
 
diff --git a/pkg/homedir/homedir_others.go b/pkg/homedir/homedir_others.go
index 11f1bec985..4eeb26b5dc 100644
--- a/pkg/homedir/homedir_others.go
+++ b/pkg/homedir/homedir_others.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package homedir // import "github.com/docker/docker/pkg/homedir"
 
diff --git a/pkg/homedir/homedir_unix.go b/pkg/homedir/homedir_unix.go
index d1732dee52..5c7e520d2e 100644
--- a/pkg/homedir/homedir_unix.go
+++ b/pkg/homedir/homedir_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package homedir // import "github.com/docker/docker/pkg/homedir"
 
diff --git a/pkg/idtools/idtools_unix.go b/pkg/idtools/idtools_unix.go
index 72e9c08a10..2df4ae8fd3 100644
--- a/pkg/idtools/idtools_unix.go
+++ b/pkg/idtools/idtools_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package idtools // import "github.com/docker/docker/pkg/idtools"
 
diff --git a/pkg/idtools/idtools_unix_test.go b/pkg/idtools/idtools_unix_test.go
index 5a4acc25d1..c9a2f64f42 100644
--- a/pkg/idtools/idtools_unix_test.go
+++ b/pkg/idtools/idtools_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package idtools // import "github.com/docker/docker/pkg/idtools"
 
diff --git a/pkg/idtools/usergroupadd_unsupported.go b/pkg/idtools/usergroupadd_unsupported.go
index 5e24577e2c..6a9311c4a7 100644
--- a/pkg/idtools/usergroupadd_unsupported.go
+++ b/pkg/idtools/usergroupadd_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package idtools // import "github.com/docker/docker/pkg/idtools"
 
diff --git a/pkg/idtools/utils_unix.go b/pkg/idtools/utils_unix.go
index 05cc696365..517a2f52ca 100644
--- a/pkg/idtools/utils_unix.go
+++ b/pkg/idtools/utils_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package idtools // import "github.com/docker/docker/pkg/idtools"
 
diff --git a/pkg/meminfo/meminfo_unix_test.go b/pkg/meminfo/meminfo_unix_test.go
index 8bb9eb191b..b85c780bc2 100644
--- a/pkg/meminfo/meminfo_unix_test.go
+++ b/pkg/meminfo/meminfo_unix_test.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package meminfo
 
diff --git a/pkg/meminfo/meminfo_unsupported.go b/pkg/meminfo/meminfo_unsupported.go
index ebfadd5343..3d03441c12 100644
--- a/pkg/meminfo/meminfo_unsupported.go
+++ b/pkg/meminfo/meminfo_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux && !windows
-// +build !linux,!windows
 
 package meminfo
 
diff --git a/pkg/parsers/kernel/kernel.go b/pkg/parsers/kernel/kernel.go
index 3245b74166..505f81bb20 100644
--- a/pkg/parsers/kernel/kernel.go
+++ b/pkg/parsers/kernel/kernel.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 // Package kernel provides helper function to get, parse and compare kernel
 // versions for different platforms.
diff --git a/pkg/parsers/kernel/kernel_darwin.go b/pkg/parsers/kernel/kernel_darwin.go
index 73f233e782..86c92d5395 100644
--- a/pkg/parsers/kernel/kernel_darwin.go
+++ b/pkg/parsers/kernel/kernel_darwin.go
@@ -1,5 +1,4 @@
 //go:build darwin
-// +build darwin
 
 // Package kernel provides helper function to get, parse and compare kernel
 // versions for different platforms.
diff --git a/pkg/parsers/kernel/kernel_unix.go b/pkg/parsers/kernel/kernel_unix.go
index 52c20f32aa..610b3184a6 100644
--- a/pkg/parsers/kernel/kernel_unix.go
+++ b/pkg/parsers/kernel/kernel_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd || openbsd
-// +build linux freebsd openbsd
 
 package kernel // import "github.com/docker/docker/pkg/parsers/kernel"
 
diff --git a/pkg/parsers/kernel/kernel_unix_test.go b/pkg/parsers/kernel/kernel_unix_test.go
index 1ab3435fa8..1a28ae737c 100644
--- a/pkg/parsers/kernel/kernel_unix_test.go
+++ b/pkg/parsers/kernel/kernel_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package kernel // import "github.com/docker/docker/pkg/parsers/kernel"
 
diff --git a/pkg/parsers/kernel/uname_unsupported.go b/pkg/parsers/kernel/uname_unsupported.go
index 156a5ea8ed..ce38c7bde1 100644
--- a/pkg/parsers/kernel/uname_unsupported.go
+++ b/pkg/parsers/kernel/uname_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package kernel // import "github.com/docker/docker/pkg/parsers/kernel"
 
diff --git a/pkg/parsers/operatingsystem/operatingsystem_linux_test.go b/pkg/parsers/operatingsystem/operatingsystem_linux_test.go
index d0ca93e971..2746202170 100644
--- a/pkg/parsers/operatingsystem/operatingsystem_linux_test.go
+++ b/pkg/parsers/operatingsystem/operatingsystem_linux_test.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package operatingsystem // import "github.com/docker/docker/pkg/parsers/operatingsystem"
 
diff --git a/pkg/parsers/operatingsystem/operatingsystem_unix.go b/pkg/parsers/operatingsystem/operatingsystem_unix.go
index 541cb2ab32..80ce0e26ba 100644
--- a/pkg/parsers/operatingsystem/operatingsystem_unix.go
+++ b/pkg/parsers/operatingsystem/operatingsystem_unix.go
@@ -1,5 +1,4 @@
 //go:build freebsd || darwin
-// +build freebsd darwin
 
 package operatingsystem // import "github.com/docker/docker/pkg/parsers/operatingsystem"
 
diff --git a/pkg/platform/platform_unix.go b/pkg/platform/platform_unix.go
index b52708d112..4df8b18371 100644
--- a/pkg/platform/platform_unix.go
+++ b/pkg/platform/platform_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package platform // import "github.com/docker/docker/pkg/platform"
 
diff --git a/pkg/plugins/discovery_unix.go b/pkg/plugins/discovery_unix.go
index 2c1b2a3193..8caa8053fa 100644
--- a/pkg/plugins/discovery_unix.go
+++ b/pkg/plugins/discovery_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package plugins // import "github.com/docker/docker/pkg/plugins"
 import (
diff --git a/pkg/plugins/discovery_unix_test.go b/pkg/plugins/discovery_unix_test.go
index 18174da1d7..da019d734d 100644
--- a/pkg/plugins/discovery_unix_test.go
+++ b/pkg/plugins/discovery_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package plugins // import "github.com/docker/docker/pkg/plugins"
 
diff --git a/pkg/plugins/plugins_unix.go b/pkg/plugins/plugins_unix.go
index 23e9d5715a..fb78cefb24 100644
--- a/pkg/plugins/plugins_unix.go
+++ b/pkg/plugins/plugins_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package plugins // import "github.com/docker/docker/pkg/plugins"
 
diff --git a/pkg/process/process_unix.go b/pkg/process/process_unix.go
index daf3923626..baa1693a24 100644
--- a/pkg/process/process_unix.go
+++ b/pkg/process/process_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package process
 
diff --git a/pkg/reexec/command_unix.go b/pkg/reexec/command_unix.go
index b90043052e..0df5195e70 100644
--- a/pkg/reexec/command_unix.go
+++ b/pkg/reexec/command_unix.go
@@ -1,5 +1,4 @@
 //go:build freebsd || darwin
-// +build freebsd darwin
 
 package reexec // import "github.com/docker/docker/pkg/reexec"
 
diff --git a/pkg/reexec/command_unsupported.go b/pkg/reexec/command_unsupported.go
index 7175853a55..bec9761701 100644
--- a/pkg/reexec/command_unsupported.go
+++ b/pkg/reexec/command_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux && !windows && !freebsd && !darwin
-// +build !linux,!windows,!freebsd,!darwin
 
 package reexec // import "github.com/docker/docker/pkg/reexec"
 
diff --git a/pkg/sysinfo/numcpu_other.go b/pkg/sysinfo/numcpu_other.go
index fb31cae649..fcafd56ae3 100644
--- a/pkg/sysinfo/numcpu_other.go
+++ b/pkg/sysinfo/numcpu_other.go
@@ -1,5 +1,4 @@
 //go:build !linux && !windows
-// +build !linux,!windows
 
 package sysinfo
 
diff --git a/pkg/sysinfo/sysinfo_other.go b/pkg/sysinfo/sysinfo_other.go
index aa97c0f29a..37742db781 100644
--- a/pkg/sysinfo/sysinfo_other.go
+++ b/pkg/sysinfo/sysinfo_other.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package sysinfo // import "github.com/docker/docker/pkg/sysinfo"
 
diff --git a/pkg/system/chtimes_nowindows.go b/pkg/system/chtimes_nowindows.go
index 84ae157051..92ff02097d 100644
--- a/pkg/system/chtimes_nowindows.go
+++ b/pkg/system/chtimes_nowindows.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package system // import "github.com/docker/docker/pkg/system"
 
diff --git a/pkg/system/chtimes_windows_test.go b/pkg/system/chtimes_windows_test.go
index 6184336f3e..ea8c8db26e 100644
--- a/pkg/system/chtimes_windows_test.go
+++ b/pkg/system/chtimes_windows_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package system // import "github.com/docker/docker/pkg/system"
 
diff --git a/pkg/system/filesys_unix.go b/pkg/system/filesys_unix.go
index 3801129404..f01f9385e1 100644
--- a/pkg/system/filesys_unix.go
+++ b/pkg/system/filesys_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package system // import "github.com/docker/docker/pkg/system"
 
diff --git a/pkg/system/lstat_unix.go b/pkg/system/lstat_unix.go
index 654b9f2c9e..5e29a6b3b8 100644
--- a/pkg/system/lstat_unix.go
+++ b/pkg/system/lstat_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package system // import "github.com/docker/docker/pkg/system"
 
diff --git a/pkg/system/lstat_unix_test.go b/pkg/system/lstat_unix_test.go
index a38a524c4d..e090ed1078 100644
--- a/pkg/system/lstat_unix_test.go
+++ b/pkg/system/lstat_unix_test.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package system // import "github.com/docker/docker/pkg/system"
 
diff --git a/pkg/system/mknod.go b/pkg/system/mknod.go
index d27152c0f5..2a62237a45 100644
--- a/pkg/system/mknod.go
+++ b/pkg/system/mknod.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package system // import "github.com/docker/docker/pkg/system"
 
diff --git a/pkg/system/mknod_freebsd.go b/pkg/system/mknod_freebsd.go
index c890be116f..e218e742d4 100644
--- a/pkg/system/mknod_freebsd.go
+++ b/pkg/system/mknod_freebsd.go
@@ -1,5 +1,4 @@
 //go:build freebsd
-// +build freebsd
 
 package system // import "github.com/docker/docker/pkg/system"
 
diff --git a/pkg/system/mknod_unix.go b/pkg/system/mknod_unix.go
index 4586aad19e..34df0b9236 100644
--- a/pkg/system/mknod_unix.go
+++ b/pkg/system/mknod_unix.go
@@ -1,5 +1,4 @@
 //go:build !freebsd && !windows
-// +build !freebsd,!windows
 
 package system // import "github.com/docker/docker/pkg/system"
 
diff --git a/pkg/system/stat_bsd.go b/pkg/system/stat_bsd.go
index 8e61d820f0..a24ba5a0f6 100644
--- a/pkg/system/stat_bsd.go
+++ b/pkg/system/stat_bsd.go
@@ -1,5 +1,4 @@
 //go:build freebsd || netbsd
-// +build freebsd netbsd
 
 package system // import "github.com/docker/docker/pkg/system"
 
diff --git a/pkg/system/stat_unix.go b/pkg/system/stat_unix.go
index a45ffddf75..205e54677d 100644
--- a/pkg/system/stat_unix.go
+++ b/pkg/system/stat_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package system // import "github.com/docker/docker/pkg/system"
 
diff --git a/pkg/system/stat_unix_test.go b/pkg/system/stat_unix_test.go
index a7b6f3e22d..e2b6ac0805 100644
--- a/pkg/system/stat_unix_test.go
+++ b/pkg/system/stat_unix_test.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package system // import "github.com/docker/docker/pkg/system"
 
diff --git a/pkg/system/utimes_unix.go b/pkg/system/utimes_unix.go
index 2768750a00..f3a079f887 100644
--- a/pkg/system/utimes_unix.go
+++ b/pkg/system/utimes_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package system // import "github.com/docker/docker/pkg/system"
 
diff --git a/pkg/system/utimes_unix_test.go b/pkg/system/utimes_unix_test.go
index fad50d5051..61eeec3af9 100644
--- a/pkg/system/utimes_unix_test.go
+++ b/pkg/system/utimes_unix_test.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package system // import "github.com/docker/docker/pkg/system"
 
diff --git a/pkg/system/utimes_unsupported.go b/pkg/system/utimes_unsupported.go
index bfed4af032..7c19d59156 100644
--- a/pkg/system/utimes_unsupported.go
+++ b/pkg/system/utimes_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux && !freebsd
-// +build !linux,!freebsd
 
 package system // import "github.com/docker/docker/pkg/system"
 
diff --git a/pkg/system/xattrs_unsupported.go b/pkg/system/xattrs_unsupported.go
index b165a5dbfe..2a3698f129 100644
--- a/pkg/system/xattrs_unsupported.go
+++ b/pkg/system/xattrs_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package system // import "github.com/docker/docker/pkg/system"
 
diff --git a/plugin/backend_unsupported.go b/plugin/backend_unsupported.go
index 06422356e2..51b3cc6c55 100644
--- a/plugin/backend_unsupported.go
+++ b/plugin/backend_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package plugin // import "github.com/docker/docker/plugin"
 
diff --git a/plugin/v2/plugin_unsupported.go b/plugin/v2/plugin_unsupported.go
index 1b08aec171..022a604b06 100644
--- a/plugin/v2/plugin_unsupported.go
+++ b/plugin/v2/plugin_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package v2 // import "github.com/docker/docker/plugin/v2"
 
diff --git a/profiles/seccomp/generate.go b/profiles/seccomp/generate.go
index a5d56247ab..03c769fb0a 100644
--- a/profiles/seccomp/generate.go
+++ b/profiles/seccomp/generate.go
@@ -1,5 +1,4 @@
 //go:build ignore
-// +build ignore
 
 package main
 
diff --git a/profiles/seccomp/seccomp_test.go b/profiles/seccomp/seccomp_test.go
index 3a401db4ec..a19d2fa071 100644
--- a/profiles/seccomp/seccomp_test.go
+++ b/profiles/seccomp/seccomp_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package seccomp // import "github.com/docker/docker/profiles/seccomp"
 
diff --git a/quota/projectquota.go b/quota/projectquota.go
index 28217831ff..8a9a1f579c 100644
--- a/quota/projectquota.go
+++ b/quota/projectquota.go
@@ -1,5 +1,4 @@
 //go:build linux && !exclude_disk_quota && cgo
-// +build linux,!exclude_disk_quota,cgo
 
 //
 // projectquota.go - implements XFS project quota controls
diff --git a/quota/projectquota_test.go b/quota/projectquota_test.go
index e25fe99fb4..072c3f81cd 100644
--- a/quota/projectquota_test.go
+++ b/quota/projectquota_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package quota // import "github.com/docker/docker/quota"
 
diff --git a/quota/projectquota_unsupported.go b/quota/projectquota_unsupported.go
index ed21055c2e..0225ff524c 100644
--- a/quota/projectquota_unsupported.go
+++ b/quota/projectquota_unsupported.go
@@ -1,5 +1,4 @@
 //go:build (linux && exclude_disk_quota) || (linux && !cgo) || !linux
-// +build linux,exclude_disk_quota linux,!cgo !linux
 
 package quota // import "github.com/docker/docker/quota"
 
diff --git a/quota/testhelpers.go b/quota/testhelpers.go
index 6087162e2a..369c1ee857 100644
--- a/quota/testhelpers.go
+++ b/quota/testhelpers.go
@@ -1,5 +1,4 @@
 //go:build linux && !exclude_disk_quota && cgo
-// +build linux,!exclude_disk_quota,cgo
 
 package quota // import "github.com/docker/docker/quota"
 
diff --git a/registry/config_unix.go b/registry/config_unix.go
index 898c6b8a5b..2142049305 100644
--- a/registry/config_unix.go
+++ b/registry/config_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package registry // import "github.com/docker/docker/registry"
 
diff --git a/runconfig/config_unix.go b/runconfig/config_unix.go
index 6b29397051..1ba361123f 100644
--- a/runconfig/config_unix.go
+++ b/runconfig/config_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package runconfig // import "github.com/docker/docker/runconfig"
 
diff --git a/runconfig/hostconfig_test.go b/runconfig/hostconfig_test.go
index 441284cc01..77f1de0ecb 100644
--- a/runconfig/hostconfig_test.go
+++ b/runconfig/hostconfig_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package runconfig // import "github.com/docker/docker/runconfig"
 
diff --git a/runconfig/hostconfig_unix.go b/runconfig/hostconfig_unix.go
index bbe7026349..6ae9b53a5a 100644
--- a/runconfig/hostconfig_unix.go
+++ b/runconfig/hostconfig_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package runconfig // import "github.com/docker/docker/runconfig"
 
diff --git a/runconfig/hostconfig_windows_test.go b/runconfig/hostconfig_windows_test.go
index ccfe939ca8..a6f7207bde 100644
--- a/runconfig/hostconfig_windows_test.go
+++ b/runconfig/hostconfig_windows_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package runconfig // import "github.com/docker/docker/runconfig"
 
diff --git a/testutil/daemon/daemon_freebsd.go b/testutil/daemon/daemon_freebsd.go
index 0d182d4fb9..35dc5458cc 100644
--- a/testutil/daemon/daemon_freebsd.go
+++ b/testutil/daemon/daemon_freebsd.go
@@ -1,5 +1,4 @@
 //go:build freebsd
-// +build freebsd
 
 package daemon // import "github.com/docker/docker/testutil/daemon"
 
diff --git a/testutil/daemon/daemon_unix.go b/testutil/daemon/daemon_unix.go
index 5ad7812b04..3fceb33565 100644
--- a/testutil/daemon/daemon_unix.go
+++ b/testutil/daemon/daemon_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package daemon // import "github.com/docker/docker/testutil/daemon"
 
diff --git a/testutil/request/npipe.go b/testutil/request/npipe.go
index e827ad6b80..32c528486f 100644
--- a/testutil/request/npipe.go
+++ b/testutil/request/npipe.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package request
 
diff --git a/volume/local/local_linux_test.go b/volume/local/local_linux_test.go
index da6659dc29..c8688caff5 100644
--- a/volume/local/local_linux_test.go
+++ b/volume/local/local_linux_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package local // import "github.com/docker/docker/volume/local"
 
diff --git a/volume/local/local_unix.go b/volume/local/local_unix.go
index 2db5f8ef09..c116eceb88 100644
--- a/volume/local/local_unix.go
+++ b/volume/local/local_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 // Package local provides the default implementation for volumes. It
 // is used to mount data volume containers and directories local to
diff --git a/volume/mounts/validate_unix_test.go b/volume/mounts/validate_unix_test.go
index 4c46b95cd3..88e828c7c9 100644
--- a/volume/mounts/validate_unix_test.go
+++ b/volume/mounts/validate_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package mounts // import "github.com/docker/docker/volume/mounts"
 
diff --git a/volume/mounts/volume_unix.go b/volume/mounts/volume_unix.go
index 92eadce518..8556bbe0d2 100644
--- a/volume/mounts/volume_unix.go
+++ b/volume/mounts/volume_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd || darwin
-// +build linux freebsd darwin
 
 package mounts // import "github.com/docker/docker/volume/mounts"
 
diff --git a/volume/service/default_driver.go b/volume/service/default_driver.go
index 7a4c7e7026..5a85bb1131 100644
--- a/volume/service/default_driver.go
+++ b/volume/service/default_driver.go
@@ -1,5 +1,4 @@
 //go:build linux || windows
-// +build linux windows
 
 package service // import "github.com/docker/docker/volume/service"
 import (
diff --git a/volume/service/default_driver_stubs.go b/volume/service/default_driver_stubs.go
index b60cf768bb..5c41ce5365 100644
--- a/volume/service/default_driver_stubs.go
+++ b/volume/service/default_driver_stubs.go
@@ -1,5 +1,4 @@
 //go:build !linux && !windows
-// +build !linux,!windows
 
 package service // import "github.com/docker/docker/volume/service"
 
diff --git a/volume/service/store_unix.go b/volume/service/store_unix.go
index 75a7a61809..757ee94e32 100644
--- a/volume/service/store_unix.go
+++ b/volume/service/store_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd || darwin
-// +build linux freebsd darwin
 
 package service // import "github.com/docker/docker/volume/service"