diff --git a/commands/deploy.go b/commands/deploy.go
index eb419daba..3e9d3df20 100644
--- a/commands/deploy.go
+++ b/commands/deploy.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build withdeploy
-// +build withdeploy
 
 package commands
 
diff --git a/commands/deploy_off.go b/commands/deploy_off.go
index 32a08da2e..8f5eaa2de 100644
--- a/commands/deploy_off.go
+++ b/commands/deploy_off.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build !withdeploy
-// +build !withdeploy
 
 // Copyright 2024 The Hugo Authors. All rights reserved.
 //
diff --git a/common/hugo/vars_extended.go b/common/hugo/vars_extended.go
index edbaff243..ab01e2647 100644
--- a/common/hugo/vars_extended.go
+++ b/common/hugo/vars_extended.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build extended
-// +build extended
 
 package hugo
 
diff --git a/common/hugo/vars_regular.go b/common/hugo/vars_regular.go
index 223df4b6c..a78aeb0b6 100644
--- a/common/hugo/vars_regular.go
+++ b/common/hugo/vars_regular.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build !extended
-// +build !extended
 
 package hugo
 
diff --git a/common/hugo/vars_withdeploy.go b/common/hugo/vars_withdeploy.go
index 88ce9a1cd..4e0c3efbb 100644
--- a/common/hugo/vars_withdeploy.go
+++ b/common/hugo/vars_withdeploy.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build withdeploy
-// +build withdeploy
 
 package hugo
 
diff --git a/common/hugo/vars_withdeploy_off.go b/common/hugo/vars_withdeploy_off.go
index 935568027..36e9bd874 100644
--- a/common/hugo/vars_withdeploy_off.go
+++ b/common/hugo/vars_withdeploy_off.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build !withdeploy
-// +build !withdeploy
 
 package hugo
 
diff --git a/deploy/cloudfront.go b/deploy/cloudfront.go
index 29c0a7f8c..3202a73ea 100644
--- a/deploy/cloudfront.go
+++ b/deploy/cloudfront.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build withdeploy
-// +build withdeploy
 
 package deploy
 
diff --git a/deploy/deploy.go b/deploy/deploy.go
index 0c379ffb8..4b90881a6 100644
--- a/deploy/deploy.go
+++ b/deploy/deploy.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build withdeploy
-// +build withdeploy
 
 package deploy
 
diff --git a/deploy/deploy_azure.go b/deploy/deploy_azure.go
index 521d8f094..b1ce7358c 100644
--- a/deploy/deploy_azure.go
+++ b/deploy/deploy_azure.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build !solaris && withdeploy
-// +build !solaris,withdeploy
 
 package deploy
 
diff --git a/deploy/deploy_test.go b/deploy/deploy_test.go
index f290d6c81..3bbc9ff70 100644
--- a/deploy/deploy_test.go
+++ b/deploy/deploy_test.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build withdeploy
-// +build withdeploy
 
 package deploy
 
diff --git a/deploy/deployconfig/deployConfig_test.go b/deploy/deployconfig/deployConfig_test.go
index 8a3ad2d8a..38d0aadd6 100644
--- a/deploy/deployconfig/deployConfig_test.go
+++ b/deploy/deployconfig/deployConfig_test.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build withdeploy
-// +build withdeploy
 
 package deployconfig
 
diff --git a/deploy/google.go b/deploy/google.go
index e4683aa81..5b302e95b 100644
--- a/deploy/google.go
+++ b/deploy/google.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build withdeploy
-// +build withdeploy
 
 package deploy
 
diff --git a/main_withdeploy_off_test.go b/main_withdeploy_off_test.go
index 490ccd693..968c0c957 100644
--- a/main_withdeploy_off_test.go
+++ b/main_withdeploy_off_test.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build !withdeploy
-// +build !withdeploy
 
 package main
 
diff --git a/main_withdeploy_test.go b/main_withdeploy_test.go
index de50313c3..004893bdf 100644
--- a/main_withdeploy_test.go
+++ b/main_withdeploy_test.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build withdeploy
-// +build withdeploy
 
 package main
 
diff --git a/resources/image_extended_test.go b/resources/image_extended_test.go
index f481be9bb..5865ce75b 100644
--- a/resources/image_extended_test.go
+++ b/resources/image_extended_test.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build extended
-// +build extended
 
 package resources_test
 
diff --git a/resources/images/webp/webp.go b/resources/images/webp/webp.go
index 28336d2e0..d7407214f 100644
--- a/resources/images/webp/webp.go
+++ b/resources/images/webp/webp.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build extended
-// +build extended
 
 package webp
 
diff --git a/resources/images/webp/webp_notavailable.go b/resources/images/webp/webp_notavailable.go
index 70407f94e..b617eeb51 100644
--- a/resources/images/webp/webp_notavailable.go
+++ b/resources/images/webp/webp_notavailable.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build !extended
-// +build !extended
 
 package webp
 
diff --git a/resources/resource_transformers/tocss/scss/client_extended.go b/resources/resource_transformers/tocss/scss/client_extended.go
index c9b347c4c..bd2330f6d 100644
--- a/resources/resource_transformers/tocss/scss/client_extended.go
+++ b/resources/resource_transformers/tocss/scss/client_extended.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build extended
-// +build extended
 
 package scss
 
diff --git a/resources/resource_transformers/tocss/scss/client_notavailable.go b/resources/resource_transformers/tocss/scss/client_notavailable.go
index efd79109b..783a7d7db 100644
--- a/resources/resource_transformers/tocss/scss/client_notavailable.go
+++ b/resources/resource_transformers/tocss/scss/client_notavailable.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build !extended
-// +build !extended
 
 package scss
 
diff --git a/resources/resource_transformers/tocss/scss/tocss.go b/resources/resource_transformers/tocss/scss/tocss.go
index 89e95b2f8..2976578af 100644
--- a/resources/resource_transformers/tocss/scss/tocss.go
+++ b/resources/resource_transformers/tocss/scss/tocss.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build extended
-// +build extended
 
 package scss