diff --git a/binaries/data/mods/public/simulation/templates/structures/athen_stable.xml b/binaries/data/mods/public/simulation/templates/structures/athen_stable.xml
index b50c6ea98a..cc550e5e15 100644
--- a/binaries/data/mods/public/simulation/templates/structures/athen_stable.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/athen_stable.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_stables">
+<Entity parent="template_structure_military_stable">
   <Footprint>
     <Square width="25.0" depth="25.0"/>
     <Height>12.0</Height>
   </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
-  </Health>
   <Identity>
     <Civ>athen</Civ>
-    <SpecificName>Stratēgeîon</SpecificName>
+    <SpecificName>Hippṓn</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="23.0" depth="23.0"/>
diff --git a/binaries/data/mods/public/simulation/templates/structures/brit_stable.xml b/binaries/data/mods/public/simulation/templates/structures/brit_stable.xml
index 3860b96db4..f5d24da613 100644
--- a/binaries/data/mods/public/simulation/templates/structures/brit_stable.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/brit_stable.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_stables">
+<Entity parent="template_structure_military_stable">
   <Footprint>
     <Square width="25.0" depth="25.0"/>
     <Height>12.0</Height>
   </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
-  </Health>
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Eposton</SpecificName>
diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_stable.xml b/binaries/data/mods/public/simulation/templates/structures/cart_stable.xml
index e68fe66fa0..aa39a6fc72 100644
--- a/binaries/data/mods/public/simulation/templates/structures/cart_stable.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/cart_stable.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_stables">
+<Entity parent="template_structure_military_stable">
   <Footprint>
     <Square width="25.0" depth="25.0"/>
     <Height>12.0</Height>
   </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
-  </Health>
   <Identity>
     <Civ>cart</Civ>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/gaul_stable.xml b/binaries/data/mods/public/simulation/templates/structures/gaul_stable.xml
index 4f2703090e..acdb9938d8 100644
--- a/binaries/data/mods/public/simulation/templates/structures/gaul_stable.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/gaul_stable.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_stables">
+<Entity parent="template_structure_military_stable">
   <Footprint>
     <Square width="25.0" depth="25.0"/>
     <Height>12.0</Height>
   </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
-  </Health>
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Eposton</SpecificName>
diff --git a/binaries/data/mods/public/simulation/templates/structures/iber_stable.xml b/binaries/data/mods/public/simulation/templates/structures/iber_stable.xml
index 52341430c3..36d845862a 100644
--- a/binaries/data/mods/public/simulation/templates/structures/iber_stable.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/iber_stable.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_stables">
+<Entity parent="template_structure_military_stable">
   <Footprint>
     <Square width="25.0" depth="25.0"/>
     <Height>12.0</Height>
   </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
-  </Health>
   <Identity>
     <Civ>iber</Civ>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/kush_stable.xml b/binaries/data/mods/public/simulation/templates/structures/kush_stable.xml
index ad2cc205ed..16b2feeb2f 100644
--- a/binaries/data/mods/public/simulation/templates/structures/kush_stable.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/kush_stable.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_stables">
+<Entity parent="template_structure_military_stable">
   <Footprint>
     <Square width="24.0" depth="26.0"/>
     <Height>10.0</Height>
@@ -7,22 +7,12 @@
   <Identity>
     <Civ>kush</Civ>
     <SpecificName>Ỉḥ Ssmt</SpecificName>
-    <Icon>structures/pers_stable.png</Icon>
   </Identity>
   <Obstruction>
     <Static width="20.0" depth="22.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{civ}_cavalry_javelinist_b
-      -units/{civ}_infantry_javelinist_b
-      -units/{civ}_infantry_slinger_b
-      -units/{civ}_infantry_archer_b
-    </Entities>
-    <Technologies datatype="tokens">
-    </Technologies>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/kushites/stable.xml</Actor>
+    <FoundationActor>structures/fndn_6x7.xml</FoundationActor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/mace_stable.xml b/binaries/data/mods/public/simulation/templates/structures/mace_stable.xml
index b720489fa5..9e01ae20b9 100644
--- a/binaries/data/mods/public/simulation/templates/structures/mace_stable.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/mace_stable.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_stables">
+<Entity parent="template_structure_military_stable">
   <Footprint>
     <Square width="25.0" depth="25.0"/>
     <Height>12.0</Height>
   </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
-  </Health>
   <Identity>
     <Civ>mace</Civ>
-    <SpecificName>Stratēgeîon</SpecificName>
+    <SpecificName>Hippṓn</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="23.0" depth="23.0"/>
diff --git a/binaries/data/mods/public/simulation/templates/structures/maur_stable.xml b/binaries/data/mods/public/simulation/templates/structures/maur_stable.xml
index 54fc7c6303..2b2cbba000 100644
--- a/binaries/data/mods/public/simulation/templates/structures/maur_stable.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/maur_stable.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_stables">
+<Entity parent="template_structure_military_stable">
   <Footprint>
     <Square width="25.0" depth="25.0"/>
     <Height>12.0</Height>
   </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
-  </Health>
   <Identity>
     <Civ>maur</Civ>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers_stable.xml b/binaries/data/mods/public/simulation/templates/structures/pers_stable.xml
index 1839593294..f0d2efa8fe 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers_stable.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/pers_stable.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks">
+<Entity parent="template_structure_military_stable">
   <Cost>
     <Resources>
       <wood>0</wood>
@@ -10,42 +10,13 @@
     <Square width="22.0" depth="20.0"/>
     <Height>5.0</Height>
   </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_4x4</SpawnEntityOnDeath>
-  </Health>
   <Identity>
     <Civ>pers</Civ>
-    <GenericName>Cavalry Stables</GenericName>
     <SpecificName>Paraspa</SpecificName>
-    <VisibleClasses datatype="tokens">-Barracks Stables</VisibleClasses>
-    <Tooltip>Train citizen-cavalry units.</Tooltip>
-    <Icon>structures/pers_stable.png</Icon>
   </Identity>
   <Obstruction>
     <Static width="18.0" depth="16.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      -units/{civ}_infantry_spearman_b
-      -units/{civ}_infantry_pikeman_b
-      -units/{civ}_infantry_swordsman_b
-      -units/{civ}_infantry_javelinist_b
-      -units/{civ}_infantry_slinger_b
-      -units/{civ}_infantry_archer_b
-    </Entities>
-    <Technologies datatype="tokens">
-      -training_conscription
-      persians/training_levy_cavalry
-      persians/training_conscription_cavalry
-      successors/special_war_horses
-    </Technologies>
-  </ProductionQueue>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/building/sel_cavalry_stables.xml</select>
-      <constructed>interface/complete/building/complete_cavalry_stables.xml</constructed>
-    </SoundGroups>
-  </Sound>
   <VisualActor>
     <Actor>structures/persians/stable.xml</Actor>
     <FoundationActor>structures/fndn_6x5.xml</FoundationActor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/ptol_stable.xml b/binaries/data/mods/public/simulation/templates/structures/ptol_stable.xml
index 4717e976bc..c71e6fe00f 100644
--- a/binaries/data/mods/public/simulation/templates/structures/ptol_stable.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/ptol_stable.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_stables">
+<Entity parent="template_structure_military_stable">
   <Footprint>
     <Square width="25.0" depth="25.0"/>
     <Height>12.0</Height>
   </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
-  </Health>
   <Identity>
     <Civ>ptol</Civ>
+    <SpecificName>Hippṓn</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="23.0" depth="23.0"/>
diff --git a/binaries/data/mods/public/simulation/templates/structures/rome_stable.xml b/binaries/data/mods/public/simulation/templates/structures/rome_stable.xml
index d5f2fab94a..8fb021ef13 100644
--- a/binaries/data/mods/public/simulation/templates/structures/rome_stable.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/rome_stable.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_stables">
+<Entity parent="template_structure_military_stable">
   <Footprint>
     <Square width="25.0" depth="25.0"/>
     <Height>12.0</Height>
   </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
-  </Health>
   <Identity>
     <Civ>rome</Civ>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/sele_stable.xml b/binaries/data/mods/public/simulation/templates/structures/sele_stable.xml
index 9e56caa5ee..0eafd8ddc8 100644
--- a/binaries/data/mods/public/simulation/templates/structures/sele_stable.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/sele_stable.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_stables">
+<Entity parent="template_structure_military_stable">
   <Footprint>
     <Square width="25.0" depth="25.0"/>
     <Height>12.0</Height>
   </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
-  </Health>
   <Identity>
     <Civ>sele</Civ>
+    <SpecificName>Hippṓn</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="20.0" depth="20.0"/>
diff --git a/binaries/data/mods/public/simulation/templates/structures/spart_stable.xml b/binaries/data/mods/public/simulation/templates/structures/spart_stable.xml
index e7b250deef..5d174764c0 100644
--- a/binaries/data/mods/public/simulation/templates/structures/spart_stable.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/spart_stable.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_stables">
+<Entity parent="template_structure_military_stable">
   <Footprint>
     <Square width="25.0" depth="25.0"/>
     <Height>12.0</Height>
   </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
-  </Health>
   <Identity>
     <Civ>spart</Civ>
-    <SpecificName>Stratēgeîon</SpecificName>
+    <SpecificName>Hippṓn</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="20.0" depth="20.0"/>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_barracks_stables.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_barracks_stables.xml
deleted file mode 100644
index 3bfe6bb24d..0000000000
--- a/binaries/data/mods/public/simulation/templates/template_structure_military_barracks_stables.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks">
-  <GarrisonHolder>
-    <List datatype="tokens">-Infantry</List>
-  </GarrisonHolder>
-  <Identity>
-    <GenericName>Stables</GenericName>
-    <Tooltip>Train citizen-soldier cavalry. Research training improvements.</Tooltip>
-    <Icon>structures/barracks.png</Icon>
-    <Classes datatype="tokens">Stables</Classes>
-  </Identity>
-  <ProductionQueue>
-    <BatchTimeModifier>0.8</BatchTimeModifier>
-    <Entities datatype="tokens">
-      -units/{civ}_infantry_spearman_b
-      -units/{civ}_infantry_pikeman_b
-      -units/{civ}_infantry_swordsman_b
-      units/{civ}_cavalry_swordsman_b
-      units/{civ}_cavalry_spearman_b
-      units/{civ}_cavalry_javelinist_b
-      units/{civ}_cavalry_archer_b
-    </Entities>
-  </ProductionQueue>
-</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
new file mode 100644
index 0000000000..dc1b120b9f
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_military">
+  <Cost>
+    <BuildTime>150</BuildTime>
+    <Resources>
+      <wood>300</wood>
+    </Resources>
+  </Cost>
+  <Footprint>
+    <Square width="25.0" depth="25.0"/>
+    <Height>12.0</Height>
+  </Footprint>
+  <GarrisonHolder>
+    <Max>10</Max>
+    <List datatype="tokens">Cavalry</List>
+  </GarrisonHolder>
+  <Health>
+    <Max>2000</Max>
+    <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
+  </Health>
+  <Identity>
+    <GenericName>Stable</GenericName>
+    <Icon>structures/pers_stable.png</Icon>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+    <Tooltip>Train citizen-soldier cavalry. Research training improvements.</Tooltip>
+    <VisibleClasses datatype="tokens">Village Stables</VisibleClasses>
+  </Identity>
+  <Loot>
+    <wood>30</wood>
+    <stone>0</stone>
+  </Loot>
+  <Obstruction>
+    <Static width="20.0" depth="20.0"/>
+  </Obstruction>
+  <ProductionQueue>
+    <BatchTimeModifier>0.8</BatchTimeModifier>
+    <Entities datatype="tokens">
+      units/{civ}_cavalry_swordsman_b
+      units/{civ}_cavalry_spearman_b
+      units/{civ}_cavalry_javelinist_b
+      units/{civ}_cavalry_archer_b
+    </Entities>
+    <Technologies datatype="tokens">
+      heal_barracks
+      persians/training_levy_cavalry
+      persians/training_conscription_cavalry
+      successors/special_war_horses
+    </Technologies>
+  </ProductionQueue>
+  <Sound>
+    <SoundGroups>
+      <select>interface/select/building/sel_cavalry_stables.xml</select>
+      <constructed>interface/complete/building/complete_cavalry_stables.xml</constructed>
+    </SoundGroups>
+  </Sound>
+  <Vision>
+    <Range>32</Range>
+  </Vision>
+</Entity>