diff --git a/pkg/cmd/cmdutil/factory.go b/pkg/cmd/cmdutil/factory.go
index 663c6e93d..24fdb1a8d 100644
--- a/pkg/cmd/cmdutil/factory.go
+++ b/pkg/cmd/cmdutil/factory.go
@@ -21,6 +21,6 @@ import (
 
 type Factory struct {
 	IOStreams *iostreams.IOStreams
-	Version  string
-	Config   func() (*config.Config, error)
+	Version   string
+	Config    func() (*config.Config, error)
 }
diff --git a/pkg/cmd/finding/view/view.go b/pkg/cmd/finding/view/view.go
index 764496d83..cef9072bb 100644
--- a/pkg/cmd/finding/view/view.go
+++ b/pkg/cmd/finding/view/view.go
@@ -71,10 +71,10 @@ type viewResponse struct {
 			ID       string `json:"id"`
 			FullName string `json:"fullName"`
 		} `json:"owner"`
-		DueDate            *string `json:"dueDate"`
-		Status             string  `json:"status"`
-		Priority           string  `json:"priority"`
-		Risk               *struct {
+		DueDate  *string `json:"dueDate"`
+		Status   string  `json:"status"`
+		Priority string  `json:"priority"`
+		Risk     *struct {
 			ID   string `json:"id"`
 			Name string `json:"name"`
 		} `json:"risk"`
diff --git a/pkg/coredata/control_document.go b/pkg/coredata/control_document.go
index fcd9a4a70..c33784773 100644
--- a/pkg/coredata/control_document.go
+++ b/pkg/coredata/control_document.go
@@ -114,7 +114,6 @@ WHERE
 	return err
 }
 
-
 func (cp ControlDocument) DeleteByDocumentIDs(
 	ctx context.Context,
 	conn pg.Conn,
diff --git a/pkg/coredata/finding.go b/pkg/coredata/finding.go
index dc5d99bfc..d0913b3d7 100644
--- a/pkg/coredata/finding.go
+++ b/pkg/coredata/finding.go
@@ -37,7 +37,7 @@ type (
 		ReferenceID        string          `db:"reference_id"`
 		Description        *string         `db:"description"`
 		Source             *string         `db:"source"`
-		IdentifiedOn     *time.Time      `db:"identified_on"`
+		IdentifiedOn       *time.Time      `db:"identified_on"`
 		RootCause          *string         `db:"root_cause"`
 		CorrectiveAction   *string         `db:"corrective_action"`
 		OwnerID            *gid.GID        `db:"owner_id"`
@@ -369,7 +369,7 @@ WHERE
 		"identified_on":       f.IdentifiedOn,
 		"root_cause":          f.RootCause,
 		"corrective_action":   f.CorrectiveAction,
-		"owner_id":    f.OwnerID,
+		"owner_id":            f.OwnerID,
 		"due_date":            f.DueDate,
 		"status":              f.Status,
 		"priority":            f.Priority,
diff --git a/pkg/coredata/finding_filter.go b/pkg/coredata/finding_filter.go
index f81f4e628..5f9393a0d 100644
--- a/pkg/coredata/finding_filter.go
+++ b/pkg/coredata/finding_filter.go
@@ -47,16 +47,16 @@ func NewFindingFilter(
 
 func (f *FindingFilter) SQLArguments() pgx.StrictNamedArgs {
 	args := pgx.StrictNamedArgs{
-		"has_snapshot_filter":  false,
-		"filter_snapshot_id":   nil,
-		"has_kind_filter":      false,
-		"filter_kind":          nil,
-		"has_status_filter":    false,
-		"filter_status":        nil,
-		"has_priority_filter":  false,
-		"filter_priority":      nil,
-		"has_owner_filter":     false,
-		"filter_owner_id":      nil,
+		"has_snapshot_filter": false,
+		"filter_snapshot_id":  nil,
+		"has_kind_filter":     false,
+		"filter_kind":         nil,
+		"has_status_filter":   false,
+		"filter_status":       nil,
+		"has_priority_filter": false,
+		"filter_priority":     nil,
+		"has_owner_filter":    false,
+		"filter_owner_id":     nil,
 	}
 
 	if f.snapshotID != nil {
diff --git a/pkg/coredata/finding_order_field.go b/pkg/coredata/finding_order_field.go
index 2818b45b7..8f72753a6 100644
--- a/pkg/coredata/finding_order_field.go
+++ b/pkg/coredata/finding_order_field.go
@@ -21,13 +21,13 @@ import (
 type FindingOrderField string
 
 const (
-	FindingOrderFieldCreatedAt      FindingOrderField = "CREATED_AT"
+	FindingOrderFieldCreatedAt    FindingOrderField = "CREATED_AT"
 	FindingOrderFieldIdentifiedOn FindingOrderField = "IDENTIFIED_ON"
-	FindingOrderFieldDueDate        FindingOrderField = "DUE_DATE"
-	FindingOrderFieldStatus         FindingOrderField = "STATUS"
-	FindingOrderFieldPriority       FindingOrderField = "PRIORITY"
-	FindingOrderFieldReferenceId    FindingOrderField = "REFERENCE_ID"
-	FindingOrderFieldKind           FindingOrderField = "KIND"
+	FindingOrderFieldDueDate      FindingOrderField = "DUE_DATE"
+	FindingOrderFieldStatus       FindingOrderField = "STATUS"
+	FindingOrderFieldPriority     FindingOrderField = "PRIORITY"
+	FindingOrderFieldReferenceId  FindingOrderField = "REFERENCE_ID"
+	FindingOrderFieldKind         FindingOrderField = "KIND"
 )
 
 func (p FindingOrderField) Column() string {
diff --git a/pkg/coredata/risk_document.go b/pkg/coredata/risk_document.go
index c4e7d876c..32cd1d318 100644
--- a/pkg/coredata/risk_document.go
+++ b/pkg/coredata/risk_document.go
@@ -100,7 +100,6 @@ WHERE
 	return err
 }
 
-
 func (rp RiskDocument) DeleteByDocumentIDs(
 	ctx context.Context,
 	conn pg.Conn,
diff --git a/pkg/probo/finding_service.go b/pkg/probo/finding_service.go
index 77a9eb6da..d9b001427 100644
--- a/pkg/probo/finding_service.go
+++ b/pkg/probo/finding_service.go
@@ -138,7 +138,7 @@ func (s *FindingService) Create(
 		Kind:               req.Kind,
 		Description:        req.Description,
 		Source:             req.Source,
-		IdentifiedOn:     req.IdentifiedOn,
+		IdentifiedOn:       req.IdentifiedOn,
 		RootCause:          req.RootCause,
 		CorrectiveAction:   req.CorrectiveAction,
 		OwnerID:            req.OwnerID,
diff --git a/pkg/probo/policies.go b/pkg/probo/policies.go
index 1752e22a5..87a0a667c 100644
--- a/pkg/probo/policies.go
+++ b/pkg/probo/policies.go
@@ -20,8 +20,8 @@ import (
 )
 
 var (
-	organizationCondition         = policy.Equals("principal.organization_id", "resource.organization_id")
-	documentWriteActiveOnly       = policy.Deny(
+	organizationCondition   = policy.Equals("principal.organization_id", "resource.organization_id")
+	documentWriteActiveOnly = policy.Deny(
 		ActionDocumentUpdate,
 		ActionDocumentArchive,
 		ActionDocumentDraftVersionCreate,
diff --git a/pkg/probod/probod.go b/pkg/probod/probod.go
index 7c4a238ca..f51e5f609 100644
--- a/pkg/probod/probod.go
+++ b/pkg/probod/probod.go
@@ -51,13 +51,13 @@ import (
 	"go.probo.inc/probo/pkg/crypto/keys"
 	"go.probo.inc/probo/pkg/crypto/passwdhash"
 	"go.probo.inc/probo/pkg/esign"
+	"go.probo.inc/probo/pkg/file"
 	"go.probo.inc/probo/pkg/filemanager"
 	"go.probo.inc/probo/pkg/html2pdf"
 	"go.probo.inc/probo/pkg/iam"
 	"go.probo.inc/probo/pkg/mailer"
 	"go.probo.inc/probo/pkg/mailman"
 	"go.probo.inc/probo/pkg/probo"
-	"go.probo.inc/probo/pkg/file"
 	"go.probo.inc/probo/pkg/securecookie"
 	"go.probo.inc/probo/pkg/server"
 	"go.probo.inc/probo/pkg/slack"
diff --git a/pkg/server/api/api.go b/pkg/server/api/api.go
index f677cb042..a0249944b 100644
--- a/pkg/server/api/api.go
+++ b/pkg/server/api/api.go
@@ -27,10 +27,10 @@ import (
 	"go.probo.inc/probo/pkg/baseurl"
 	"go.probo.inc/probo/pkg/connector"
 	"go.probo.inc/probo/pkg/esign"
+	"go.probo.inc/probo/pkg/file"
 	"go.probo.inc/probo/pkg/iam"
 	"go.probo.inc/probo/pkg/mailman"
 	"go.probo.inc/probo/pkg/probo"
-	"go.probo.inc/probo/pkg/file"
 	"go.probo.inc/probo/pkg/securecookie"
 	connect_v1 "go.probo.inc/probo/pkg/server/api/connect/v1"
 	console_v1 "go.probo.inc/probo/pkg/server/api/console/v1"
diff --git a/pkg/server/api/console/v1/types/finding.go b/pkg/server/api/console/v1/types/finding.go
index 2c3f48369..1838902ba 100644
--- a/pkg/server/api/console/v1/types/finding.go
+++ b/pkg/server/api/console/v1/types/finding.go
@@ -76,7 +76,7 @@ func NewFinding(f *coredata.Finding) *Finding {
 		ReferenceID:        f.ReferenceID,
 		Description:        f.Description,
 		Source:             f.Source,
-		IdentifiedOn:     f.IdentifiedOn,
+		IdentifiedOn:       f.IdentifiedOn,
 		RootCause:          f.RootCause,
 		CorrectiveAction:   f.CorrectiveAction,
 		DueDate:            f.DueDate,
diff --git a/pkg/server/api/files/v1/handler.go b/pkg/server/api/files/v1/handler.go
index 08d24fc19..c94b4790c 100644
--- a/pkg/server/api/files/v1/handler.go
+++ b/pkg/server/api/files/v1/handler.go
@@ -22,8 +22,8 @@ import (
 	"github.com/go-chi/chi/v5"
 	"go.gearno.de/kit/log"
 	"go.probo.inc/probo/pkg/coredata"
-	"go.probo.inc/probo/pkg/gid"
 	"go.probo.inc/probo/pkg/file"
+	"go.probo.inc/probo/pkg/gid"
 )
 
 const presignedURLExpiry = 1 * time.Hour
diff --git a/pkg/server/api/mcp/v1/types/finding.go b/pkg/server/api/mcp/v1/types/finding.go
index c83bf380a..f0bd347be 100644
--- a/pkg/server/api/mcp/v1/types/finding.go
+++ b/pkg/server/api/mcp/v1/types/finding.go
@@ -28,7 +28,7 @@ func NewFinding(f *coredata.Finding) *Finding {
 		ReferenceID:        f.ReferenceID,
 		Description:        f.Description,
 		Source:             f.Source,
-		IdentifiedOn:     f.IdentifiedOn,
+		IdentifiedOn:       f.IdentifiedOn,
 		RootCause:          f.RootCause,
 		CorrectiveAction:   f.CorrectiveAction,
 		OwnerID:            f.OwnerID,
diff --git a/pkg/server/server.go b/pkg/server/server.go
index 0c44c755b..2c6e55a51 100644
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -22,13 +22,14 @@ import (
 	"github.com/go-chi/chi/v5"
 	"go.gearno.de/kit/httpserver"
 	"go.gearno.de/kit/log"
+	"go.gearno.de/x/ref"
 	"go.probo.inc/probo/pkg/baseurl"
 	"go.probo.inc/probo/pkg/connector"
 	"go.probo.inc/probo/pkg/esign"
+	"go.probo.inc/probo/pkg/file"
 	"go.probo.inc/probo/pkg/iam"
 	"go.probo.inc/probo/pkg/mailman"
 	"go.probo.inc/probo/pkg/probo"
-	"go.probo.inc/probo/pkg/file"
 	"go.probo.inc/probo/pkg/securecookie"
 	"go.probo.inc/probo/pkg/server/api"
 	"go.probo.inc/probo/pkg/server/api/compliancepage"
@@ -37,7 +38,6 @@ import (
 	console_web "go.probo.inc/probo/pkg/server/web"
 	"go.probo.inc/probo/pkg/slack"
 	"go.probo.inc/probo/pkg/trust"
-	"go.gearno.de/x/ref"
 )
 
 type Config struct {