diff --git a/mods/d2k/rules/infantry.yaml b/mods/d2k/rules/infantry.yaml
index 3f8812bc8f..4bcebb2de1 100644
--- a/mods/d2k/rules/infantry.yaml
+++ b/mods/d2k/rules/infantry.yaml
@@ -87,17 +87,17 @@ medic:
 		HP: 375
 	Mobile:
 		Speed: 42
-	AutoHeal:
 	Armament:
 		Weapon: Heal
-	AttackMedic:
 		Cursor: ability
 		OutsideRangeCursor: ability
+		TargetStances: Ally
+		ForceTargetStances: None
+	AttackFrontal:
 	WithInfantryBody:
 		AttackSequence: heal
 	Passenger:
 		PipType: Blue
-	-AutoTarget:
 	AttractsWorms:
 		Intensity: 180
 	Voiced:
diff --git a/mods/ra/rules/infantry.yaml b/mods/ra/rules/infantry.yaml
index e1ed12103b..027931bb68 100644
--- a/mods/ra/rules/infantry.yaml
+++ b/mods/ra/rules/infantry.yaml
@@ -307,13 +307,13 @@ MEDI:
 		Range: 3c0
 	Passenger:
 		PipType: Yellow
-	AutoHeal:
 	Armament:
 		Weapon: Heal
-	AttackMedic:
 		Cursor: heal
 		OutsideRangeCursor: heal
-	-AutoTarget:
+		TargetStances: Ally
+		ForceTargetStances: None
+	AttackFrontal:
 	WithInfantryBody:
 		StandSequences: stand
 		AttackSequence: heal
@@ -341,16 +341,16 @@ MECH:
 	Passenger:
 		PipType: Yellow
 		Voice: Move
-	AutoHeal:
 	Armament:
 		Weapon: Repair
-	AttackMedic:
 		Cursor: repair
 		OutsideRangeCursor: repair
+		TargetStances: Ally
+		ForceTargetStances: None
+	AttackFrontal:
 		Voice: Move
 	Captures:
 		CaptureTypes: husk
-	-AutoTarget:
 	WithInfantryBody:
 		AttackSequence: repair
 		StandSequences: stand
diff --git a/mods/ts/rules/gdi-infantry.yaml b/mods/ts/rules/gdi-infantry.yaml
index f826acc304..0ba20ac231 100644
--- a/mods/ts/rules/gdi-infantry.yaml
+++ b/mods/ts/rules/gdi-infantry.yaml
@@ -45,7 +45,9 @@ MEDIC:
 		CrushSound: squishy2.aud
 	Armament:
 		Weapon: Heal
-	AttackMedic:
+		TargetStances: Ally
+		ForceTargetStances: None
+	AttackFrontal:
 	WithInfantryBody:
 		AttackSequence: heal
 	SelfHealing:
diff --git a/mods/ts/rules/nod-vehicles.yaml b/mods/ts/rules/nod-vehicles.yaml
index f0c1e0715f..ab46e39122 100644
--- a/mods/ts/rules/nod-vehicles.yaml
+++ b/mods/ts/rules/nod-vehicles.yaml
@@ -156,9 +156,11 @@ REPAIR:
 		Range: 5c0
 	Armament:
 		Weapon: Repair
-	AttackMedic:
 		Cursor: repair
 		OutsideRangeCursor: repair
+		TargetStances: Ally
+		ForceTargetStances: None
+	AttackFrontal:
 		Voice: Attack
 
 WEED: