diff --git a/detector/cti.go b/detector/cti.go
index c82fa5e061..da46722477 100644
--- a/detector/cti.go
+++ b/detector/cti.go
@@ -1,5 +1,4 @@
 //go:build !scanner
-// +build !scanner
 
 package detector
 
diff --git a/detector/cve_client.go b/detector/cve_client.go
index fb06df600d..b835c43d7e 100644
--- a/detector/cve_client.go
+++ b/detector/cve_client.go
@@ -1,5 +1,4 @@
 //go:build !scanner
-// +build !scanner
 
 package detector
 
diff --git a/detector/detector.go b/detector/detector.go
index 8cc08a26be..fa70c5e445 100644
--- a/detector/detector.go
+++ b/detector/detector.go
@@ -1,5 +1,4 @@
 //go:build !scanner
-// +build !scanner
 
 package detector
 
diff --git a/detector/detector_test.go b/detector/detector_test.go
index 7c99646077..f058bdc68b 100644
--- a/detector/detector_test.go
+++ b/detector/detector_test.go
@@ -1,5 +1,4 @@
 //go:build !scanner
-// +build !scanner
 
 package detector
 
diff --git a/detector/exploitdb.go b/detector/exploitdb.go
index cd651aacc1..ad883e2ef6 100644
--- a/detector/exploitdb.go
+++ b/detector/exploitdb.go
@@ -1,5 +1,4 @@
 //go:build !scanner
-// +build !scanner
 
 package detector
 
diff --git a/detector/github.go b/detector/github.go
index 983605d28d..e37834003c 100644
--- a/detector/github.go
+++ b/detector/github.go
@@ -1,5 +1,4 @@
 //go:build !scanner
-// +build !scanner
 
 package detector
 
diff --git a/detector/javadb/javadb.go b/detector/javadb/javadb.go
index 0586b378dd..ab1182bddb 100644
--- a/detector/javadb/javadb.go
+++ b/detector/javadb/javadb.go
@@ -1,5 +1,4 @@
 //go:build !scanner
-// +build !scanner
 
 // Package javadb implements functions that wrap trivy-java-db module.
 package javadb
diff --git a/detector/kevuln.go b/detector/kevuln.go
index b99795577a..35e536140b 100644
--- a/detector/kevuln.go
+++ b/detector/kevuln.go
@@ -1,5 +1,4 @@
 //go:build !scanner
-// +build !scanner
 
 package detector
 
diff --git a/detector/library.go b/detector/library.go
index 06323c56b7..8ada32667c 100644
--- a/detector/library.go
+++ b/detector/library.go
@@ -1,5 +1,4 @@
 //go:build !scanner
-// +build !scanner
 
 package detector
 
diff --git a/detector/msf.go b/detector/msf.go
index 89aad2b603..96ec324f40 100644
--- a/detector/msf.go
+++ b/detector/msf.go
@@ -1,5 +1,4 @@
 //go:build !scanner
-// +build !scanner
 
 package detector
 
diff --git a/detector/util.go b/detector/util.go
index cee10e3bbd..3aee3a6fcb 100644
--- a/detector/util.go
+++ b/detector/util.go
@@ -1,5 +1,4 @@
 //go:build !scanner
-// +build !scanner
 
 package detector
 
diff --git a/detector/wordpress.go b/detector/wordpress.go
index 53ef13a829..cd4a7917f0 100644
--- a/detector/wordpress.go
+++ b/detector/wordpress.go
@@ -1,5 +1,4 @@
 //go:build !scanner
-// +build !scanner
 
 package detector
 
diff --git a/detector/wordpress_test.go b/detector/wordpress_test.go
index 6b47d7dec3..53249ae437 100644
--- a/detector/wordpress_test.go
+++ b/detector/wordpress_test.go
@@ -1,5 +1,4 @@
 //go:build !scanner
-// +build !scanner
 
 package detector
 
diff --git a/gost/debian.go b/gost/debian.go
index b959ee8cbf..70233f6387 100644
--- a/gost/debian.go
+++ b/gost/debian.go
@@ -1,5 +1,4 @@
 //go:build !scanner
-// +build !scanner
 
 package gost
 
diff --git a/gost/debian_test.go b/gost/debian_test.go
index dd27d87854..5c4b8757c4 100644
--- a/gost/debian_test.go
+++ b/gost/debian_test.go
@@ -1,5 +1,4 @@
 //go:build !scanner
-// +build !scanner
 
 package gost
 
diff --git a/gost/gost.go b/gost/gost.go
index 9e1f640c8b..59de79e32c 100644
--- a/gost/gost.go
+++ b/gost/gost.go
@@ -1,5 +1,4 @@
 //go:build !scanner
-// +build !scanner
 
 package gost
 
diff --git a/gost/gost_test.go b/gost/gost_test.go
index 65bca30c24..5745dafed9 100644
--- a/gost/gost_test.go
+++ b/gost/gost_test.go
@@ -1,4 +1,3 @@
 //go:build !scanner
-// +build !scanner
 
 package gost
diff --git a/gost/microsoft.go b/gost/microsoft.go
index e0a296dcbd..3d91f3366f 100644
--- a/gost/microsoft.go
+++ b/gost/microsoft.go
@@ -1,5 +1,4 @@
 //go:build !scanner
-// +build !scanner
 
 package gost
 
diff --git a/gost/microsoft_test.go b/gost/microsoft_test.go
index 8208a272da..8fa49af60d 100644
--- a/gost/microsoft_test.go
+++ b/gost/microsoft_test.go
@@ -1,5 +1,4 @@
 //go:build !scanner
-// +build !scanner
 
 package gost
 
diff --git a/gost/pseudo.go b/gost/pseudo.go
index 0c1c6a3124..362c45842a 100644
--- a/gost/pseudo.go
+++ b/gost/pseudo.go
@@ -1,5 +1,4 @@
 //go:build !scanner
-// +build !scanner
 
 package gost
 
diff --git a/gost/redhat.go b/gost/redhat.go
index 9f049c1974..1ed110fc87 100644
--- a/gost/redhat.go
+++ b/gost/redhat.go
@@ -1,5 +1,4 @@
 //go:build !scanner
-// +build !scanner
 
 package gost
 
diff --git a/gost/redhat_test.go b/gost/redhat_test.go
index aaba50a928..bfd04761b9 100644
--- a/gost/redhat_test.go
+++ b/gost/redhat_test.go
@@ -1,5 +1,4 @@
 //go:build !scanner
-// +build !scanner
 
 package gost
 
diff --git a/gost/ubuntu.go b/gost/ubuntu.go
index af692cb911..c44c81cc51 100644
--- a/gost/ubuntu.go
+++ b/gost/ubuntu.go
@@ -1,5 +1,4 @@
 //go:build !scanner
-// +build !scanner
 
 package gost
 
diff --git a/gost/util.go b/gost/util.go
index 7323f6fbd2..c29736ce96 100644
--- a/gost/util.go
+++ b/gost/util.go
@@ -1,5 +1,4 @@
 //go:build !scanner
-// +build !scanner
 
 package gost
 
diff --git a/models/utils.go b/models/utils.go
index 01aa45d9e4..acb401d91b 100644
--- a/models/utils.go
+++ b/models/utils.go
@@ -1,5 +1,4 @@
 //go:build !scanner
-// +build !scanner
 
 package models
 
diff --git a/oval/alpine.go b/oval/alpine.go
index 30b786e23b..1d3605cdad 100644
--- a/oval/alpine.go
+++ b/oval/alpine.go
@@ -1,5 +1,4 @@
 //go:build !scanner
-// +build !scanner
 
 package oval
 
diff --git a/oval/debian.go b/oval/debian.go
index 45b05e82d6..3a3a1f60f8 100644
--- a/oval/debian.go
+++ b/oval/debian.go
@@ -1,5 +1,4 @@
 //go:build !scanner
-// +build !scanner
 
 package oval
 
diff --git a/oval/oval.go b/oval/oval.go
index 051c21a3f1..1536cde26f 100644
--- a/oval/oval.go
+++ b/oval/oval.go
@@ -1,5 +1,4 @@
 //go:build !scanner
-// +build !scanner
 
 package oval
 
diff --git a/oval/redhat.go b/oval/redhat.go
index afd42fa721..742a064130 100644
--- a/oval/redhat.go
+++ b/oval/redhat.go
@@ -1,5 +1,4 @@
 //go:build !scanner
-// +build !scanner
 
 package oval
 
diff --git a/oval/redhat_test.go b/oval/redhat_test.go
index 796f3b9782..9616a5d9bc 100644
--- a/oval/redhat_test.go
+++ b/oval/redhat_test.go
@@ -1,5 +1,4 @@
 //go:build !scanner
-// +build !scanner
 
 package oval
 
diff --git a/oval/suse.go b/oval/suse.go
index 56cfdd032f..b3deb7444d 100644
--- a/oval/suse.go
+++ b/oval/suse.go
@@ -1,5 +1,4 @@
 //go:build !scanner
-// +build !scanner
 
 package oval
 
diff --git a/oval/suse_test.go b/oval/suse_test.go
index 665d05c7b2..e5ecdaa28f 100644
--- a/oval/suse_test.go
+++ b/oval/suse_test.go
@@ -1,5 +1,4 @@
 //go:build !scanner
-// +build !scanner
 
 package oval
 
diff --git a/oval/util.go b/oval/util.go
index 2413384fd5..ad16ec5850 100644
--- a/oval/util.go
+++ b/oval/util.go
@@ -1,5 +1,4 @@
 //go:build !scanner
-// +build !scanner
 
 package oval
 
diff --git a/oval/util_test.go b/oval/util_test.go
index 6cd95844c5..cc28c1e448 100644
--- a/oval/util_test.go
+++ b/oval/util_test.go
@@ -1,5 +1,4 @@
 //go:build !scanner
-// +build !scanner
 
 package oval
 
diff --git a/server/server.go b/server/server.go
index b166bac49d..b20d71ed07 100644
--- a/server/server.go
+++ b/server/server.go
@@ -1,5 +1,4 @@
 //go:build !scanner
-// +build !scanner
 
 package server
 
diff --git a/subcmds/server.go b/subcmds/server.go
index 48e4c0fd8f..29210b5047 100644
--- a/subcmds/server.go
+++ b/subcmds/server.go
@@ -1,5 +1,4 @@
 //go:build !scanner
-// +build !scanner
 
 package subcmds
 
diff --git a/subcmds/tui.go b/subcmds/tui.go
index d255e71980..54f434a134 100644
--- a/subcmds/tui.go
+++ b/subcmds/tui.go
@@ -1,5 +1,4 @@
 //go:build !scanner
-// +build !scanner
 
 package subcmds