diff --git a/binaries/data/mods/public/simulation/templates/template_unit.xml b/binaries/data/mods/public/simulation/templates/template_unit.xml
index 1749285d1c..e01bc2392c 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit.xml
@@ -41,6 +41,13 @@
     <Pierce>1.0</Pierce>
     <Crush>1.0</Crush>
   </Armour>
+  <ResourceGatherer>
+    <MaxDistance>2.0</MaxDistance>
+    <BaseSpeed>1.0</BaseSpeed>
+    <Rates>
+      <metal.treasure>10000</metal.treasure>
+    </Rates>
+  </ResourceGatherer>
   <UnitMotion>
     <FormationController>false</FormationController>
     <WalkSpeed>7.0</WalkSpeed>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml b/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
index 4ce8b9e72b..3e7ce68a7f 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
@@ -23,7 +23,6 @@
       <wood.tree>.75</wood.tree>
       <stone.rock>.75</stone.rock>
       <metal.ore>.75</metal.ore>
-      <metal.treasure>10000</metal.treasure>
     </Rates>
   </ResourceGatherer>
   <Health>
@@ -38,6 +37,15 @@
     <Pierce>1.0</Pierce>
     <Crush>5.0</Crush>
   </Armour>
+  <Attack>
+    <Melee>
+      <Hack>5.0</Hack>
+      <Pierce>0.0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>4.0</MaxRange>
+      <RepeatTime>1000</RepeatTime>
+    </Melee>
+  </Attack>
   <UnitMotion>
     <WalkSpeed>6.0</WalkSpeed>
     <Run>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_support_female_citizen.xml b/binaries/data/mods/public/simulation/templates/units/celt_support_female_citizen.xml
index e73bdef984..3381adf1bb 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_support_female_citizen.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_support_female_citizen.xml
@@ -13,10 +13,6 @@
   <Attack>
     <Melee>
       <Hack>10.0</Hack>
-      <Pierce>0.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>4.0</MaxRange>
-      <RepeatTime>1000</RepeatTime>
     </Melee>
   </Attack>
   <VisualActor>