diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
index 3b73d9c6fb..43eea49f16 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
@@ -7,9 +7,11 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>10.0</Hack>
+      <Hack>12.0</Hack>
       <Pierce>0.0</Pierce>
+      <Crush>0.0</Crush>
       <MaxRange>8.0</MaxRange>
+      <RepeatTime>1000</RepeatTime>
 	  <Bonuses>
 		<BonusCavMelee>
 		  <Classes>Cavalry</Classes>
@@ -18,14 +20,16 @@
 	  </Bonuses>
     </Melee>
     <Charge>
-      <Hack>20.0</Hack>
+      <Hack>24.0</Hack>
       <Pierce>0.0</Pierce>
+      <Crush>0.0</Crush>
       <MaxRange>8.0</MaxRange>
+      <MinRange>0.0</MinRange>
 	  <Bonuses>
-		<BonusCharge>
+		<BonusCav>
 		  <Classes>Cavalry</Classes>
 		  <Multiplier>4.0</Multiplier>
-		</BonusCharge>
+		</BonusCav>
 	  </Bonuses>
     </Charge>
   </Attack>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
index dc6510d63d..ce779f0527 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
@@ -30,10 +30,14 @@
 		  <Multiplier>0.5</Multiplier>
 		</CamelStench>
 	  </Bonuses>
-      <PreferredClasses datatype="tokens">Organic Siege</PreferredClasses>
+      <PreferredClasses datatype="tokens">Siege</PreferredClasses>
     </Melee>
     <Charge>
       <Hack>64.0</Hack>
+      <Pierce>0.0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>5.0</MaxRange>
+      <MinRange>0.0</MinRange>
 	  <Bonuses>
 		<BonusPrimary>
 		  <Classes>Infantry Ranged</Classes>
@@ -48,6 +52,7 @@
 		  <Multiplier>0.5</Multiplier>
 		</CamelStench>
 	  </Bonuses>
+      <PreferredClasses datatype="tokens">Siege</PreferredClasses>
     </Charge>
   </Attack>
   <Identity>