Index: binaries/data/mods/public/simulation/data/technologies/archery_tradition.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/archery_tradition.json
+++ binaries/data/mods/public/simulation/data/technologies/archery_tradition.json
@@ -25,6 +25,6 @@
 		{ "value": "Cost/BuildTime", "multiply": 0.8 },
 		{ "value": "Health/Max", "multiply": 0.8 }
 	],
-	"affects": ["Archer"],
+	"affects": ["Archer !Hero"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
Index: binaries/data/mods/public/simulation/data/technologies/hellenes/spartans_agoge.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/hellenes/spartans_agoge.json
+++ binaries/data/mods/public/simulation/data/technologies/hellenes/spartans_agoge.json
@@ -11,6 +11,6 @@
 		{ "value": "Health/Max", "multiply": 1.25 },
 		{ "value": "Cost/BuildTime", "multiply": 1.1 }
 	],
-	"affects": ["Infantry Spearman"],
+	"affects": ["Infantry Spearman !Hero"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
Index: binaries/data/mods/public/simulation/data/technologies/persians/training_levy_cavalry.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/persians/training_levy_cavalry.json
+++ binaries/data/mods/public/simulation/data/technologies/persians/training_levy_cavalry.json
@@ -11,6 +11,6 @@
 		{ "value": "Cost/BuildTime", "multiply": 0.8 },
 		{ "value": "Health/Max", "multiply": 0.95 }
 	],
-	"affects": ["Cavalry"],
+	"affects": ["Cavalry !Hero"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
Index: binaries/data/mods/public/simulation/data/technologies/persians/training_levy_infantry.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/persians/training_levy_infantry.json
+++ binaries/data/mods/public/simulation/data/technologies/persians/training_levy_infantry.json
@@ -11,6 +11,6 @@
 		{ "value": "Cost/BuildTime", "multiply": 0.8 },
 		{ "value": "Health/Max", "multiply": 0.95 }
 	],
-	"affects": ["Infantry"],
+	"affects": ["Infantry !Hero"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
Index: binaries/data/mods/public/simulation/data/technologies/successors/special_war_horses.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/successors/special_war_horses.json
+++ binaries/data/mods/public/simulation/data/technologies/successors/special_war_horses.json
@@ -13,6 +13,6 @@
 	"modifications": [
 		{ "value": "Health/Max", "multiply": 1.2 }
 	],
-	"affects": ["Cavalry"],
+	"affects": ["Cavalry !Hero"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
Index: binaries/data/mods/public/simulation/data/technologies/training_levy_cavalry.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/training_levy_cavalry.json
+++ binaries/data/mods/public/simulation/data/technologies/training_levy_cavalry.json
@@ -12,6 +12,6 @@
 		{ "value": "Cost/BuildTime", "multiply": 0.8 },
 		{ "value": "Health/Max", "add": -10 }
 	],
-	"affects": ["Cavalry"],
+	"affects": ["Cavalry !Hero"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
Index: binaries/data/mods/public/simulation/data/technologies/training_levy_infantry.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/training_levy_infantry.json
+++ binaries/data/mods/public/simulation/data/technologies/training_levy_infantry.json
@@ -12,6 +12,6 @@
 		{ "value": "Cost/BuildTime", "multiply": 0.9 },
 		{ "value": "Health/Max", "add": -5 }
 	],
-	"affects": ["Infantry"],
+	"affects": ["Infantry !Hero"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
Index: binaries/data/mods/public/simulation/templates/template_unit_hero.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero.xml
@@ -25,7 +25,7 @@
     </Resources>
   </Cost>
   <Health>
-    <Max>600</Max>
+    <Max>1000</Max>
   </Health>
   <Identity>
     <Classes datatype="tokens">Human</Classes>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
@@ -17,9 +17,6 @@
     <Circle radius="2.5"/>
     <Height>5.0</Height>
   </Footprint>
-  <Health>
-    <Max>1500</Max>
-  </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Cavalry</VisibleClasses>
     <GenericName>Hero Cavalry</GenericName>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
@@ -26,9 +26,6 @@
     <Circle radius="3.0"/>
     <Height>3.0</Height>
   </Footprint>
-  <Health>
-    <Max>1500</Max>
-  </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Ranged Javelinist</VisibleClasses>
     <Formations datatype="tokens">
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
@@ -30,9 +30,6 @@
     <Circle radius="3.0"/>
     <Height>9.0</Height>
   </Footprint>
-  <Health>
-    <Max>2000</Max>
-  </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Elephant Melee</VisibleClasses>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_healer.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_healer.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_healer.xml
@@ -25,9 +25,6 @@
       <LineThickness>0.35</LineThickness>
     </RangeOverlay>
   </Heal>
-  <Health>
-    <Max>1000</Max>
-  </Health>
   <Identity>
     <VisibleClasses datatype="tokens">-Soldier Healer Support</VisibleClasses>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml
@@ -17,9 +17,6 @@
     <Circle radius="1.5"/>
     <Height>2.5</Height>
   </Footprint>
-  <Health>
-    <Max>1000</Max>
-  </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Infantry</VisibleClasses>
     <GenericName>Hero</GenericName>
Index: binaries/data/mods/public/simulation/templates/units/spart_hero_agis.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart_hero_agis.xml
+++ binaries/data/mods/public/simulation/templates/units/spart_hero_agis.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_spearman_hoplite">
-  <Health>
-    <Max>2000</Max>
-  </Health>
   <Identity>
     <Civ>spart</Civ>
     <Lang>greek</Lang>