diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_cavalry_archer.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_elephant_archer.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_cavalry_archer.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_elephant_archer.png
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_elephant.xml b/binaries/data/mods/public/simulation/templates/template_unit_elephant.xml
new file mode 100644
index 0000000000..4d5b6acc7f
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/template_unit_elephant.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit">
+  <Footprint replace="">
+    <Square width="4.5" depth="9.0"/>
+    <Height>9.0</Height>
+  </Footprint>
+  <Identity>
+    <GenericName>War Elephant</GenericName>
+    <Rank>Basic</Rank>
+    <Classes datatype="tokens">Human CitizenSoldier</Classes>
+    <VisibleClasses datatype="tokens">Citizen Soldier Elephant</VisibleClasses>
+  </Identity>
+  <Loot>
+    <xp>260</xp>
+  </Loot>
+  <Promotion>
+    <RequiredXp>150</RequiredXp>
+  </Promotion>
+  <Resistance>
+    <Entity>
+      <Damage>
+        <Hack>4</Hack>
+        <Pierce>3</Pierce>
+        <Crush>15</Crush>
+      </Damage>
+    </Entity>
+  </Resistance>
+  <Selectable>
+    <Overlay>
+      <Texture>
+        <MainTexture>128x256/ellipse.png</MainTexture>
+        <MainTextureMask>128x256/ellipse_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
+  <Sound>
+    <SoundGroups>
+      <select>actor/fauna/animal/elephant_select.xml</select>
+      <order_walk>actor/fauna/animal/elephant_order.xml</order_walk>
+      <order_attack>actor/fauna/animal/elephant_attack_order.xml</order_attack>
+      <order_gather>actor/fauna/animal/elephant_order.xml</order_gather>
+      <order_garrison>actor/fauna/animal/elephant_order.xml</order_garrison>
+      <walk>actor/mounted/movement/walk.xml</walk>
+      <run>actor/mounted/movement/walk.xml</run>
+      <death>actor/fauna/animal/elephant_death.xml</death>
+      <trained>actor/fauna/animal/elephant_trained.xml</trained>
+    </SoundGroups>
+  </Sound>
+  <StatusBars>
+    <HeightOffset>10.0</HeightOffset>
+  </StatusBars>
+  <UnitMotion>
+    <PassabilityClass>large</PassabilityClass>
+  </UnitMotion>
+  <Vision>
+    <Range>100</Range>
+  </Vision>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_elephant_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_elephant_archer.xml
new file mode 100644
index 0000000000..dc3f4c20e7
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/template_unit_elephant_archer.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_elephant">
+  <Attack>
+    <Ranged>
+      <Damage>
+        <Hack>0</Hack>
+        <Pierce>10.5</Pierce>
+        <Crush>0</Crush>
+      </Damage>
+      <MaxRange>72.0</MaxRange>
+      <MinRange>0.0</MinRange>
+      <PrepareTime>500</PrepareTime>
+      <RepeatTime>750</RepeatTime>
+      <Delay>0</Delay>
+      <Projectile>
+        <Speed>75.0</Speed>
+        <Gravity>39.81</Gravity>
+        <Spread>3.0</Spread>
+        <FriendlyFire>false</FriendlyFire>
+        <LaunchPoint y="3"/>
+      </Projectile>
+      <PreferredClasses datatype="tokens">Human</PreferredClasses>
+    </Ranged>
+  </Attack>
+  <Cost>
+    <BuildTime>20</BuildTime>
+    <Resources>
+      <food>175</food>
+      <wood>75</wood>
+    </Resources>
+  </Cost>
+  <Health>
+    <Max>200</Max>
+  </Health>
+  <Identity>
+    <GenericName>Elephant Archer</GenericName>
+    <VisibleClasses datatype="tokens">Ranged Archer</VisibleClasses>
+  </Identity>
+  <Loot>
+    <food>18</food>
+    <wood>7</wood>
+  </Loot>
+  <Sound>
+    <SoundGroups>
+      <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
+      <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
+    </SoundGroups>
+  </Sound>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml
index 5a87a5f376..0939ac414d 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml
@@ -1,73 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged_archer">
-  <Attack>
-    <Capture disable=""/>
-    <Ranged>
-      <Damage>
-        <Hack op="mul">1.5</Hack>
-        <Pierce op="mul">1.5</Pierce>
-        <Crush op="mul">1.5</Crush>
-      </Damage>
-      <RepeatTime op="mul">0.75</RepeatTime>
-    </Ranged>
-  </Attack>
-  <Cost>
-    <BuildTime>20</BuildTime>
-    <Resources>
-      <food>175</food>
-      <wood>75</wood>
-    </Resources>
-  </Cost>
-  <Footprint replace="">
-    <Square width="4.5" depth="9.0"/>
-    <Height>9.0</Height>
-  </Footprint>
-  <Health>
-    <Max op="mul">2</Max>
-  </Health>
+<Entity parent="template_unit_elephant_archer">
   <Identity>
     <Civ>maur</Civ>
-    <Classes datatype="tokens">-FastMoving</Classes>
-    <VisibleClasses datatype="tokens">-Cavalry Elephant</VisibleClasses>
     <GenericName>Elephant Archer</GenericName>
-    <Icon>units/maur_cavalry_archer.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
-    <SelectionGroupName>units/maur_elephant_archer_b</SelectionGroupName>
     <SpecificName>Vachii Gaja</SpecificName>
+    <SelectionGroupName>units/maur_elephant_archer_b</SelectionGroupName>
+    <Icon>units/maur_elephant_archer.png</Icon>
+    <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
-  <Loot>
-    <xp>260</xp>
-    <food>18</food>
-    <wood>7</wood>
-  </Loot>
   <Promotion>
     <Entity>units/maur_elephant_archer_a</Entity>
   </Promotion>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack op="add">1</Hack>
-        <Pierce op="add">2</Pierce>
-      </Damage>
-    </Entity>
-  </Resistance>
-  <ResourceGatherer disable=""/>
-  <Sound>
-    <SoundGroups>
-      <select>actor/fauna/animal/elephant_select.xml</select>
-      <order_walk>actor/fauna/animal/elephant_order.xml</order_walk>
-      <order_attack>actor/fauna/animal/elephant_attack_order.xml</order_attack>
-      <death>actor/fauna/animal/elephant_death.xml</death>
-      <trained>actor/fauna/animal/elephant_trained.xml</trained>
-    </SoundGroups>
-  </Sound>
-  <StatusBars>
-    <HeightOffset>10.0</HeightOffset>
-  </StatusBars>
-  <UnitMotion>
-    <PassabilityClass>large</PassabilityClass>
-    <WalkSpeed op="mul">0.5</WalkSpeed>
-  </UnitMotion>
   <VisualActor>
     <Actor>units/mauryas/elephantry_archer_b_m.xml</Actor>
   </VisualActor>