diff --git a/cli-plugins/manager/manager_unix.go b/cli-plugins/manager/manager_unix.go
index 6aa5b9e5c4..000c058df0 100644
--- a/cli-plugins/manager/manager_unix.go
+++ b/cli-plugins/manager/manager_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package manager
 
diff --git a/cli-plugins/manager/suffix_unix.go b/cli-plugins/manager/suffix_unix.go
index 8d5a5c3e72..050e5020d1 100644
--- a/cli-plugins/manager/suffix_unix.go
+++ b/cli-plugins/manager/suffix_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package manager
 
diff --git a/cli/command/container/signals_unix.go b/cli/command/container/signals_unix.go
index 757abbf16e..f9314272ee 100644
--- a/cli/command/container/signals_unix.go
+++ b/cli/command/container/signals_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package container
 
diff --git a/cli/command/container/signals_unix_test.go b/cli/command/container/signals_unix_test.go
index 84f7f52be3..c7ebab5449 100644
--- a/cli/command/container/signals_unix_test.go
+++ b/cli/command/container/signals_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package container
 
diff --git a/cli/command/image/build/context_unix.go b/cli/command/image/build/context_unix.go
index 5bf97c09f4..9ff43acf8c 100644
--- a/cli/command/image/build/context_unix.go
+++ b/cli/command/image/build/context_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package build
 
diff --git a/cli/config/configfile/file_unix.go b/cli/config/configfile/file_unix.go
index 353887547c..06b811e7d5 100644
--- a/cli/config/configfile/file_unix.go
+++ b/cli/config/configfile/file_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package configfile
 
diff --git a/cli/config/credentials/default_store_unsupported.go b/cli/config/credentials/default_store_unsupported.go
index c9630ea51b..40c16eb837 100644
--- a/cli/config/credentials/default_store_unsupported.go
+++ b/cli/config/credentials/default_store_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !windows && !darwin && !linux
-// +build !windows,!darwin,!linux
 
 package credentials
 
diff --git a/cli/connhelper/commandconn/commandconn_unix_test.go b/cli/connhelper/commandconn/commandconn_unix_test.go
index 0103bcea2c..e16833c685 100644
--- a/cli/connhelper/commandconn/commandconn_unix_test.go
+++ b/cli/connhelper/commandconn/commandconn_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package commandconn
 
diff --git a/cli/connhelper/commandconn/pdeathsig_nolinux.go b/cli/connhelper/commandconn/pdeathsig_nolinux.go
index 2adcf08160..758fd1dfc4 100644
--- a/cli/connhelper/commandconn/pdeathsig_nolinux.go
+++ b/cli/connhelper/commandconn/pdeathsig_nolinux.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package commandconn
 
diff --git a/cli/connhelper/commandconn/session_unix.go b/cli/connhelper/commandconn/session_unix.go
index 57bdecec03..3d2cb27755 100644
--- a/cli/connhelper/commandconn/session_unix.go
+++ b/cli/connhelper/commandconn/session_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package commandconn
 
diff --git a/cmd/docker/docker_windows_386.go b/cmd/docker/docker_windows_386.go
index 76a948aa2e..d9d1e37da0 100644
--- a/cmd/docker/docker_windows_386.go
+++ b/cmd/docker/docker_windows_386.go
@@ -1,5 +1,4 @@
 //go:build windows && 386
-// +build windows,386
 
 //go:generate goversioninfo -o=../../cli/winresources/resource.syso -icon=winresources/docker.ico -manifest=winresources/docker.exe.manifest ../../cli/winresources/versioninfo.json
 
diff --git a/cmd/docker/docker_windows_amd64.go b/cmd/docker/docker_windows_amd64.go
index 514abc56f9..e88aa253ba 100644
--- a/cmd/docker/docker_windows_amd64.go
+++ b/cmd/docker/docker_windows_amd64.go
@@ -1,5 +1,4 @@
 //go:build windows && amd64
-// +build windows,amd64
 
 //go:generate goversioninfo -64=true -o=../../cli/winresources/resource.syso -icon=winresources/docker.ico -manifest=winresources/docker.exe.manifest ../../cli/winresources/versioninfo.json
 
diff --git a/cmd/docker/docker_windows_arm.go b/cmd/docker/docker_windows_arm.go
index 378fe83616..f2eff4f1d7 100644
--- a/cmd/docker/docker_windows_arm.go
+++ b/cmd/docker/docker_windows_arm.go
@@ -1,5 +1,4 @@
 //go:build windows && arm
-// +build windows,arm
 
 //go:generate goversioninfo -arm=true -o=../../cli/winresources/resource.syso -icon=winresources/docker.ico -manifest=winresources/docker.exe.manifest ../../cli/winresources/versioninfo.json
 
diff --git a/cmd/docker/docker_windows_arm64.go b/cmd/docker/docker_windows_arm64.go
index a4dba5a8f9..15a6e31433 100644
--- a/cmd/docker/docker_windows_arm64.go
+++ b/cmd/docker/docker_windows_arm64.go
@@ -1,5 +1,4 @@
 //go:build windows && arm64
-// +build windows,arm64
 
 //go:generate goversioninfo -arm=true -64=true -o=../../cli/winresources/resource.syso -icon=winresources/docker.ico -manifest=winresources/docker.exe.manifest ../../cli/winresources/versioninfo.json
 
diff --git a/opts/hosts_unix.go b/opts/hosts_unix.go
index 206834d4dd..7cddd453c3 100644
--- a/opts/hosts_unix.go
+++ b/opts/hosts_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package opts