diff --git a/pkg/apiserver/alerts_test.go b/pkg/apiserver/alerts_test.go
index c5534af1e7b..8b9adf62327 100644
--- a/pkg/apiserver/alerts_test.go
+++ b/pkg/apiserver/alerts_test.go
@@ -140,7 +140,7 @@ func TestCreateAlert(t *testing.T) {
 	w = lapi.RecordResponse(t, ctx, http.MethodPost, "/v1/alerts", alertContent, "password")
 	assert.Equal(t, http.StatusInternalServerError, w.Code)
 	assert.JSONEq(t,
-		`{"message":"validation failure list:\n0.scenario in body is required\n0.scenario_hash in body is required\n0.scenario_version in body is required\n0.simulated in body is required\n0.source in body is required"}`,
+		`{"message":"0.scenario in body is required"}`,
 		w.Body.String())
 
 	// Create Valid Alert
diff --git a/pkg/models/add_alerts_request.go b/pkg/models/add_alerts_request.go
index a69934ef770..f894971ca11 100644
--- a/pkg/models/add_alerts_request.go
+++ b/pkg/models/add_alerts_request.go
@@ -7,6 +7,7 @@ package models
 
 import (
 	"context"
+	stderrors "errors"
 	"strconv"
 
 	"github.com/go-openapi/errors"
@@ -30,11 +31,15 @@ func (m AddAlertsRequest) Validate(formats strfmt.Registry) error {
 
 		if m[i] != nil {
 			if err := m[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName(strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName(strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
@@ -60,11 +65,15 @@ func (m AddAlertsRequest) ContextValidate(ctx context.Context, formats strfmt.Re
 			}
 
 			if err := m[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName(strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName(strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
diff --git a/pkg/models/alert.go b/pkg/models/alert.go
index 895f5ad76e1..593580ef675 100644
--- a/pkg/models/alert.go
+++ b/pkg/models/alert.go
@@ -7,6 +7,7 @@ package models
 
 import (
 	"context"
+	stderrors "errors"
 	"strconv"
 
 	"github.com/go-openapi/errors"
@@ -184,11 +185,15 @@ func (m *Alert) validateDecisions(formats strfmt.Registry) error {
 
 		if m.Decisions[i] != nil {
 			if err := m.Decisions[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName("decisions" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName("decisions" + "." + strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
@@ -211,11 +216,15 @@ func (m *Alert) validateEvents(formats strfmt.Registry) error {
 
 		if m.Events[i] != nil {
 			if err := m.Events[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName("events" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName("events" + "." + strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
@@ -258,11 +267,15 @@ func (m *Alert) validateMeta(formats strfmt.Registry) error {
 	}
 
 	if err := m.Meta.Validate(formats); err != nil {
-		if ve, ok := err.(*errors.Validation); ok {
+		ve := new(errors.Validation)
+		if stderrors.As(err, &ve) {
 			return ve.ValidateName("meta")
-		} else if ce, ok := err.(*errors.CompositeError); ok {
+		}
+		ce := new(errors.CompositeError)
+		if stderrors.As(err, &ce) {
 			return ce.ValidateName("meta")
 		}
+
 		return err
 	}
 
@@ -313,11 +326,15 @@ func (m *Alert) validateSource(formats strfmt.Registry) error {
 
 	if m.Source != nil {
 		if err := m.Source.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
+			ve := new(errors.Validation)
+			if stderrors.As(err, &ve) {
 				return ve.ValidateName("source")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
+			}
+			ce := new(errors.CompositeError)
+			if stderrors.As(err, &ce) {
 				return ce.ValidateName("source")
 			}
+
 			return err
 		}
 	}
@@ -387,7 +404,7 @@ func (m *Alert) ContextValidate(ctx context.Context, formats strfmt.Registry) er
 
 func (m *Alert) contextValidateCreatedAt(ctx context.Context, formats strfmt.Registry) error {
 
-	if err := validate.ReadOnly(ctx, "created_at", "body", string(m.CreatedAt)); err != nil {
+	if err := validate.ReadOnly(ctx, "created_at", "body", m.CreatedAt); err != nil {
 		return err
 	}
 
@@ -405,11 +422,15 @@ func (m *Alert) contextValidateDecisions(ctx context.Context, formats strfmt.Reg
 			}
 
 			if err := m.Decisions[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName("decisions" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName("decisions" + "." + strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
@@ -430,11 +451,15 @@ func (m *Alert) contextValidateEvents(ctx context.Context, formats strfmt.Regist
 			}
 
 			if err := m.Events[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName("events" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName("events" + "." + strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
@@ -446,7 +471,7 @@ func (m *Alert) contextValidateEvents(ctx context.Context, formats strfmt.Regist
 
 func (m *Alert) contextValidateID(ctx context.Context, formats strfmt.Registry) error {
 
-	if err := validate.ReadOnly(ctx, "id", "body", int64(m.ID)); err != nil {
+	if err := validate.ReadOnly(ctx, "id", "body", m.ID); err != nil {
 		return err
 	}
 
@@ -455,7 +480,7 @@ func (m *Alert) contextValidateID(ctx context.Context, formats strfmt.Registry)
 
 func (m *Alert) contextValidateMachineID(ctx context.Context, formats strfmt.Registry) error {
 
-	if err := validate.ReadOnly(ctx, "machine_id", "body", string(m.MachineID)); err != nil {
+	if err := validate.ReadOnly(ctx, "machine_id", "body", m.MachineID); err != nil {
 		return err
 	}
 
@@ -465,11 +490,15 @@ func (m *Alert) contextValidateMachineID(ctx context.Context, formats strfmt.Reg
 func (m *Alert) contextValidateMeta(ctx context.Context, formats strfmt.Registry) error {
 
 	if err := m.Meta.ContextValidate(ctx, formats); err != nil {
-		if ve, ok := err.(*errors.Validation); ok {
+		ve := new(errors.Validation)
+		if stderrors.As(err, &ve) {
 			return ve.ValidateName("meta")
-		} else if ce, ok := err.(*errors.CompositeError); ok {
+		}
+		ce := new(errors.CompositeError)
+		if stderrors.As(err, &ce) {
 			return ce.ValidateName("meta")
 		}
+
 		return err
 	}
 
@@ -481,11 +510,15 @@ func (m *Alert) contextValidateSource(ctx context.Context, formats strfmt.Regist
 	if m.Source != nil {
 
 		if err := m.Source.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
+			ve := new(errors.Validation)
+			if stderrors.As(err, &ve) {
 				return ve.ValidateName("source")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
+			}
+			ce := new(errors.CompositeError)
+			if stderrors.As(err, &ce) {
 				return ce.ValidateName("source")
 			}
+
 			return err
 		}
 	}
@@ -495,7 +528,7 @@ func (m *Alert) contextValidateSource(ctx context.Context, formats strfmt.Regist
 
 func (m *Alert) contextValidateUUID(ctx context.Context, formats strfmt.Registry) error {
 
-	if err := validate.ReadOnly(ctx, "uuid", "body", string(m.UUID)); err != nil {
+	if err := validate.ReadOnly(ctx, "uuid", "body", m.UUID); err != nil {
 		return err
 	}
 
diff --git a/pkg/models/all_metrics.go b/pkg/models/all_metrics.go
index 5865070e8ef..9e67d163783 100644
--- a/pkg/models/all_metrics.go
+++ b/pkg/models/all_metrics.go
@@ -7,6 +7,7 @@ package models
 
 import (
 	"context"
+	stderrors "errors"
 	"strconv"
 
 	"github.com/go-openapi/errors"
@@ -58,11 +59,15 @@ func (m *AllMetrics) validateLapi(formats strfmt.Registry) error {
 
 	if m.Lapi != nil {
 		if err := m.Lapi.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
+			ve := new(errors.Validation)
+			if stderrors.As(err, &ve) {
 				return ve.ValidateName("lapi")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
+			}
+			ce := new(errors.CompositeError)
+			if stderrors.As(err, &ce) {
 				return ce.ValidateName("lapi")
 			}
+
 			return err
 		}
 	}
@@ -82,11 +87,15 @@ func (m *AllMetrics) validateLogProcessors(formats strfmt.Registry) error {
 
 		if m.LogProcessors[i] != nil {
 			if err := m.LogProcessors[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName("log_processors" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName("log_processors" + "." + strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
@@ -108,11 +117,15 @@ func (m *AllMetrics) validateRemediationComponents(formats strfmt.Registry) erro
 
 		if m.RemediationComponents[i] != nil {
 			if err := m.RemediationComponents[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName("remediation_components" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName("remediation_components" + "." + strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
@@ -153,11 +166,15 @@ func (m *AllMetrics) contextValidateLapi(ctx context.Context, formats strfmt.Reg
 		}
 
 		if err := m.Lapi.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
+			ve := new(errors.Validation)
+			if stderrors.As(err, &ve) {
 				return ve.ValidateName("lapi")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
+			}
+			ce := new(errors.CompositeError)
+			if stderrors.As(err, &ce) {
 				return ce.ValidateName("lapi")
 			}
+
 			return err
 		}
 	}
@@ -176,11 +193,15 @@ func (m *AllMetrics) contextValidateLogProcessors(ctx context.Context, formats s
 			}
 
 			if err := m.LogProcessors[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName("log_processors" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName("log_processors" + "." + strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
@@ -201,11 +222,15 @@ func (m *AllMetrics) contextValidateRemediationComponents(ctx context.Context, f
 			}
 
 			if err := m.RemediationComponents[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName("remediation_components" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName("remediation_components" + "." + strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
diff --git a/pkg/models/base_metrics.go b/pkg/models/base_metrics.go
index 94691ea233e..2ae1d4f6c43 100644
--- a/pkg/models/base_metrics.go
+++ b/pkg/models/base_metrics.go
@@ -7,6 +7,7 @@ package models
 
 import (
 	"context"
+	stderrors "errors"
 	"strconv"
 
 	"github.com/go-openapi/errors"
@@ -77,11 +78,15 @@ func (m *BaseMetrics) validateMetrics(formats strfmt.Registry) error {
 
 		if m.Metrics[i] != nil {
 			if err := m.Metrics[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName("metrics" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName("metrics" + "." + strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
@@ -98,11 +103,15 @@ func (m *BaseMetrics) validateOs(formats strfmt.Registry) error {
 
 	if m.Os != nil {
 		if err := m.Os.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
+			ve := new(errors.Validation)
+			if stderrors.As(err, &ve) {
 				return ve.ValidateName("os")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
+			}
+			ce := new(errors.CompositeError)
+			if stderrors.As(err, &ce) {
 				return ce.ValidateName("os")
 			}
+
 			return err
 		}
 	}
@@ -161,11 +170,15 @@ func (m *BaseMetrics) contextValidateMetrics(ctx context.Context, formats strfmt
 			}
 
 			if err := m.Metrics[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName("metrics" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName("metrics" + "." + strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
@@ -184,11 +197,15 @@ func (m *BaseMetrics) contextValidateOs(ctx context.Context, formats strfmt.Regi
 		}
 
 		if err := m.Os.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
+			ve := new(errors.Validation)
+			if stderrors.As(err, &ve) {
 				return ve.ValidateName("os")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
+			}
+			ce := new(errors.CompositeError)
+			if stderrors.As(err, &ce) {
 				return ce.ValidateName("os")
 			}
+
 			return err
 		}
 	}
diff --git a/pkg/models/bulk_check_allowlist_response.go b/pkg/models/bulk_check_allowlist_response.go
index 0e6a467de41..32763acb2fe 100644
--- a/pkg/models/bulk_check_allowlist_response.go
+++ b/pkg/models/bulk_check_allowlist_response.go
@@ -7,6 +7,7 @@ package models
 
 import (
 	"context"
+	stderrors "errors"
 	"strconv"
 
 	"github.com/go-openapi/errors"
@@ -52,11 +53,15 @@ func (m *BulkCheckAllowlistResponse) validateResults(formats strfmt.Registry) er
 
 		if m.Results[i] != nil {
 			if err := m.Results[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName("results" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName("results" + "." + strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
@@ -91,11 +96,15 @@ func (m *BulkCheckAllowlistResponse) contextValidateResults(ctx context.Context,
 			}
 
 			if err := m.Results[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName("results" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName("results" + "." + strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
diff --git a/pkg/models/decision.go b/pkg/models/decision.go
index 9cc16525281..a5ebd508b22 100644
--- a/pkg/models/decision.go
+++ b/pkg/models/decision.go
@@ -171,7 +171,7 @@ func (m *Decision) ContextValidate(ctx context.Context, formats strfmt.Registry)
 
 func (m *Decision) contextValidateID(ctx context.Context, formats strfmt.Registry) error {
 
-	if err := validate.ReadOnly(ctx, "id", "body", int64(m.ID)); err != nil {
+	if err := validate.ReadOnly(ctx, "id", "body", m.ID); err != nil {
 		return err
 	}
 
@@ -189,7 +189,7 @@ func (m *Decision) contextValidateSimulated(ctx context.Context, formats strfmt.
 
 func (m *Decision) contextValidateUUID(ctx context.Context, formats strfmt.Registry) error {
 
-	if err := validate.ReadOnly(ctx, "uuid", "body", string(m.UUID)); err != nil {
+	if err := validate.ReadOnly(ctx, "uuid", "body", m.UUID); err != nil {
 		return err
 	}
 
diff --git a/pkg/models/decisions_stream_response.go b/pkg/models/decisions_stream_response.go
index 8ec0c69144b..c8320a30f80 100644
--- a/pkg/models/decisions_stream_response.go
+++ b/pkg/models/decisions_stream_response.go
@@ -7,6 +7,7 @@ package models
 
 import (
 	"context"
+	stderrors "errors"
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
@@ -49,11 +50,15 @@ func (m *DecisionsStreamResponse) validateDeleted(formats strfmt.Registry) error
 	}
 
 	if err := m.Deleted.Validate(formats); err != nil {
-		if ve, ok := err.(*errors.Validation); ok {
+		ve := new(errors.Validation)
+		if stderrors.As(err, &ve) {
 			return ve.ValidateName("deleted")
-		} else if ce, ok := err.(*errors.CompositeError); ok {
+		}
+		ce := new(errors.CompositeError)
+		if stderrors.As(err, &ce) {
 			return ce.ValidateName("deleted")
 		}
+
 		return err
 	}
 
@@ -66,11 +71,15 @@ func (m *DecisionsStreamResponse) validateNew(formats strfmt.Registry) error {
 	}
 
 	if err := m.New.Validate(formats); err != nil {
-		if ve, ok := err.(*errors.Validation); ok {
+		ve := new(errors.Validation)
+		if stderrors.As(err, &ve) {
 			return ve.ValidateName("new")
-		} else if ce, ok := err.(*errors.CompositeError); ok {
+		}
+		ce := new(errors.CompositeError)
+		if stderrors.As(err, &ce) {
 			return ce.ValidateName("new")
 		}
+
 		return err
 	}
 
@@ -98,11 +107,15 @@ func (m *DecisionsStreamResponse) ContextValidate(ctx context.Context, formats s
 func (m *DecisionsStreamResponse) contextValidateDeleted(ctx context.Context, formats strfmt.Registry) error {
 
 	if err := m.Deleted.ContextValidate(ctx, formats); err != nil {
-		if ve, ok := err.(*errors.Validation); ok {
+		ve := new(errors.Validation)
+		if stderrors.As(err, &ve) {
 			return ve.ValidateName("deleted")
-		} else if ce, ok := err.(*errors.CompositeError); ok {
+		}
+		ce := new(errors.CompositeError)
+		if stderrors.As(err, &ce) {
 			return ce.ValidateName("deleted")
 		}
+
 		return err
 	}
 
@@ -112,11 +125,15 @@ func (m *DecisionsStreamResponse) contextValidateDeleted(ctx context.Context, fo
 func (m *DecisionsStreamResponse) contextValidateNew(ctx context.Context, formats strfmt.Registry) error {
 
 	if err := m.New.ContextValidate(ctx, formats); err != nil {
-		if ve, ok := err.(*errors.Validation); ok {
+		ve := new(errors.Validation)
+		if stderrors.As(err, &ve) {
 			return ve.ValidateName("new")
-		} else if ce, ok := err.(*errors.CompositeError); ok {
+		}
+		ce := new(errors.CompositeError)
+		if stderrors.As(err, &ce) {
 			return ce.ValidateName("new")
 		}
+
 		return err
 	}
 
diff --git a/pkg/models/detailed_metrics.go b/pkg/models/detailed_metrics.go
index 9e605ed8c88..2de8f4c661d 100644
--- a/pkg/models/detailed_metrics.go
+++ b/pkg/models/detailed_metrics.go
@@ -7,6 +7,7 @@ package models
 
 import (
 	"context"
+	stderrors "errors"
 	"strconv"
 
 	"github.com/go-openapi/errors"
@@ -60,11 +61,15 @@ func (m *DetailedMetrics) validateItems(formats strfmt.Registry) error {
 
 		if m.Items[i] != nil {
 			if err := m.Items[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName("items" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName("items" + "." + strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
@@ -82,11 +87,15 @@ func (m *DetailedMetrics) validateMeta(formats strfmt.Registry) error {
 
 	if m.Meta != nil {
 		if err := m.Meta.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
+			ve := new(errors.Validation)
+			if stderrors.As(err, &ve) {
 				return ve.ValidateName("meta")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
+			}
+			ce := new(errors.CompositeError)
+			if stderrors.As(err, &ce) {
 				return ce.ValidateName("meta")
 			}
+
 			return err
 		}
 	}
@@ -123,11 +132,15 @@ func (m *DetailedMetrics) contextValidateItems(ctx context.Context, formats strf
 			}
 
 			if err := m.Items[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName("items" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName("items" + "." + strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
@@ -142,11 +155,15 @@ func (m *DetailedMetrics) contextValidateMeta(ctx context.Context, formats strfm
 	if m.Meta != nil {
 
 		if err := m.Meta.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
+			ve := new(errors.Validation)
+			if stderrors.As(err, &ve) {
 				return ve.ValidateName("meta")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
+			}
+			ce := new(errors.CompositeError)
+			if stderrors.As(err, &ce) {
 				return ce.ValidateName("meta")
 			}
+
 			return err
 		}
 	}
diff --git a/pkg/models/event.go b/pkg/models/event.go
index 6e165eb9ba0..e54cbdc1da1 100644
--- a/pkg/models/event.go
+++ b/pkg/models/event.go
@@ -7,6 +7,7 @@ package models
 
 import (
 	"context"
+	stderrors "errors"
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
@@ -53,11 +54,15 @@ func (m *Event) validateMeta(formats strfmt.Registry) error {
 	}
 
 	if err := m.Meta.Validate(formats); err != nil {
-		if ve, ok := err.(*errors.Validation); ok {
+		ve := new(errors.Validation)
+		if stderrors.As(err, &ve) {
 			return ve.ValidateName("meta")
-		} else if ce, ok := err.(*errors.CompositeError); ok {
+		}
+		ce := new(errors.CompositeError)
+		if stderrors.As(err, &ce) {
 			return ce.ValidateName("meta")
 		}
+
 		return err
 	}
 
@@ -90,11 +95,15 @@ func (m *Event) ContextValidate(ctx context.Context, formats strfmt.Registry) er
 func (m *Event) contextValidateMeta(ctx context.Context, formats strfmt.Registry) error {
 
 	if err := m.Meta.ContextValidate(ctx, formats); err != nil {
-		if ve, ok := err.(*errors.Validation); ok {
+		ve := new(errors.Validation)
+		if stderrors.As(err, &ve) {
 			return ve.ValidateName("meta")
-		} else if ce, ok := err.(*errors.CompositeError); ok {
+		}
+		ce := new(errors.CompositeError)
+		if stderrors.As(err, &ce) {
 			return ce.ValidateName("meta")
 		}
+
 		return err
 	}
 
diff --git a/pkg/models/generate.go b/pkg/models/generate.go
index 40befed0131..d74260a69b5 100644
--- a/pkg/models/generate.go
+++ b/pkg/models/generate.go
@@ -1,4 +1,4 @@
 package models
 
-//go:generate env GOTOOLCHAIN=go1.24.6 go run -mod=mod github.com/go-swagger/go-swagger/cmd/swagger@v0.32.3 generate model --spec=./localapi_swagger.yaml --target=../
+//go:generate go run -mod=mod github.com/go-swagger/go-swagger/cmd/swagger@v0.33.1 generate model --spec=./localapi_swagger.yaml --target=../
 
diff --git a/pkg/models/get_alerts_response.go b/pkg/models/get_alerts_response.go
index d4ea36e02c5..de7eaae884b 100644
--- a/pkg/models/get_alerts_response.go
+++ b/pkg/models/get_alerts_response.go
@@ -7,6 +7,7 @@ package models
 
 import (
 	"context"
+	stderrors "errors"
 	"strconv"
 
 	"github.com/go-openapi/errors"
@@ -30,11 +31,15 @@ func (m GetAlertsResponse) Validate(formats strfmt.Registry) error {
 
 		if m[i] != nil {
 			if err := m[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName(strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName(strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
@@ -60,11 +65,15 @@ func (m GetAlertsResponse) ContextValidate(ctx context.Context, formats strfmt.R
 			}
 
 			if err := m[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName(strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName(strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
diff --git a/pkg/models/get_allowlist_response.go b/pkg/models/get_allowlist_response.go
index 4459457ecb3..fd3534aaf08 100644
--- a/pkg/models/get_allowlist_response.go
+++ b/pkg/models/get_allowlist_response.go
@@ -7,6 +7,7 @@ package models
 
 import (
 	"context"
+	stderrors "errors"
 	"strconv"
 
 	"github.com/go-openapi/errors"
@@ -90,11 +91,15 @@ func (m *GetAllowlistResponse) validateItems(formats strfmt.Registry) error {
 
 		if m.Items[i] != nil {
 			if err := m.Items[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName("items" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName("items" + "." + strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
@@ -141,11 +146,15 @@ func (m *GetAllowlistResponse) contextValidateItems(ctx context.Context, formats
 			}
 
 			if err := m.Items[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName("items" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName("items" + "." + strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
diff --git a/pkg/models/get_allowlists_response.go b/pkg/models/get_allowlists_response.go
index dd6a80918c6..ade226968bd 100644
--- a/pkg/models/get_allowlists_response.go
+++ b/pkg/models/get_allowlists_response.go
@@ -7,6 +7,7 @@ package models
 
 import (
 	"context"
+	stderrors "errors"
 	"strconv"
 
 	"github.com/go-openapi/errors"
@@ -30,11 +31,15 @@ func (m GetAllowlistsResponse) Validate(formats strfmt.Registry) error {
 
 		if m[i] != nil {
 			if err := m[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName(strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName(strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
@@ -60,11 +65,15 @@ func (m GetAllowlistsResponse) ContextValidate(ctx context.Context, formats strf
 			}
 
 			if err := m[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName(strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName(strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
diff --git a/pkg/models/get_decisions_response.go b/pkg/models/get_decisions_response.go
index 19437dc9b38..9f0f55dfc5f 100644
--- a/pkg/models/get_decisions_response.go
+++ b/pkg/models/get_decisions_response.go
@@ -7,6 +7,7 @@ package models
 
 import (
 	"context"
+	stderrors "errors"
 	"strconv"
 
 	"github.com/go-openapi/errors"
@@ -30,11 +31,15 @@ func (m GetDecisionsResponse) Validate(formats strfmt.Registry) error {
 
 		if m[i] != nil {
 			if err := m[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName(strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName(strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
@@ -60,11 +65,15 @@ func (m GetDecisionsResponse) ContextValidate(ctx context.Context, formats strfm
 			}
 
 			if err := m[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName(strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName(strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
diff --git a/pkg/models/hub_items.go b/pkg/models/hub_items.go
index 82388d5b97e..8d532616772 100644
--- a/pkg/models/hub_items.go
+++ b/pkg/models/hub_items.go
@@ -7,6 +7,7 @@ package models
 
 import (
 	"context"
+	stderrors "errors"
 	"strconv"
 
 	"github.com/go-openapi/errors"
@@ -33,11 +34,15 @@ func (m HubItems) Validate(formats strfmt.Registry) error {
 		for i := 0; i < len(m[k]); i++ {
 
 			if err := m[k][i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName(k + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName(k + "." + strconv.Itoa(i))
 				}
+
 				return err
 			}
 
@@ -64,11 +69,15 @@ func (m HubItems) ContextValidate(ctx context.Context, formats strfmt.Registry)
 			}
 
 			if err := m[k][i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName(k + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName(k + "." + strconv.Itoa(i))
 				}
+
 				return err
 			}
 
diff --git a/pkg/models/lapi_metrics.go b/pkg/models/lapi_metrics.go
index b56d92ef1f8..48ef80d5adb 100644
--- a/pkg/models/lapi_metrics.go
+++ b/pkg/models/lapi_metrics.go
@@ -7,6 +7,7 @@ package models
 
 import (
 	"context"
+	stderrors "errors"
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
@@ -94,11 +95,15 @@ func (m *LapiMetrics) validateConsoleOptions(formats strfmt.Registry) error {
 	}
 
 	if err := m.ConsoleOptions.Validate(formats); err != nil {
-		if ve, ok := err.(*errors.Validation); ok {
+		ve := new(errors.Validation)
+		if stderrors.As(err, &ve) {
 			return ve.ValidateName("console_options")
-		} else if ce, ok := err.(*errors.CompositeError); ok {
+		}
+		ce := new(errors.CompositeError)
+		if stderrors.As(err, &ce) {
 			return ce.ValidateName("console_options")
 		}
+
 		return err
 	}
 
@@ -127,11 +132,15 @@ func (m *LapiMetrics) ContextValidate(ctx context.Context, formats strfmt.Regist
 func (m *LapiMetrics) contextValidateConsoleOptions(ctx context.Context, formats strfmt.Registry) error {
 
 	if err := m.ConsoleOptions.ContextValidate(ctx, formats); err != nil {
-		if ve, ok := err.(*errors.Validation); ok {
+		ve := new(errors.Validation)
+		if stderrors.As(err, &ve) {
 			return ve.ValidateName("console_options")
-		} else if ce, ok := err.(*errors.CompositeError); ok {
+		}
+		ce := new(errors.CompositeError)
+		if stderrors.As(err, &ce) {
 			return ce.ValidateName("console_options")
 		}
+
 		return err
 	}
 
diff --git a/pkg/models/log_processors_metrics.go b/pkg/models/log_processors_metrics.go
index 05b688fb994..55930fbecd7 100644
--- a/pkg/models/log_processors_metrics.go
+++ b/pkg/models/log_processors_metrics.go
@@ -7,6 +7,7 @@ package models
 
 import (
 	"context"
+	stderrors "errors"
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
@@ -155,11 +156,15 @@ func (m *LogProcessorsMetrics) validateHubItems(formats strfmt.Registry) error {
 
 	if m.HubItems != nil {
 		if err := m.HubItems.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
+			ve := new(errors.Validation)
+			if stderrors.As(err, &ve) {
 				return ve.ValidateName("hub_items")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
+			}
+			ce := new(errors.CompositeError)
+			if stderrors.As(err, &ce) {
 				return ce.ValidateName("hub_items")
 			}
+
 			return err
 		}
 	}
@@ -189,11 +194,15 @@ func (m *LogProcessorsMetrics) ContextValidate(ctx context.Context, formats strf
 func (m *LogProcessorsMetrics) contextValidateHubItems(ctx context.Context, formats strfmt.Registry) error {
 
 	if err := m.HubItems.ContextValidate(ctx, formats); err != nil {
-		if ve, ok := err.(*errors.Validation); ok {
+		ve := new(errors.Validation)
+		if stderrors.As(err, &ve) {
 			return ve.ValidateName("hub_items")
-		} else if ce, ok := err.(*errors.CompositeError); ok {
+		}
+		ce := new(errors.CompositeError)
+		if stderrors.As(err, &ce) {
 			return ce.ValidateName("hub_items")
 		}
+
 		return err
 	}
 
diff --git a/pkg/models/meta.go b/pkg/models/meta.go
index df5ae3c6285..b7aa68bf217 100644
--- a/pkg/models/meta.go
+++ b/pkg/models/meta.go
@@ -7,6 +7,7 @@ package models
 
 import (
 	"context"
+	stderrors "errors"
 	"strconv"
 
 	"github.com/go-openapi/errors"
@@ -32,11 +33,15 @@ func (m Meta) Validate(formats strfmt.Registry) error {
 
 		if m[i] != nil {
 			if err := m[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName(strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName(strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
@@ -62,11 +67,15 @@ func (m Meta) ContextValidate(ctx context.Context, formats strfmt.Registry) erro
 			}
 
 			if err := m[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName(strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName(strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
diff --git a/pkg/models/metrics.go b/pkg/models/metrics.go
index 7fbb91c63e4..2cfdddbc213 100644
--- a/pkg/models/metrics.go
+++ b/pkg/models/metrics.go
@@ -7,6 +7,7 @@ package models
 
 import (
 	"context"
+	stderrors "errors"
 	"strconv"
 
 	"github.com/go-openapi/errors"
@@ -77,11 +78,15 @@ func (m *Metrics) validateBouncers(formats strfmt.Registry) error {
 
 		if m.Bouncers[i] != nil {
 			if err := m.Bouncers[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName("bouncers" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName("bouncers" + "." + strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
@@ -104,11 +109,15 @@ func (m *Metrics) validateMachines(formats strfmt.Registry) error {
 
 		if m.Machines[i] != nil {
 			if err := m.Machines[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName("machines" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName("machines" + "." + strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
@@ -147,11 +156,15 @@ func (m *Metrics) contextValidateBouncers(ctx context.Context, formats strfmt.Re
 			}
 
 			if err := m.Bouncers[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName("bouncers" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName("bouncers" + "." + strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
@@ -172,11 +185,15 @@ func (m *Metrics) contextValidateMachines(ctx context.Context, formats strfmt.Re
 			}
 
 			if err := m.Machines[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName("machines" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName("machines" + "." + strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
diff --git a/pkg/models/metrics_detail_item.go b/pkg/models/metrics_detail_item.go
index bb237884fcf..25598d2f8b2 100644
--- a/pkg/models/metrics_detail_item.go
+++ b/pkg/models/metrics_detail_item.go
@@ -7,6 +7,7 @@ package models
 
 import (
 	"context"
+	stderrors "errors"
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
@@ -70,11 +71,15 @@ func (m *MetricsDetailItem) validateLabels(formats strfmt.Registry) error {
 
 	if m.Labels != nil {
 		if err := m.Labels.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
+			ve := new(errors.Validation)
+			if stderrors.As(err, &ve) {
 				return ve.ValidateName("labels")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
+			}
+			ce := new(errors.CompositeError)
+			if stderrors.As(err, &ce) {
 				return ce.ValidateName("labels")
 			}
+
 			return err
 		}
 	}
@@ -138,11 +143,15 @@ func (m *MetricsDetailItem) contextValidateLabels(ctx context.Context, formats s
 	}
 
 	if err := m.Labels.ContextValidate(ctx, formats); err != nil {
-		if ve, ok := err.(*errors.Validation); ok {
+		ve := new(errors.Validation)
+		if stderrors.As(err, &ve) {
 			return ve.ValidateName("labels")
-		} else if ce, ok := err.(*errors.CompositeError); ok {
+		}
+		ce := new(errors.CompositeError)
+		if stderrors.As(err, &ce) {
 			return ce.ValidateName("labels")
 		}
+
 		return err
 	}
 
diff --git a/pkg/modelscapi/add_signals_request.go b/pkg/modelscapi/add_signals_request.go
index 7bfe6ae80e0..431922acc86 100644
--- a/pkg/modelscapi/add_signals_request.go
+++ b/pkg/modelscapi/add_signals_request.go
@@ -7,6 +7,7 @@ package modelscapi
 
 import (
 	"context"
+	stderrors "errors"
 	"strconv"
 
 	"github.com/go-openapi/errors"
@@ -32,11 +33,15 @@ func (m AddSignalsRequest) Validate(formats strfmt.Registry) error {
 
 		if m[i] != nil {
 			if err := m[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName(strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName(strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
@@ -62,11 +67,15 @@ func (m AddSignalsRequest) ContextValidate(ctx context.Context, formats strfmt.R
 			}
 
 			if err := m[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName(strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName(strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
diff --git a/pkg/modelscapi/add_signals_request_item.go b/pkg/modelscapi/add_signals_request_item.go
index 5f63b542d5a..8c81f91719f 100644
--- a/pkg/modelscapi/add_signals_request_item.go
+++ b/pkg/modelscapi/add_signals_request_item.go
@@ -7,6 +7,7 @@ package modelscapi
 
 import (
 	"context"
+	stderrors "errors"
 	"strconv"
 
 	"github.com/go-openapi/errors"
@@ -128,11 +129,15 @@ func (m *AddSignalsRequestItem) validateContext(formats strfmt.Registry) error {
 
 		if m.Context[i] != nil {
 			if err := m.Context[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName("context" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName("context" + "." + strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
@@ -148,11 +153,15 @@ func (m *AddSignalsRequestItem) validateDecisions(formats strfmt.Registry) error
 	}
 
 	if err := m.Decisions.Validate(formats); err != nil {
-		if ve, ok := err.(*errors.Validation); ok {
+		ve := new(errors.Validation)
+		if stderrors.As(err, &ve) {
 			return ve.ValidateName("decisions")
-		} else if ce, ok := err.(*errors.CompositeError); ok {
+		}
+		ce := new(errors.CompositeError)
+		if stderrors.As(err, &ce) {
 			return ce.ValidateName("decisions")
 		}
+
 		return err
 	}
 
@@ -203,11 +212,15 @@ func (m *AddSignalsRequestItem) validateSource(formats strfmt.Registry) error {
 
 	if m.Source != nil {
 		if err := m.Source.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
+			ve := new(errors.Validation)
+			if stderrors.As(err, &ve) {
 				return ve.ValidateName("source")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
+			}
+			ce := new(errors.CompositeError)
+			if stderrors.As(err, &ce) {
 				return ce.ValidateName("source")
 			}
+
 			return err
 		}
 	}
@@ -266,11 +279,15 @@ func (m *AddSignalsRequestItem) contextValidateContext(ctx context.Context, form
 			}
 
 			if err := m.Context[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName("context" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName("context" + "." + strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
@@ -283,11 +300,15 @@ func (m *AddSignalsRequestItem) contextValidateContext(ctx context.Context, form
 func (m *AddSignalsRequestItem) contextValidateDecisions(ctx context.Context, formats strfmt.Registry) error {
 
 	if err := m.Decisions.ContextValidate(ctx, formats); err != nil {
-		if ve, ok := err.(*errors.Validation); ok {
+		ve := new(errors.Validation)
+		if stderrors.As(err, &ve) {
 			return ve.ValidateName("decisions")
-		} else if ce, ok := err.(*errors.CompositeError); ok {
+		}
+		ce := new(errors.CompositeError)
+		if stderrors.As(err, &ce) {
 			return ce.ValidateName("decisions")
 		}
+
 		return err
 	}
 
@@ -299,11 +320,15 @@ func (m *AddSignalsRequestItem) contextValidateSource(ctx context.Context, forma
 	if m.Source != nil {
 
 		if err := m.Source.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
+			ve := new(errors.Validation)
+			if stderrors.As(err, &ve) {
 				return ve.ValidateName("source")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
+			}
+			ce := new(errors.CompositeError)
+			if stderrors.As(err, &ce) {
 				return ce.ValidateName("source")
 			}
+
 			return err
 		}
 	}
diff --git a/pkg/modelscapi/add_signals_request_item_decisions.go b/pkg/modelscapi/add_signals_request_item_decisions.go
index 11ed27a496d..8c45067296e 100644
--- a/pkg/modelscapi/add_signals_request_item_decisions.go
+++ b/pkg/modelscapi/add_signals_request_item_decisions.go
@@ -7,6 +7,7 @@ package modelscapi
 
 import (
 	"context"
+	stderrors "errors"
 	"strconv"
 
 	"github.com/go-openapi/errors"
@@ -30,11 +31,15 @@ func (m AddSignalsRequestItemDecisions) Validate(formats strfmt.Registry) error
 
 		if m[i] != nil {
 			if err := m[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName(strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName(strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
@@ -60,11 +65,15 @@ func (m AddSignalsRequestItemDecisions) ContextValidate(ctx context.Context, for
 			}
 
 			if err := m[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName(strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName(strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
diff --git a/pkg/modelscapi/decisions_delete_request.go b/pkg/modelscapi/decisions_delete_request.go
index 0c93558adf1..d67a090b4bf 100644
--- a/pkg/modelscapi/decisions_delete_request.go
+++ b/pkg/modelscapi/decisions_delete_request.go
@@ -7,6 +7,7 @@ package modelscapi
 
 import (
 	"context"
+	stderrors "errors"
 	"strconv"
 
 	"github.com/go-openapi/errors"
@@ -28,11 +29,15 @@ func (m DecisionsDeleteRequest) Validate(formats strfmt.Registry) error {
 	for i := 0; i < len(m); i++ {
 
 		if err := m[i].Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
+			ve := new(errors.Validation)
+			if stderrors.As(err, &ve) {
 				return ve.ValidateName(strconv.Itoa(i))
-			} else if ce, ok := err.(*errors.CompositeError); ok {
+			}
+			ce := new(errors.CompositeError)
+			if stderrors.As(err, &ce) {
 				return ce.ValidateName(strconv.Itoa(i))
 			}
+
 			return err
 		}
 
@@ -55,11 +60,15 @@ func (m DecisionsDeleteRequest) ContextValidate(ctx context.Context, formats str
 		}
 
 		if err := m[i].ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
+			ve := new(errors.Validation)
+			if stderrors.As(err, &ve) {
 				return ve.ValidateName(strconv.Itoa(i))
-			} else if ce, ok := err.(*errors.CompositeError); ok {
+			}
+			ce := new(errors.CompositeError)
+			if stderrors.As(err, &ce) {
 				return ce.ValidateName(strconv.Itoa(i))
 			}
+
 			return err
 		}
 
diff --git a/pkg/modelscapi/decisions_sync_request.go b/pkg/modelscapi/decisions_sync_request.go
index c087d39ff62..a76fcc28185 100644
--- a/pkg/modelscapi/decisions_sync_request.go
+++ b/pkg/modelscapi/decisions_sync_request.go
@@ -7,6 +7,7 @@ package modelscapi
 
 import (
 	"context"
+	stderrors "errors"
 	"strconv"
 
 	"github.com/go-openapi/errors"
@@ -32,11 +33,15 @@ func (m DecisionsSyncRequest) Validate(formats strfmt.Registry) error {
 
 		if m[i] != nil {
 			if err := m[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName(strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName(strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
@@ -62,11 +67,15 @@ func (m DecisionsSyncRequest) ContextValidate(ctx context.Context, formats strfm
 			}
 
 			if err := m[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName(strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName(strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
diff --git a/pkg/modelscapi/decisions_sync_request_item.go b/pkg/modelscapi/decisions_sync_request_item.go
index 460fe4d430e..325a19beba5 100644
--- a/pkg/modelscapi/decisions_sync_request_item.go
+++ b/pkg/modelscapi/decisions_sync_request_item.go
@@ -7,6 +7,7 @@ package modelscapi
 
 import (
 	"context"
+	stderrors "errors"
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
@@ -111,11 +112,15 @@ func (m *DecisionsSyncRequestItem) validateDecisions(formats strfmt.Registry) er
 	}
 
 	if err := m.Decisions.Validate(formats); err != nil {
-		if ve, ok := err.(*errors.Validation); ok {
+		ve := new(errors.Validation)
+		if stderrors.As(err, &ve) {
 			return ve.ValidateName("decisions")
-		} else if ce, ok := err.(*errors.CompositeError); ok {
+		}
+		ce := new(errors.CompositeError)
+		if stderrors.As(err, &ce) {
 			return ce.ValidateName("decisions")
 		}
+
 		return err
 	}
 
@@ -166,11 +171,15 @@ func (m *DecisionsSyncRequestItem) validateSource(formats strfmt.Registry) error
 
 	if m.Source != nil {
 		if err := m.Source.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
+			ve := new(errors.Validation)
+			if stderrors.As(err, &ve) {
 				return ve.ValidateName("source")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
+			}
+			ce := new(errors.CompositeError)
+			if stderrors.As(err, &ce) {
 				return ce.ValidateName("source")
 			}
+
 			return err
 		}
 	}
@@ -217,11 +226,15 @@ func (m *DecisionsSyncRequestItem) ContextValidate(ctx context.Context, formats
 func (m *DecisionsSyncRequestItem) contextValidateDecisions(ctx context.Context, formats strfmt.Registry) error {
 
 	if err := m.Decisions.ContextValidate(ctx, formats); err != nil {
-		if ve, ok := err.(*errors.Validation); ok {
+		ve := new(errors.Validation)
+		if stderrors.As(err, &ve) {
 			return ve.ValidateName("decisions")
-		} else if ce, ok := err.(*errors.CompositeError); ok {
+		}
+		ce := new(errors.CompositeError)
+		if stderrors.As(err, &ce) {
 			return ce.ValidateName("decisions")
 		}
+
 		return err
 	}
 
@@ -233,11 +246,15 @@ func (m *DecisionsSyncRequestItem) contextValidateSource(ctx context.Context, fo
 	if m.Source != nil {
 
 		if err := m.Source.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
+			ve := new(errors.Validation)
+			if stderrors.As(err, &ve) {
 				return ve.ValidateName("source")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
+			}
+			ce := new(errors.CompositeError)
+			if stderrors.As(err, &ce) {
 				return ce.ValidateName("source")
 			}
+
 			return err
 		}
 	}
diff --git a/pkg/modelscapi/decisions_sync_request_item_decisions.go b/pkg/modelscapi/decisions_sync_request_item_decisions.go
index bdc8e77e2b6..c0cc5d7c9fe 100644
--- a/pkg/modelscapi/decisions_sync_request_item_decisions.go
+++ b/pkg/modelscapi/decisions_sync_request_item_decisions.go
@@ -7,6 +7,7 @@ package modelscapi
 
 import (
 	"context"
+	stderrors "errors"
 	"strconv"
 
 	"github.com/go-openapi/errors"
@@ -30,11 +31,15 @@ func (m DecisionsSyncRequestItemDecisions) Validate(formats strfmt.Registry) err
 
 		if m[i] != nil {
 			if err := m[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName(strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName(strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
@@ -60,11 +65,15 @@ func (m DecisionsSyncRequestItemDecisions) ContextValidate(ctx context.Context,
 			}
 
 			if err := m[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName(strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName(strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
diff --git a/pkg/modelscapi/generate.go b/pkg/modelscapi/generate.go
index 049b6b7fd6f..981467bcde8 100644
--- a/pkg/modelscapi/generate.go
+++ b/pkg/modelscapi/generate.go
@@ -1,4 +1,4 @@
 package modelscapi
 
-//go:generate env GOTOOLCHAIN=go1.24.6 go run -mod=mod github.com/go-swagger/go-swagger/cmd/swagger@v0.32.3 generate model --spec=./centralapi_swagger.yaml --target=../ --model-package=modelscapi
+//go:generate go run -mod=mod github.com/go-swagger/go-swagger/cmd/swagger@v0.33.1 generate model --spec=./centralapi_swagger.yaml --target=../ --model-package=modelscapi
 
diff --git a/pkg/modelscapi/get_decisions_stream_response.go b/pkg/modelscapi/get_decisions_stream_response.go
index 5ebf29c5d93..44b5220ae1e 100644
--- a/pkg/modelscapi/get_decisions_stream_response.go
+++ b/pkg/modelscapi/get_decisions_stream_response.go
@@ -7,6 +7,7 @@ package modelscapi
 
 import (
 	"context"
+	stderrors "errors"
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
@@ -58,11 +59,15 @@ func (m *GetDecisionsStreamResponse) validateDeleted(formats strfmt.Registry) er
 	}
 
 	if err := m.Deleted.Validate(formats); err != nil {
-		if ve, ok := err.(*errors.Validation); ok {
+		ve := new(errors.Validation)
+		if stderrors.As(err, &ve) {
 			return ve.ValidateName("deleted")
-		} else if ce, ok := err.(*errors.CompositeError); ok {
+		}
+		ce := new(errors.CompositeError)
+		if stderrors.As(err, &ce) {
 			return ce.ValidateName("deleted")
 		}
+
 		return err
 	}
 
@@ -76,11 +81,15 @@ func (m *GetDecisionsStreamResponse) validateLinks(formats strfmt.Registry) erro
 
 	if m.Links != nil {
 		if err := m.Links.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
+			ve := new(errors.Validation)
+			if stderrors.As(err, &ve) {
 				return ve.ValidateName("links")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
+			}
+			ce := new(errors.CompositeError)
+			if stderrors.As(err, &ce) {
 				return ce.ValidateName("links")
 			}
+
 			return err
 		}
 	}
@@ -94,11 +103,15 @@ func (m *GetDecisionsStreamResponse) validateNew(formats strfmt.Registry) error
 	}
 
 	if err := m.New.Validate(formats); err != nil {
-		if ve, ok := err.(*errors.Validation); ok {
+		ve := new(errors.Validation)
+		if stderrors.As(err, &ve) {
 			return ve.ValidateName("new")
-		} else if ce, ok := err.(*errors.CompositeError); ok {
+		}
+		ce := new(errors.CompositeError)
+		if stderrors.As(err, &ce) {
 			return ce.ValidateName("new")
 		}
+
 		return err
 	}
 
@@ -130,11 +143,15 @@ func (m *GetDecisionsStreamResponse) ContextValidate(ctx context.Context, format
 func (m *GetDecisionsStreamResponse) contextValidateDeleted(ctx context.Context, formats strfmt.Registry) error {
 
 	if err := m.Deleted.ContextValidate(ctx, formats); err != nil {
-		if ve, ok := err.(*errors.Validation); ok {
+		ve := new(errors.Validation)
+		if stderrors.As(err, &ve) {
 			return ve.ValidateName("deleted")
-		} else if ce, ok := err.(*errors.CompositeError); ok {
+		}
+		ce := new(errors.CompositeError)
+		if stderrors.As(err, &ce) {
 			return ce.ValidateName("deleted")
 		}
+
 		return err
 	}
 
@@ -150,11 +167,15 @@ func (m *GetDecisionsStreamResponse) contextValidateLinks(ctx context.Context, f
 		}
 
 		if err := m.Links.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
+			ve := new(errors.Validation)
+			if stderrors.As(err, &ve) {
 				return ve.ValidateName("links")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
+			}
+			ce := new(errors.CompositeError)
+			if stderrors.As(err, &ce) {
 				return ce.ValidateName("links")
 			}
+
 			return err
 		}
 	}
@@ -165,11 +186,15 @@ func (m *GetDecisionsStreamResponse) contextValidateLinks(ctx context.Context, f
 func (m *GetDecisionsStreamResponse) contextValidateNew(ctx context.Context, formats strfmt.Registry) error {
 
 	if err := m.New.ContextValidate(ctx, formats); err != nil {
-		if ve, ok := err.(*errors.Validation); ok {
+		ve := new(errors.Validation)
+		if stderrors.As(err, &ve) {
 			return ve.ValidateName("new")
-		} else if ce, ok := err.(*errors.CompositeError); ok {
+		}
+		ce := new(errors.CompositeError)
+		if stderrors.As(err, &ce) {
 			return ce.ValidateName("new")
 		}
+
 		return err
 	}
 
diff --git a/pkg/modelscapi/get_decisions_stream_response_deleted.go b/pkg/modelscapi/get_decisions_stream_response_deleted.go
index 78292860f22..c95f4c7efb0 100644
--- a/pkg/modelscapi/get_decisions_stream_response_deleted.go
+++ b/pkg/modelscapi/get_decisions_stream_response_deleted.go
@@ -7,6 +7,7 @@ package modelscapi
 
 import (
 	"context"
+	stderrors "errors"
 	"strconv"
 
 	"github.com/go-openapi/errors"
@@ -30,11 +31,15 @@ func (m GetDecisionsStreamResponseDeleted) Validate(formats strfmt.Registry) err
 
 		if m[i] != nil {
 			if err := m[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName(strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName(strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
@@ -60,11 +65,15 @@ func (m GetDecisionsStreamResponseDeleted) ContextValidate(ctx context.Context,
 			}
 
 			if err := m[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName(strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName(strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
diff --git a/pkg/modelscapi/get_decisions_stream_response_links.go b/pkg/modelscapi/get_decisions_stream_response_links.go
index f9e320aee38..aaa18e32fe2 100644
--- a/pkg/modelscapi/get_decisions_stream_response_links.go
+++ b/pkg/modelscapi/get_decisions_stream_response_links.go
@@ -7,6 +7,7 @@ package modelscapi
 
 import (
 	"context"
+	stderrors "errors"
 	"strconv"
 
 	"github.com/go-openapi/errors"
@@ -56,11 +57,15 @@ func (m *GetDecisionsStreamResponseLinks) validateAllowlists(formats strfmt.Regi
 
 		if m.Allowlists[i] != nil {
 			if err := m.Allowlists[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName("allowlists" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName("allowlists" + "." + strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
@@ -82,11 +87,15 @@ func (m *GetDecisionsStreamResponseLinks) validateBlocklists(formats strfmt.Regi
 
 		if m.Blocklists[i] != nil {
 			if err := m.Blocklists[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName("blocklists" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName("blocklists" + "." + strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
@@ -125,11 +134,15 @@ func (m *GetDecisionsStreamResponseLinks) contextValidateAllowlists(ctx context.
 			}
 
 			if err := m.Allowlists[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName("allowlists" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName("allowlists" + "." + strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
@@ -150,11 +163,15 @@ func (m *GetDecisionsStreamResponseLinks) contextValidateBlocklists(ctx context.
 			}
 
 			if err := m.Blocklists[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName("blocklists" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName("blocklists" + "." + strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
diff --git a/pkg/modelscapi/get_decisions_stream_response_new.go b/pkg/modelscapi/get_decisions_stream_response_new.go
index 8e09f1b20e7..eefe0494fac 100644
--- a/pkg/modelscapi/get_decisions_stream_response_new.go
+++ b/pkg/modelscapi/get_decisions_stream_response_new.go
@@ -7,6 +7,7 @@ package modelscapi
 
 import (
 	"context"
+	stderrors "errors"
 	"strconv"
 
 	"github.com/go-openapi/errors"
@@ -30,11 +31,15 @@ func (m GetDecisionsStreamResponseNew) Validate(formats strfmt.Registry) error {
 
 		if m[i] != nil {
 			if err := m[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName(strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName(strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
@@ -60,11 +65,15 @@ func (m GetDecisionsStreamResponseNew) ContextValidate(ctx context.Context, form
 			}
 
 			if err := m[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName(strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName(strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
diff --git a/pkg/modelscapi/get_decisions_stream_response_new_item.go b/pkg/modelscapi/get_decisions_stream_response_new_item.go
index 77cc06732ce..1f989f3e4ca 100644
--- a/pkg/modelscapi/get_decisions_stream_response_new_item.go
+++ b/pkg/modelscapi/get_decisions_stream_response_new_item.go
@@ -7,6 +7,7 @@ package modelscapi
 
 import (
 	"context"
+	stderrors "errors"
 	"strconv"
 
 	"github.com/go-openapi/errors"
@@ -68,11 +69,15 @@ func (m *GetDecisionsStreamResponseNewItem) validateDecisions(formats strfmt.Reg
 
 		if m.Decisions[i] != nil {
 			if err := m.Decisions[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName("decisions" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName("decisions" + "." + strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
@@ -125,11 +130,15 @@ func (m *GetDecisionsStreamResponseNewItem) contextValidateDecisions(ctx context
 			}
 
 			if err := m.Decisions[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName("decisions" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName("decisions" + "." + strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
diff --git a/pkg/modelscapi/metrics_request.go b/pkg/modelscapi/metrics_request.go
index 5d663cf1750..d923e0b7980 100644
--- a/pkg/modelscapi/metrics_request.go
+++ b/pkg/modelscapi/metrics_request.go
@@ -7,6 +7,7 @@ package modelscapi
 
 import (
 	"context"
+	stderrors "errors"
 	"strconv"
 
 	"github.com/go-openapi/errors"
@@ -62,11 +63,15 @@ func (m *MetricsRequest) validateBouncers(formats strfmt.Registry) error {
 
 		if m.Bouncers[i] != nil {
 			if err := m.Bouncers[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName("bouncers" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName("bouncers" + "." + strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
@@ -89,11 +94,15 @@ func (m *MetricsRequest) validateMachines(formats strfmt.Registry) error {
 
 		if m.Machines[i] != nil {
 			if err := m.Machines[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName("machines" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName("machines" + "." + strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
@@ -132,11 +141,15 @@ func (m *MetricsRequest) contextValidateBouncers(ctx context.Context, formats st
 			}
 
 			if err := m.Bouncers[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName("bouncers" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName("bouncers" + "." + strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
@@ -157,11 +170,15 @@ func (m *MetricsRequest) contextValidateMachines(ctx context.Context, formats st
 			}
 
 			if err := m.Machines[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
+				ve := new(errors.Validation)
+				if stderrors.As(err, &ve) {
 					return ve.ValidateName("machines" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
+				}
+				ce := new(errors.CompositeError)
+				if stderrors.As(err, &ce) {
 					return ce.ValidateName("machines" + "." + strconv.Itoa(i))
 				}
+
 				return err
 			}
 		}
diff --git a/test/bats/08_metrics_bouncer.bats b/test/bats/08_metrics_bouncer.bats
index 4d8d6c554bc..6f500df21e3 100644
--- a/test/bats/08_metrics_bouncer.bats
+++ b/test/bats/08_metrics_bouncer.bats
@@ -86,9 +86,6 @@ teardown() {
     assert_output - <<-EOT
 	validation failure list:
 	remediation_components.0.metrics.0.items in body is required
-	validation failure list:
-	remediation_components.0.metrics.0.meta.utc_now_timestamp in body is required
-	remediation_components.0.metrics.0.meta.window_size_seconds in body is required
 	EOT
 }
 
diff --git a/test/bats/08_metrics_machines.bats b/test/bats/08_metrics_machines.bats
index 072e11f9dd6..650d223e553 100644
--- a/test/bats/08_metrics_machines.bats
+++ b/test/bats/08_metrics_machines.bats
@@ -55,8 +55,6 @@ teardown() {
     assert_output - <<-EOT
 	validation failure list:
 	log_processors.0.utc_startup_timestamp in body is required
-	log_processors.0.datasources in body is required
-	log_processors.0.hub_items in body is required
 	EOT
 }