diff --git a/binaries/data/mods/public/simulation/templates/structures/han/academy.xml b/binaries/data/mods/public/simulation/templates/structures/han/academy.xml
index aae0669961..98c1444505 100644
--- a/binaries/data/mods/public/simulation/templates/structures/han/academy.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/han/academy.xml
@@ -3,9 +3,7 @@
   <BuildRestrictions>
     <Category>Academy</Category>
   </BuildRestrictions>
-  <Capturable>
-    <CapturePoints op="mul">3.0</CapturePoints>
-  </Capturable>
+  <Capturable disable=""/>
   <Cost>
     <BuildTime>200</BuildTime>
     <Resources>
@@ -22,7 +20,7 @@
     <List datatype="tokens">Minister</List>
   </GarrisonHolder>
   <Health>
-    <Max>2500</Max>
+    <Max>2000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
   </Health>
   <Identity>
@@ -62,21 +60,13 @@
       -units/{civ}/infantry_javelineer_b
       -units/{civ}/infantry_slinger_b
       -units/{civ}/infantry_archer_b
-      units/{civ}/champion_infantry_spearman
-      units/{civ}/champion_infantry_pikeman
-      units/{civ}/champion_infantry_maceman
-      units/{civ}/champion_infantry_axeman
-      units/{civ}/champion_infantry_swordsman
-      units/{civ}/champion_infantry_javelineer
-      units/{civ}/champion_infantry_slinger
-      units/{civ}/champion_infantry_archer
-      units/{civ}/champion_cavalry
-      units/{civ}/champion_cavalry_spearman
-      units/{civ}/champion_cavalry_swordsman
-      units/{civ}/champion_cavalry_javelineer
-      units/{civ}/champion_cavalry_archer
-      units/{civ}/champion_chariot
-      units/{civ}/war_dog
+      units/{civ}/champion_infantry_spearman_academy
+      units/{civ}/champion_infantry_archer_academy
+      units/{civ}/champion_cavalry_spearman_academy
+      units/{civ}/champion_cavalry_crossbowman_academy
+      units/{civ}/champion_chariot_academy
+      -units/{civ}/champion_infantry_spearman
+      -units/{civ}/champion_infantry_archer
     </Entities>
   </Trainer>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/han/stable.xml b/binaries/data/mods/public/simulation/templates/structures/han/stable.xml
index 7cb47ee1fa..c6a3ae1edb 100644
--- a/binaries/data/mods/public/simulation/templates/structures/han/stable.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/han/stable.xml
@@ -22,8 +22,10 @@
   <Trainer>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Entities datatype="tokens">
-      units/{civ}/cavalry_crossbowman_b
       -units/{civ}/champion_cavalry
+      -units/{civ}/champion_cavalry_spearman
+      -units/{civ}/champion_cavalry_archer
+      -units/{civ}/champion_cavalry_crossbowman
       -units/{civ}/champion_chariot
       -units/{civ}/war_dog
     </Entities>
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
index d0b1e36ced..ef13211134 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
@@ -63,7 +63,13 @@
       units/{civ}/cavalry_spearman_b
       units/{civ}/cavalry_javelineer_b
       units/{civ}/cavalry_archer_b
+      units/{civ}/cavalry_crossbowman_b
       units/{civ}/champion_cavalry
+      units/{civ}/champion_cavalry_spearman
+      units/{civ}/champion_cavalry_swordsman
+      units/{civ}/champion_cavalry_javelineer
+      units/{civ}/champion_cavalry_archer
+      units/{civ}/champion_cavalry_crossbowman
       units/{civ}/champion_chariot
       units/{civ}/war_dog
     </Entities>
diff --git a/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_crossbowman.xml b/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_crossbowman.xml
index e17d8d503e..ec66a91051 100644
--- a/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_crossbowman.xml
+++ b/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_crossbowman.xml
@@ -5,7 +5,7 @@
     <SpecificName>Sun Wu Trouble Freeing Forces</SpecificName>
     <SelectionGroupName>units/han/cavalry_crossbowman</SelectionGroupName>
     <Icon>units/han/champion_cavalry_crossbowman.png</Icon>
-    <RequiredTechnology>phase_city</RequiredTechnology>
+    <RequiredTechnology>unlock_champion_cavalry</RequiredTechnology>
   </Identity>
   <VisualActor>
     <Actor>units/han/cavalry_crossbowman_c_m.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_crossbowman_academy.xml b/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_crossbowman_academy.xml
new file mode 100644
index 0000000000..a04408a7f2
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_crossbowman_academy.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/han/champion_cavalry_crossbowman">
+  <Identity>
+    <RequiredTechnology>phase_city</RequiredTechnology>
+  </Identity>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_spearman.xml b/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_spearman.xml
index 437eb001bf..58a257cd92 100644
--- a/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_spearman.xml
@@ -5,7 +5,7 @@
     <SpecificName>Wu Wei Yin Cao Cao Guard</SpecificName>
     <SelectionGroupName>units/han/champion_cavalry</SelectionGroupName>
     <Icon>units/han/champion_cavalry_spearman.png</Icon>
-    <RequiredTechnology>phase_city</RequiredTechnology>
+    <RequiredTechnology>unlock_champion_cavalry</RequiredTechnology>
   </Identity>
   <VisualActor>
     <Actor>units/han/cavalry_spearman_c_m.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_spearman_academy.xml b/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_spearman_academy.xml
new file mode 100644
index 0000000000..28a792df0f
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_spearman_academy.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/han/champion_cavalry_spearman">
+  <Identity>
+    <RequiredTechnology>phase_city</RequiredTechnology>
+  </Identity>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/han/champion_chariot.xml b/binaries/data/mods/public/simulation/templates/units/han/champion_chariot.xml
index f246cbf2cf..03f95ed5ec 100644
--- a/binaries/data/mods/public/simulation/templates/units/han/champion_chariot.xml
+++ b/binaries/data/mods/public/simulation/templates/units/han/champion_chariot.xml
@@ -9,7 +9,7 @@
     <GenericName>Chinese War Chariot</GenericName>
     <SpecificName>Zhanche</SpecificName>
     <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
-    <RequiredTechnology>phase_city</RequiredTechnology>
+    <RequiredTechnology>unlock_champion_chariots</RequiredTechnology>
     <Icon>units/han/chariot.png</Icon>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/han/champion_chariot_academy.xml b/binaries/data/mods/public/simulation/templates/units/han/champion_chariot_academy.xml
new file mode 100644
index 0000000000..8be388388f
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/han/champion_chariot_academy.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/han/champion_chariot">
+  <Identity>
+    <RequiredTechnology>phase_city</RequiredTechnology>
+  </Identity>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_archer.xml b/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_archer.xml
index 111bcefecf..bda6bbe8d9 100644
--- a/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_archer.xml
@@ -6,6 +6,7 @@
     <SpecificName>Yǔ Lín</SpecificName>
     <SelectionGroupName>units/han/champion_infantry_archer</SelectionGroupName>
     <Icon>units/han/champion_infantry_archer.png</Icon>
+    <RequiredTechnology>unlock_champion_infantry</RequiredTechnology>
   </Identity>
   <VisualActor>
     <Actor>units/han/infantry_archer_c.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_archer_academy.xml b/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_archer_academy.xml
new file mode 100644
index 0000000000..602929ee3d
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_archer_academy.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/han/champion_infantry_archer">
+  <Identity>
+    <RequiredTechnology>phase_city</RequiredTechnology>
+  </Identity>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_spearman.xml b/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_spearman.xml
index 858c981bb1..26ed5ccf8d 100644
--- a/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_spearman.xml
@@ -5,6 +5,7 @@
     <GenericName>Palace Guard Spearman</GenericName>
     <SpecificName>Hǔ Bēn</SpecificName>
     <SelectionGroupName>units/han/champion_infantry_spearman</SelectionGroupName>
+    <RequiredTechnology>unlock_champion_infantry</RequiredTechnology>
     <Icon>units/han/champion_infantry_swordsman.png</Icon>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_spearman_academy.xml b/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_spearman_academy.xml
new file mode 100644
index 0000000000..858ea35b63
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_spearman_academy.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/han/champion_infantry_spearman">
+  <Identity>
+    <RequiredTechnology>phase_city</RequiredTechnology>
+  </Identity>
+</Entity>