diff --git a/OpenRA.Mods.RA/GainsExperience.cs b/OpenRA.Mods.RA/GainsExperience.cs
index 7d0fdd6ea1..92f1e34aae 100644
--- a/OpenRA.Mods.RA/GainsExperience.cs
+++ b/OpenRA.Mods.RA/GainsExperience.cs
@@ -46,7 +46,7 @@ namespace OpenRA.Mods.RA
 					{ 200, new[] { "firepower", "damage", "speed", "reload", "inaccuracy" } },
 					{ 400, new[] { "firepower", "damage", "speed", "reload", "inaccuracy" } },
 					{ 800, new[] { "firepower", "damage", "speed", "reload", "inaccuracy" } },
-					{ 1600, new[] { "firepower", "damage", "speed", "reload", "inaccuracy" } }
+					{ 1600, new[] { "firepower", "damage", "speed", "reload", "inaccuracy", "selfheal" } }
 				};
 			}
 
diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml
index 4c95ed6a63..977088e953 100644
--- a/mods/cnc/rules/defaults.yaml
+++ b/mods/cnc/rules/defaults.yaml
@@ -42,6 +42,12 @@
 	LuaScriptEvents:
 	ScriptTriggers:
 	GainsStatUpgrades:
+	SelfHealing@ELITE:
+		Step: 2
+		Ticks: 100
+		HealIfBelow: 1
+		DamageCooldown: 125
+		RequiresUpgrade: selfheal
 
 ^Tank:
 	AppearsOnRadar:
@@ -90,6 +96,12 @@
 	LuaScriptEvents:
 	ScriptTriggers:
 	GainsStatUpgrades:
+	SelfHealing@ELITE:
+		Step: 2
+		Ticks: 100
+		HealIfBelow: 1
+		DamageCooldown: 125
+		RequiresUpgrade: selfheal
 
 ^Helicopter:
 	AppearsOnRadar:
@@ -122,6 +134,12 @@
 	LuaScriptEvents:
 	ScriptTriggers:
 	GainsStatUpgrades:
+	SelfHealing@ELITE:
+		Step: 2
+		Ticks: 100
+		HealIfBelow: 1
+		DamageCooldown: 125
+		RequiresUpgrade: selfheal
 
 ^Infantry:
 	AppearsOnRadar:
@@ -172,7 +190,7 @@
 	Guard:
 	Guardable:
 	BodyOrientation:
-	SelfHealing:
+	SelfHealing@HOSPITAL:
 		Step: 5
 		Ticks: 100
 		HealIfBelow: 1
@@ -196,6 +214,12 @@
 		DeathSound: Poisoned
 		DeathTypes: 6
 	GainsStatUpgrades:
+	SelfHealing@ELITE:
+		Step: 2
+		Ticks: 100
+		HealIfBelow: 1
+		DamageCooldown: 125
+		RequiresUpgrade: selfheal
 
 ^CivInfantry:
 	Inherits: ^Infantry
@@ -296,6 +320,12 @@
 	LuaScriptEvents:
 	ScriptTriggers:
 	GainsStatUpgrades:
+	SelfHealing@ELITE:
+		Step: 2
+		Ticks: 100
+		HealIfBelow: 1
+		DamageCooldown: 125
+		RequiresUpgrade: selfheal
 
 ^Ship:
 	AppearsOnRadar:
@@ -323,6 +353,12 @@
 	LuaScriptEvents:
 	ScriptTriggers:
 	GainsStatUpgrades:
+	SelfHealing@ELITE:
+		Step: 2
+		Ticks: 100
+		HealIfBelow: 1
+		DamageCooldown: 125
+		RequiresUpgrade: selfheal
 
 ^Building:
 	AppearsOnRadar:
diff --git a/mods/d2k/rules/defaults.yaml b/mods/d2k/rules/defaults.yaml
index cb8c86655b..eda438f6c8 100644
--- a/mods/d2k/rules/defaults.yaml
+++ b/mods/d2k/rules/defaults.yaml
@@ -40,6 +40,12 @@
 	Demolishable:
 	ScriptTriggers:
 	GainsStatUpgrades:
+	SelfHealing@ELITE:
+		Step: 2
+		Ticks: 100
+		HealIfBelow: 1
+		DamageCooldown: 125
+		RequiresUpgrade: selfheal
 
 ^Tank:
 	AppearsOnRadar:
@@ -83,6 +89,12 @@
 	Demolishable:
 	ScriptTriggers:
 	GainsStatUpgrades:
+	SelfHealing@ELITE:
+		Step: 2
+		Ticks: 100
+		HealIfBelow: 1
+		DamageCooldown: 125
+		RequiresUpgrade: selfheal
 
 ^Husk:
 	Health:
@@ -203,6 +215,12 @@
 	Parachutable:
 		FallRate: 130
 	GainsStatUpgrades:
+	SelfHealing@ELITE:
+		Step: 2
+		Ticks: 100
+		HealIfBelow: 1
+		DamageCooldown: 125
+		RequiresUpgrade: selfheal
 
 ^Plane:
 	AppearsOnRadar:
@@ -229,6 +247,12 @@
 	LuaScriptEvents:
 	ScriptTriggers:
 	GainsStatUpgrades:
+	SelfHealing@ELITE:
+		Step: 2
+		Ticks: 100
+		HealIfBelow: 1
+		DamageCooldown: 125
+		RequiresUpgrade: selfheal
 
 ^Helicopter:
 	Inherits: ^Plane
diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml
index af8fe35eab..906464ffa3 100644
--- a/mods/ra/rules/defaults.yaml
+++ b/mods/ra/rules/defaults.yaml
@@ -55,6 +55,12 @@
 		Notification: UnitStolen
 	ScriptTriggers:
 	GainsStatUpgrades:
+	SelfHealing@ELITE:
+		Step: 2
+		Ticks: 100
+		HealIfBelow: 1
+		DamageCooldown: 125
+		RequiresUpgrade: selfheal
 
 ^Tank:
 	AppearsOnRadar:
@@ -113,6 +119,12 @@
 		Notification: UnitStolen
 	ScriptTriggers:
 	GainsStatUpgrades:
+	SelfHealing@ELITE:
+		Step: 2
+		Ticks: 100
+		HealIfBelow: 1
+		DamageCooldown: 125
+		RequiresUpgrade: selfheal
 
 ^Infantry:
 	AppearsOnRadar:
@@ -161,7 +173,7 @@
 	Guard:
 	Guardable:
 	BodyOrientation:
-	SelfHealing:
+	SelfHealing@HOSPITAL:
 		Step: 5
 		Ticks: 100
 		HealIfBelow: 1
@@ -191,6 +203,12 @@
 	Cloneable:
 		Types: Infantry
 	GainsStatUpgrades:
+	SelfHealing@ELITE:
+		Step: 2
+		Ticks: 100
+		HealIfBelow: 1
+		DamageCooldown: 125
+		RequiresUpgrade: selfheal
 
 ^Ship:
 	AppearsOnRadar:
@@ -225,6 +243,12 @@
 	LuaScriptEvents:
 	ScriptTriggers:
 	GainsStatUpgrades:
+	SelfHealing@ELITE:
+		Step: 2
+		Ticks: 100
+		HealIfBelow: 1
+		DamageCooldown: 125
+		RequiresUpgrade: selfheal
 
 ^Plane:
 	AppearsOnRadar:
@@ -262,6 +286,12 @@
 	LuaScriptEvents:
 	ScriptTriggers:
 	GainsStatUpgrades:
+	SelfHealing@ELITE:
+		Step: 2
+		Ticks: 100
+		HealIfBelow: 1
+		DamageCooldown: 125
+		RequiresUpgrade: selfheal
 
 ^Helicopter:
 	Inherits: ^Plane
diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml
index 7f8835df0d..0ae54f741d 100644
--- a/mods/ts/rules/defaults.yaml
+++ b/mods/ts/rules/defaults.yaml
@@ -118,12 +118,18 @@
 		ChevronPalette: ra
 		Upgrades:
 			500: firepower, damage, speed, reload
-			1000: firepower, damage, speed, reload
+			1000: firepower, damage, speed, reload, selfheal
 	GainsStatUpgrades:
 		FirepowerModifier: 110, 130
 		DamageModifier: 83, 66
 		SpeedModifier: 120, 150
 		ReloadModifier: 90, 75
+	SelfHealing@ELITE:
+		Step: 2
+		Ticks: 100
+		HealIfBelow: 1
+		DamageCooldown: 125
+		RequiresUpgrade: selfheal
 	GivesExperience:
 	DrawLineToTarget:
 	ActorLostNotification:
@@ -207,12 +213,18 @@
 		ChevronPalette: ra
 		Upgrades:
 			500: firepower, damage, speed, reload
-			1000: firepower, damage, speed, reload
+			1000: firepower, damage, speed, reload, selfheal
 	GainsStatUpgrades:
 		FirepowerModifier: 110, 130
 		DamageModifier: 83, 66
 		SpeedModifier: 120, 150
 		ReloadModifier: 90, 75
+	SelfHealing@ELITE:
+		Step: 2
+		Ticks: 100
+		HealIfBelow: 1
+		DamageCooldown: 125
+		RequiresUpgrade: selfheal
 	GivesExperience:
 	DrawLineToTarget:
 	ActorLostNotification:
@@ -260,12 +272,18 @@
 		ChevronPalette: ra
 		Upgrades:
 			500: firepower, damage, speed, reload
-			1000: firepower, damage, speed, reload
+			1000: firepower, damage, speed, reload, selfheal
 	GainsStatUpgrades:
 		FirepowerModifier: 110, 130
 		DamageModifier: 83, 66
 		SpeedModifier: 120, 150
 		ReloadModifier: 90, 75
+	SelfHealing@ELITE:
+		Step: 2
+		Ticks: 100
+		HealIfBelow: 1
+		DamageCooldown: 125
+		RequiresUpgrade: selfheal
 	GivesExperience:
 	DrawLineToTarget:
 	ActorLostNotification:
@@ -307,12 +325,18 @@
 		ChevronPalette: ra
 		Upgrades:
 			500: firepower, damage, speed, reload
-			1000: firepower, damage, speed, reload
+			1000: firepower, damage, speed, reload, selfheal
 	GainsStatUpgrades:
 		FirepowerModifier: 110, 130
 		DamageModifier: 83, 66
 		SpeedModifier: 120, 150
 		ReloadModifier: 90, 75
+	SelfHealing@ELITE:
+		Step: 2
+		Ticks: 100
+		HealIfBelow: 1
+		DamageCooldown: 125
+		RequiresUpgrade: selfheal
 	GivesExperience:
 	DrawLineToTarget:
 	ActorLostNotification: