diff --git a/ai-compliance-sdk/internal/iace/hazard_patterns_extended3.go b/ai-compliance-sdk/internal/iace/hazard_patterns_extended3.go
index e001a149..ae6f24ee 100644
--- a/ai-compliance-sdk/internal/iace/hazard_patterns_extended3.go
+++ b/ai-compliance-sdk/internal/iace/hazard_patterns_extended3.go
@@ -336,13 +336,13 @@ func GetExtendedHazardPatterns2() []HazardPattern {
 			DefaultSeverity: 3, DefaultExposure: 2,
 		},
 		{
-			ID: "HP154", NameDE: "Kollision zweier Roboter", NameEN: "Collision of two robots",
+			ID: "HP154", MachineTypes: []string{"robotics_cobot"}, NameDE: "Kollision zweier Roboter", NameEN: "Collision of two robots",
 			RequiredComponentTags: []string{"programmable", "moving_part"},
 			RequiredEnergyTags:    []string{"kinetic"},
 			GeneratedHazardCats:   []string{"mechanical_hazard"},
 			SuggestedMeasureIDs:   []string{"M082", "M103", "M106"},
 			SuggestedEvidenceIDs:  []string{"E09", "E14", "E15"},
-			Priority:              85, MachineTypes: []string{"robotics_cobot"},
+			Priority:              85,
 			ScenarioDE:      "Zwei Roboter arbeiten im ueberlappenden Arbeitsraum. Koordinationsfehler fuehrt zu Kollision.",
 			TriggerDE:       "Softwarefehler in der Koordinationslogik, Signalverzoegerung im Bussystem",
 			HarmDE:          "Wegschleudern von Teilen, Beschaedigung der Anlage, Personenverletzung",
diff --git a/ai-compliance-sdk/internal/iace/hazard_patterns_final_a.go b/ai-compliance-sdk/internal/iace/hazard_patterns_final_a.go
index 00000911..828a217b 100644
--- a/ai-compliance-sdk/internal/iace/hazard_patterns_final_a.go
+++ b/ai-compliance-sdk/internal/iace/hazard_patterns_final_a.go
@@ -814,13 +814,13 @@ func GetFinalPatternsA() []HazardPattern {
 		},
 		// === Einklemmen Haare/Kleidung (3) ===
 		{
-			ID: "HP1066", NameDE: "Haareinzug Drehmaschine", NameEN: "Hair entanglement lathe",
+			ID: "HP1066", MachineTypes: []string{"lathe", "cnc", "metalworking"}, NameDE: "Haareinzug Drehmaschine", NameEN: "Hair entanglement lathe",
 			RequiredComponentTags: []string{"rotating_part", "entanglement_risk"},
 			RequiredEnergyTags:    []string{"rotational"},
 			GeneratedHazardCats:   []string{"mechanical_hazard"},
 			SuggestedMeasureIDs:   []string{"M001", "M005", "M054", "M141"},
 			SuggestedEvidenceIDs:  []string{"E01", "E08"},
-			Priority: 80, MachineTypes: []string{"lathe", "cnc", "metalworking"}, ScenarioDE: "Lange Haare werden von Spindel erfasst",
+			Priority: 80, ScenarioDE: "Lange Haare werden von Spindel erfasst",
 			TriggerDE: "Offene Haare, fehlende Haube, Vorbeugen", HarmDE: "Skalpierung, Kopfverletzung",
 			AffectedDE: "Bedienpersonal", ZoneDE: "Spannfutter, Spindel",
 			DefaultSeverity: 5, DefaultExposure: 2,
diff --git a/ai-compliance-sdk/internal/iace/hazard_patterns_specific_machines2.go b/ai-compliance-sdk/internal/iace/hazard_patterns_specific_machines2.go
index 21446380..742fae30 100644
--- a/ai-compliance-sdk/internal/iace/hazard_patterns_specific_machines2.go
+++ b/ai-compliance-sdk/internal/iace/hazard_patterns_specific_machines2.go
@@ -39,7 +39,7 @@ func GetSpecificMachinePatterns2() []HazardPattern {
 			DefaultSeverity: 3, DefaultExposure: 4,
 		},
 		{
-			ID: "HP758", NameDE: "Sturz bei Notbremsung der Fahrtreppe", NameEN: "Fall during emergency stop of escalator",
+			ID: "HP758", MachineTypes: []string{"escalator", "elevator"}, NameDE: "Sturz bei Notbremsung der Fahrtreppe", NameEN: "Fall during emergency stop of escalator",
 			RequiredComponentTags: []string{"moving_part"},
 			RequiredEnergyTags:    []string{"kinetic"},
 			GeneratedHazardCats:   []string{"mechanical_hazard"},