diff --git a/binaries/data/mods/public/simulation/templates/mixins/pirate.xml b/binaries/data/mods/public/simulation/templates/mixins/pirate.xml
new file mode 100644
index 0000000000..8bc7206d93
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/mixins/pirate.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Entity>
+  <Attack>
+    <Ranged>
+      <Bonuses>
+        <Brigandry>
+          <Classes>Trader</Classes>
+          <Multiplier>2.0</Multiplier>
+        </Brigandry>
+      </Bonuses>
+      <PreferredClasses datatype="tokens">Trader</PreferredClasses>
+    </Ranged>
+  </Attack>
+  <Cost>
+    <Population>0</Population>
+    <BuildTime>10</BuildTime>
+    <Resources>
+      <food>0</food>
+      <wood>0</wood>
+      <stone>0</stone>
+      <metal op="mul">2</metal>
+    </Resources>
+  </Cost>
+  <Health>
+    <Max op="mul">1.2</Max>
+  </Health>
+  <Identity>
+    <Civ>gaia</Civ>
+    <VisibleClasses datatype="tokens">Pirate</VisibleClasses>
+  </Identity>
+  <TrainingRestrictions>
+    <Category>Mercenary</Category>
+  </TrainingRestrictions>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pirates/ship_arrow.xml b/binaries/data/mods/public/simulation/templates/units/pirates/ship_arrow.xml
index 658c645fde..0b6092e050 100644
--- a/binaries/data/mods/public/simulation/templates/units/pirates/ship_arrow.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pirates/ship_arrow.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_warship_arrow">
+<Entity parent="pirate|template_unit_ship_warship_arrow">
+  <Footprint>
+    <Square width="12.0" depth="48.0"/>
+    <Height>8.0</Height>
+  </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
     <SpecificName>Rhodian Marauder</SpecificName>
     <Icon>units/pirates/ship_arrow.png</Icon>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pirates/ship_merchant.xml b/binaries/data/mods/public/simulation/templates/units/pirates/ship_merchant.xml
index 53ab9d306d..d313bcdecb 100644
--- a/binaries/data/mods/public/simulation/templates/units/pirates/ship_merchant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pirates/ship_merchant.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_merchant">
+<Entity parent="pirate|template_unit_ship_merchant">
+  <Attack disable=""/>
   <Footprint>
     <Square width="10.0" depth="30.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Identity>
     <SpecificName>Blockade Runner</SpecificName>
-    <Tooltip>Destroy this ship to loot its large amount of contraband.</Tooltip>
+    <GenericName>Treasure Ship</GenericName>
+    <Tooltip>Destroy this ship to loot its large amount of treasure.</Tooltip>
     <Icon>units/pirates/ship_merchant.png</Icon>
   </Identity>
   <Loot>
diff --git a/binaries/data/mods/public/simulation/templates/units/pirates/ship_scout.xml b/binaries/data/mods/public/simulation/templates/units/pirates/ship_scout.xml
index d3c524e02b..df0c27c022 100644
--- a/binaries/data/mods/public/simulation/templates/units/pirates/ship_scout.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pirates/ship_scout.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_warship_scout">
+<Entity parent="pirate|template_unit_ship_warship_scout">
   <Footprint>
     <Square width="9.0" depth="37.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
     <SpecificName>Cilician Pirate Ship</SpecificName>
     <Icon>units/pirates/ship_scout.png</Icon>
   </Identity>