diff --git a/binaries/data/mods/public/simulation/templates/structures/athen_fortress.xml b/binaries/data/mods/public/simulation/templates/structures/athen_fortress.xml
index 7e6af50f93..40284e12ef 100644
--- a/binaries/data/mods/public/simulation/templates/structures/athen_fortress.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/athen_fortress.xml
@@ -7,20 +7,11 @@
   <Identity>
     <Civ>athen</Civ>
     <SpecificName>Epiteíkhisma</SpecificName>
-    <Tooltip>Construct Siege Engines and research technologies. Garrison Soldiers for additional arrows.</Tooltip>
+    <Tooltip>Garrison Soldiers for additional arrows.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="24.0" depth="26.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <Technologies datatype="tokens">
-      siege_attack
-      siege_armor
-      siege_cost_metal
-      siege_cost_wood
-      siege_bolt_accuracy
-    </Technologies>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/athenians/fortress.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/brit_fortress.xml b/binaries/data/mods/public/simulation/templates/structures/brit_fortress.xml
index 26397ca972..be437293b4 100644
--- a/binaries/data/mods/public/simulation/templates/structures/brit_fortress.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/brit_fortress.xml
@@ -25,12 +25,6 @@
       units/{civ}_champion_cavalry
       units/{civ}_champion_infantry
     </Entities>
-    <Technologies datatype="tokens">
-      siege_attack
-      siege_armor
-      siege_cost_metal
-      siege_cost_wood
-    </Technologies>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_fortress.xml b/binaries/data/mods/public/simulation/templates/structures/cart_fortress.xml
index d6d7cfb805..1cd3c09a6f 100644
--- a/binaries/data/mods/public/simulation/templates/structures/cart_fortress.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/cart_fortress.xml
@@ -19,13 +19,6 @@
       units/{civ}_hero_maharbal
       units/{civ}_champion_elephant
     </Entities>
-    <Technologies datatype="tokens">
-      siege_attack
-      siege_armor
-      siege_cost_metal
-      siege_cost_wood
-      siege_bolt_accuracy
-    </Technologies>
   </ProductionQueue>
   <VisualActor>
     <FoundationActor>structures/carthaginians/fndn_fortress.xml</FoundationActor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/gaul_fortress.xml b/binaries/data/mods/public/simulation/templates/structures/gaul_fortress.xml
index 350d8fe812..2f002804a7 100644
--- a/binaries/data/mods/public/simulation/templates/structures/gaul_fortress.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/gaul_fortress.xml
@@ -15,12 +15,6 @@
       units/{civ}_champion_cavalry
       units/{civ}_champion_infantry
     </Entities>
-    <Technologies datatype="tokens">
-      siege_attack
-      siege_armor
-      siege_cost_metal
-      siege_cost_wood
-    </Technologies>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
diff --git a/binaries/data/mods/public/simulation/templates/structures/iber_fortress.xml b/binaries/data/mods/public/simulation/templates/structures/iber_fortress.xml
index 26d2b1f528..0cb54bdd09 100644
--- a/binaries/data/mods/public/simulation/templates/structures/iber_fortress.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/iber_fortress.xml
@@ -25,12 +25,6 @@
       units/{civ}_champion_infantry
       units/{civ}_champion_cavalry
     </Entities>
-    <Technologies datatype="tokens">
-      siege_attack
-      siege_armor
-      siege_cost_metal
-      siege_cost_wood
-    </Technologies>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/iberians/fortress.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/mace_fortress.xml b/binaries/data/mods/public/simulation/templates/structures/mace_fortress.xml
index c10ccc204a..2ee96b8907 100644
--- a/binaries/data/mods/public/simulation/templates/structures/mace_fortress.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/mace_fortress.xml
@@ -19,12 +19,6 @@
       units/{civ}_hero_demetrius
       units/{civ}_champion_infantry_a
       units/{civ}_champion_cavalry
-      -units/{civ}_siege_ballista_packed
-      -units/{civ}_siege_scorpio_packed
-      -units/{civ}_siege_oxybeles_packed
-      -units/{civ}_siege_lithobolos_packed
-      -units/{civ}_siege_ram
-      -units/{civ}_siege_tower
     </Entities>
     <Technologies datatype="tokens">
       successors/upgrade_mace_silvershields
diff --git a/binaries/data/mods/public/simulation/templates/structures/maur_fortress.xml b/binaries/data/mods/public/simulation/templates/structures/maur_fortress.xml
index 861de60012..1cdf77a241 100644
--- a/binaries/data/mods/public/simulation/templates/structures/maur_fortress.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/maur_fortress.xml
@@ -13,12 +13,6 @@
       units/{civ}_champion_infantry
       units/{civ}_champion_maiden
       units/{civ}_champion_chariot
-      -units/{civ}_siege_ballista_packed
-      -units/{civ}_siege_scorpio_packed
-      -units/{civ}_siege_oxybeles_packed
-      -units/{civ}_siege_lithobolos_packed
-      -units/{civ}_siege_ram
-      -units/{civ}_siege_tower
     </Entities>
     <Technologies datatype="tokens">
       attack_soldiers_will
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers_fortress.xml b/binaries/data/mods/public/simulation/templates/structures/pers_fortress.xml
index 34174ebb20..c8eca992a6 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers_fortress.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/pers_fortress.xml
@@ -3,18 +3,12 @@
   <Identity>
     <Civ>pers</Civ>
     <SpecificName>Didā</SpecificName>
-    <Tooltip>Train Champions, construct Siege Engines, and research technologies. Garrison Soldiers for additional arrows.</Tooltip>
+    <Tooltip>Train Champions and research technologies. Garrison Soldiers for additional arrows.</Tooltip>
   </Identity>
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_champion_cavalry
     </Entities>
-    <Technologies datatype="tokens">
-      siege_attack
-      siege_armor
-      siege_cost_metal
-      siege_cost_wood
-    </Technologies>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/persians/fortress.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/ptol_fortress.xml b/binaries/data/mods/public/simulation/templates/structures/ptol_fortress.xml
index 61843da9b2..51f526cc30 100644
--- a/binaries/data/mods/public/simulation/templates/structures/ptol_fortress.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/ptol_fortress.xml
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>mktr-'a</SpecificName>
-    <Tooltip>Train Champions, construct Siege Engines, and research technologies. Garrison Soldiers for additional arrows.</Tooltip>
+    <Tooltip>Train Champions and research technologies. Garrison Soldiers for additional arrows.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="24.0" depth="26.0"/>
@@ -18,13 +18,6 @@
       units/{civ}_champion_cavalry
       units/{civ}_champion_elephant
     </Entities>
-    <Technologies datatype="tokens">
-      siege_attack
-      siege_armor
-      siege_cost_metal
-      siege_cost_wood
-      siege_bolt_accuracy
-    </Technologies>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/ptolemies/fortress.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/rome_fortress.xml b/binaries/data/mods/public/simulation/templates/structures/rome_fortress.xml
index 08d65d4f6f..18ea5e77c9 100644
--- a/binaries/data/mods/public/simulation/templates/structures/rome_fortress.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/rome_fortress.xml
@@ -12,13 +12,6 @@
       units/{civ}_champion_infantry
       units/{civ}_champion_cavalry
     </Entities>
-    <Technologies datatype="tokens">
-      siege_attack
-      siege_armor
-      siege_cost_metal
-      siege_cost_wood
-      siege_bolt_accuracy
-    </Technologies>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/romans/fortress.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/sele_fortress.xml b/binaries/data/mods/public/simulation/templates/structures/sele_fortress.xml
index a82cc094a0..6f6f633a93 100644
--- a/binaries/data/mods/public/simulation/templates/structures/sele_fortress.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/sele_fortress.xml
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>sele</Civ>
     <SpecificName>Phrourion</SpecificName>
-    <Tooltip>Train Champions, construct Siege Engines, and research technologies. Garrison Soldiers for additional arrows.</Tooltip>
+    <Tooltip>Train Champions and research technologies. Garrison Soldiers for additional arrows.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="24.0" depth="26.0"/>
@@ -22,10 +22,6 @@
     </Entities>
     <Technologies datatype="tokens">
       successors/pair_unlock_champions
-      siege_attack
-      siege_armor
-      siege_cost_metal
-      siege_cost_wood
       successors/special_war_horses
       successors/special_parade_of_daphne
     </Technologies>
diff --git a/binaries/data/mods/public/simulation/templates/structures/spart_fortress.xml b/binaries/data/mods/public/simulation/templates/structures/spart_fortress.xml
index e2fe7054a9..6f3344bedb 100644
--- a/binaries/data/mods/public/simulation/templates/structures/spart_fortress.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/spart_fortress.xml
@@ -7,20 +7,11 @@
   <Identity>
     <Civ>spart</Civ>
     <SpecificName>Teíkhisma</SpecificName>
-    <Tooltip>Construct Siege Engines and research technologies. Garrison Soldiers for additional arrows.</Tooltip>
+    <Tooltip>Garrison Soldiers for additional arrows.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="24.0" depth="26.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <Technologies datatype="tokens">
-      siege_attack
-      siege_armor
-      siege_cost_metal
-      siege_cost_wood
-      siege_bolt_accuracy
-    </Technologies>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/spartans/fortress.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
index 615d7497a9..10c4c2890d 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
@@ -74,7 +74,7 @@
     <VisibleClasses datatype="tokens">City</VisibleClasses>
     <Icon>structures/fortress.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
-    <Tooltip>Train Heroes and Champions, construct Siege Engines, and research technologies. Garrison Soldiers for additional arrows.</Tooltip>
+    <Tooltip>Train Heroes and Champions and research technologies. Garrison Soldiers for additional arrows.</Tooltip>
   </Identity>
   <Loot>
     <xp>100</xp>
@@ -86,15 +86,6 @@
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
-    <Entities datatype="tokens">
-      units/{civ}_siege_ballista_packed
-      units/{civ}_siege_scorpio_packed
-      units/{civ}_siege_oxybeles_packed
-      units/{civ}_siege_lithobolos_packed
-      units/{civ}_siege_polybolos_packed
-      units/{civ}_siege_ram
-      units/{civ}_siege_tower
-    </Entities>
     <Technologies datatype="tokens">
       attack_soldiers_will
     </Technologies>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
index d308f0390a..6cd72bee4e 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
@@ -40,6 +40,7 @@
       structures/{civ}_defense_tower
       structures/{civ}_wallset_stone
       structures/{civ}_civil_centre
+      structures/{civ}_workshop
       structures/{civ}_fortress
       structures/{civ}_wonder
     </Entities>