diff --git a/collector/boot_time_solaris.go b/collector/boot_time_solaris.go
index 3d55e783..15955121 100644
--- a/collector/boot_time_solaris.go
+++ b/collector/boot_time_solaris.go
@@ -11,8 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build solaris && !noboottime
-// +build solaris,!noboottime
+//go:build !noboottime
+// +build !noboottime
 
 package collector
 
diff --git a/collector/cpu_solaris.go b/collector/cpu_solaris.go
index c28b4d6d..32466a1e 100644
--- a/collector/cpu_solaris.go
+++ b/collector/cpu_solaris.go
@@ -11,8 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build solaris && !nocpu
-// +build solaris,!nocpu
+//go:build !nocpu
+// +build !nocpu
 
 package collector
 
diff --git a/collector/cpufreq_solaris.go b/collector/cpufreq_solaris.go
index 6c76ad01..c3fb9ee6 100644
--- a/collector/cpufreq_solaris.go
+++ b/collector/cpufreq_solaris.go
@@ -11,8 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build solaris && !nocpu
-// +build solaris,!nocpu
+//go:build !nocpu
+// +build !nocpu
 
 package collector
 
diff --git a/collector/diskstats_openbsd.go b/collector/diskstats_openbsd.go
index 46d9bc1a..2a69042a 100644
--- a/collector/diskstats_openbsd.go
+++ b/collector/diskstats_openbsd.go
@@ -11,8 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build openbsd && !amd64 && !nodiskstats
-// +build openbsd,!amd64,!nodiskstats
+//go:build !nodiskstats && !amd64
+// +build !nodiskstats,!amd64
 
 package collector
 
diff --git a/collector/fibrechannel_linux.go b/collector/fibrechannel_linux.go
index 3993b277..32e4d1e7 100644
--- a/collector/fibrechannel_linux.go
+++ b/collector/fibrechannel_linux.go
@@ -11,8 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build linux && !nofibrechannel
-// +build linux,!nofibrechannel
+//go:build !nofibrechannel
+// +build !nofibrechannel
 
 package collector
 
diff --git a/collector/filesystem_openbsd.go b/collector/filesystem_openbsd.go
index 16cd610d..1c1e479e 100644
--- a/collector/filesystem_openbsd.go
+++ b/collector/filesystem_openbsd.go
@@ -11,8 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build openbsd && !nofilesystem
-// +build openbsd,!nofilesystem
+//go:build !nofilesystem
+// +build !nofilesystem
 
 package collector
 
diff --git a/collector/infiniband_linux.go b/collector/infiniband_linux.go
index 3afb7c45..b0928da3 100644
--- a/collector/infiniband_linux.go
+++ b/collector/infiniband_linux.go
@@ -11,8 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build linux && !noinfiniband
-// +build linux,!noinfiniband
+//go:build !noinfiniband
+// +build !noinfiniband
 
 package collector
 
diff --git a/collector/interrupts_openbsd.go b/collector/interrupts_openbsd.go
index ba734069..9fa5b68d 100644
--- a/collector/interrupts_openbsd.go
+++ b/collector/interrupts_openbsd.go
@@ -11,8 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build openbsd && !amd64 && !nointerrupts
-// +build openbsd,!amd64,!nointerrupts
+//go:build !nointerrupts && !amd64
+// +build !nointerrupts,!amd64
 
 package collector
 
diff --git a/collector/meminfo_netbsd.go b/collector/meminfo_netbsd.go
index 7f418479..a1bd1185 100644
--- a/collector/meminfo_netbsd.go
+++ b/collector/meminfo_netbsd.go
@@ -11,8 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build netbsd && !nomeminfo
-// +build netbsd,!nomeminfo
+//go:build !nomeminfo
+// +build !nomeminfo
 
 package collector
 
diff --git a/collector/meminfo_openbsd.go b/collector/meminfo_openbsd.go
index 2c81c50c..c5d2947e 100644
--- a/collector/meminfo_openbsd.go
+++ b/collector/meminfo_openbsd.go
@@ -11,8 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build openbsd && !amd64 && !nomeminfo
-// +build openbsd,!amd64,!nomeminfo
+//go:build !nomeminfo && !amd64
+// +build !nomeminfo,!amd64
 
 package collector
 
diff --git a/collector/netdev_openbsd.go b/collector/netdev_openbsd.go
index 5d53678d..b90e3ba7 100644
--- a/collector/netdev_openbsd.go
+++ b/collector/netdev_openbsd.go
@@ -11,8 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build openbsd && !amd64 && !nonetdev
-// +build openbsd,!amd64,!nonetdev
+//go:build !nonetdev && !amd64
+// +build !nonetdev,!amd64
 
 package collector
 
diff --git a/collector/netisr_freebsd.go b/collector/netisr_freebsd.go
index 4ac10dae..442bcdc6 100644
--- a/collector/netisr_freebsd.go
+++ b/collector/netisr_freebsd.go
@@ -11,8 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build freebsd && !nonetisr
-// +build freebsd,!nonetisr
+//go:build !nonetisr
+// +build !nonetisr
 
 package collector
 
diff --git a/collector/nvme_linux.go b/collector/nvme_linux.go
index 15af5d75..81d4ab29 100644
--- a/collector/nvme_linux.go
+++ b/collector/nvme_linux.go
@@ -11,8 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build linux && !nonvme
-// +build linux,!nonvme
+//go:build !nonvme
+// +build !nonvme
 
 package collector
 
diff --git a/collector/selinux_linux.go b/collector/selinux_linux.go
index 71a3c021..79316362 100644
--- a/collector/selinux_linux.go
+++ b/collector/selinux_linux.go
@@ -11,8 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build linux && !noselinux
-// +build linux,!noselinux
+//go:build !noselinux
+// +build !noselinux
 
 package collector
 
diff --git a/collector/slabinfo_linux.go b/collector/slabinfo_linux.go
index 8c032cbb..a3c3ebce 100644
--- a/collector/slabinfo_linux.go
+++ b/collector/slabinfo_linux.go
@@ -11,8 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build linux && !noslabinfo
-// +build linux,!noslabinfo
+//go:build !noslabinfo
+// +build !noslabinfo
 
 package collector
 
diff --git a/collector/time_linux.go b/collector/time_linux.go
index a67f5a8f..dd4afe75 100644
--- a/collector/time_linux.go
+++ b/collector/time_linux.go
@@ -11,8 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build linux && !notime
-// +build linux,!notime
+//go:build !notime
+// +build !notime
 
 package collector
 
diff --git a/collector/zfs_solaris.go b/collector/zfs_solaris.go
index 040f31db..52f2500f 100644
--- a/collector/zfs_solaris.go
+++ b/collector/zfs_solaris.go
@@ -11,8 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build solaris && !nozfs
-// +build solaris,!nozfs
+//go:build !nozfs
+// +build !nozfs
 
 package collector