diff --git a/cmd/metal-api/internal/issues/issues.go b/cmd/metal-api/internal/issues/issues.go
index 0d72e27b6..9570ad8c3 100644
--- a/cmd/metal-api/internal/issues/issues.go
+++ b/cmd/metal-api/internal/issues/issues.go
@@ -111,7 +111,9 @@ func Find(c *Config) (MachineIssuesMap, error) {
 
 		ec, ok := ecs[m.ID]
 		if !ok {
-			res.add(m, toIssue(&issueNoEventContainer{}))
+			if c.includeIssue(TypeNoEventContainer) {
+				res.add(m, toIssue(&issueNoEventContainer{}))
+			}
 			continue
 		}
 
diff --git a/cmd/metal-api/internal/issues/liveliness-not-available.go b/cmd/metal-api/internal/issues/liveliness-not-available.go
index 647eb468b..dfcdc5262 100644
--- a/cmd/metal-api/internal/issues/liveliness-not-available.go
+++ b/cmd/metal-api/internal/issues/liveliness-not-available.go
@@ -15,6 +15,7 @@ func (i *issueLivelinessNotAvailable) Spec() *spec {
 		Type:        TypeLivelinessNotAvailable,
 		Severity:    SeverityMinor,
 		Description: "the machine liveliness is not available",
+		RefURL:      "https://docs.metal-stack.io/stable/installation/troubleshoot/#liveliness-not-available",
 	}
 }
 
diff --git a/cmd/metal-api/internal/issues/non-distinct-bmc-ip.go b/cmd/metal-api/internal/issues/non-distinct-bmc-ip.go
index 15ebc6077..2d2064238 100644
--- a/cmd/metal-api/internal/issues/non-distinct-bmc-ip.go
+++ b/cmd/metal-api/internal/issues/non-distinct-bmc-ip.go
@@ -19,6 +19,7 @@ type (
 func (i *issueNonDistinctBMCIP) Spec() *spec {
 	return &spec{
 		Type:        TypeNonDistinctBMCIP,
+		Severity:    SeverityMajor,
 		Description: "BMC IP address is not distinct",
 		RefURL:      "https://docs.metal-stack.io/stable/installation/troubleshoot/#bmc-no-distinct-ip",
 	}