diff --git a/log/formatting_unix.go b/log/formatting_unix.go
index 553fc0e..6be6fdc 100644
--- a/log/formatting_unix.go
+++ b/log/formatting_unix.go
@@ -1,4 +1,4 @@
-// go:build !windows
+//go:build !windows
 
 package log
 
diff --git a/log/formatting_windows.go b/log/formatting_windows.go
index c9fd2fb..2ec7a15 100644
--- a/log/formatting_windows.go
+++ b/log/formatting_windows.go
@@ -1,5 +1,3 @@
-// +build windows
-
 package log
 
 import (
diff --git a/utils/osdetail/binmeta_default.go b/utils/osdetail/binmeta_default.go
index c9307fc..754cceb 100644
--- a/utils/osdetail/binmeta_default.go
+++ b/utils/osdetail/binmeta_default.go
@@ -1,4 +1,4 @@
-// go:build !windows
+//go:build !windows
 
 package osdetail
 
diff --git a/utils/renameio/symlink_test.go b/utils/renameio/symlink_test.go
index 120d014..e8b25c6 100644
--- a/utils/renameio/symlink_test.go
+++ b/utils/renameio/symlink_test.go
@@ -1,4 +1,4 @@
-// go:build darwin dragonfly freebsd linux nacl netbsd openbsd solaris windows
+//go:build darwin || dragonfly || freebsd || linux || nacl || netbsd || openbsd || solaris || windows
 
 package renameio
 
diff --git a/utils/renameio/tempfile_linux_test.go b/utils/renameio/tempfile_linux_test.go
index 2077709..95375e1 100644
--- a/utils/renameio/tempfile_linux_test.go
+++ b/utils/renameio/tempfile_linux_test.go
@@ -1,4 +1,4 @@
-// go:build linux
+//go:build linux
 
 package renameio
 
diff --git a/utils/renameio/writefile_test.go b/utils/renameio/writefile_test.go
index 5c04651..b7d1b49 100644
--- a/utils/renameio/writefile_test.go
+++ b/utils/renameio/writefile_test.go
@@ -1,4 +1,4 @@
-// go:build darwin dragonfly freebsd linux nacl netbsd openbsd solaris windows
+//go:build darwin || dragonfly || freebsd || linux || nacl || netbsd || openbsd || solaris || windows
 
 package renameio