diff --git a/binaries/data/mods/public/simulation/data/technologies/heal_barracks.json b/binaries/data/mods/public/simulation/data/technologies/garrison_heal.json
similarity index 69%
rename from binaries/data/mods/public/simulation/data/technologies/heal_barracks.json
rename to binaries/data/mods/public/simulation/data/technologies/garrison_heal.json
index 75482e3f87..9513ac42c5 100644
--- a/binaries/data/mods/public/simulation/data/technologies/heal_barracks.json
+++ b/binaries/data/mods/public/simulation/data/technologies/garrison_heal.json
@@ -1,15 +1,15 @@
 {
 	"genericName": "Living Conditions",
-	"description": "Units garrisoned in Barracks heal over time.",
+	"description": "Units regain health over time while garrisoned.",
 	"cost": { "food": 500, "wood": 0, "stone": 0, "metal": 250 },
 	"requirements": { "tech": "phase_town" },
 	"requirementsTooltip": "Unlocked in Town Phase.",
 	"icon": "bandage.png",
 	"researchTime": 40,
-	"tooltip": "Units gain health over time while garrisoned in Barracks.",
+	"tooltip": "Structures +1 garrison heal rate.",
 	"modifications": [
 		{ "value": "GarrisonHolder/BuffHeal", "add": 1 }
 	],
-	"affects": ["Barracks"],
+	"affects": ["Structure !Outpost !Wall"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
diff --git a/binaries/data/mods/public/simulation/data/technologies/heal_temple.json b/binaries/data/mods/public/simulation/data/technologies/heal_temple.json
deleted file mode 100644
index 5536398155..0000000000
--- a/binaries/data/mods/public/simulation/data/technologies/heal_temple.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"genericName": "Divine Offerings",
-	"specificName": {
-		"athen": "Eleusian Mysteries",
-		"mace": "Olympic Games",
-		"spart": "Olympic Games"
-	},
-	"description": "Units garrisoned in a temple are healed faster.",
-	"cost": { "food": 500, "wood": 0, "stone": 0, "metal": 250 },
-	"requirements": { "tech": "phase_city" },
-	"requirementsTooltip": "Unlocked in City Phase.",
-	"icon": "cauldron.png",
-	"researchTime": 40,
-	"tooltip": "Temples +50% garrisoned healing rate.",
-	"modifications": [
-		{ "value": "GarrisonHolder/BuffHeal", "multiply": 1.5 }
-	],
-	"affects": ["Temple"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
diff --git a/binaries/data/mods/public/simulation/templates/structures/rome/army_camp.xml b/binaries/data/mods/public/simulation/templates/structures/rome/army_camp.xml
index 042a42a3ca..a065508132 100644
--- a/binaries/data/mods/public/simulation/templates/structures/rome/army_camp.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/rome/army_camp.xml
@@ -61,7 +61,7 @@
     <EjectHealth>0.1</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry Cavalry Siege</List>
-    <BuffHeal>1</BuffHeal>
+    <BuffHeal>0</BuffHeal>
     <LoadingRange>6</LoadingRange>
   </GarrisonHolder>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/structures/rome/tent.xml b/binaries/data/mods/public/simulation/templates/structures/rome/tent.xml
index 13858f57aa..d395174638 100644
--- a/binaries/data/mods/public/simulation/templates/structures/rome/tent.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/rome/tent.xml
@@ -15,11 +15,6 @@
   </Footprint>
   <GarrisonHolder>
     <Max>5</Max>
-    <EjectHealth>0.1</EjectHealth>
-    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
-    <List datatype="tokens">Support Infantry</List>
-    <BuffHeal>0</BuffHeal>
-    <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>200</Max>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml b/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
index 864b69a356..28a56f4ec2 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
@@ -68,7 +68,7 @@
     <EjectHealth>0.1</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry Cavalry</List>
-    <BuffHeal>1</BuffHeal>
+    <BuffHeal>0</BuffHeal>
     <LoadingRange>1</LoadingRange>
   </GarrisonHolder>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_civic_stoa.xml b/binaries/data/mods/public/simulation/templates/template_structure_civic_stoa.xml
index da7b37285e..3ca76fb0f6 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_civic_stoa.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_civic_stoa.xml
@@ -16,7 +16,7 @@
     <EjectHealth>0.1</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry Cavalry</List>
-    <BuffHeal>1</BuffHeal>
+    <BuffHeal>0</BuffHeal>
     <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml b/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml
index 211fe9efcf..50c7de05fb 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml
@@ -52,7 +52,7 @@
       heal_range_2
       heal_rate
       heal_rate_2
-      heal_temple
+      garrison heal
       health_regen_units
     </Technologies>
   </ProductionQueue>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
index 1de4ad2da8..e3d78e1097 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
@@ -52,7 +52,6 @@
       units/{civ}/champion_maiden_barracks
     </Entities>
     <Technologies datatype="tokens">
-      heal_barracks
       persians/training_levy_infantry
       persians/training_conscription_infantry
       training_conscription
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml
index 3345d6e18f..462ceeb03e 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml
@@ -14,7 +14,6 @@
   <GarrisonHolder>
     <Max>5</Max>
     <List datatype="tokens">Elephant</List>
-    <BuffHeal>1</BuffHeal>
   </GarrisonHolder>
   <Health>
     <Max>3000</Max>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml
index c6064fcf9b..b1ff0ece1b 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml
@@ -13,7 +13,6 @@
   <GarrisonHolder>
     <Max>6</Max>
     <List datatype="tokens">Support Infantry Cavalry</List>
-    <BuffHeal>1</BuffHeal>
   </GarrisonHolder>
   <Health>
     <Max>2000</Max>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_special.xml b/binaries/data/mods/public/simulation/templates/template_structure_special.xml
index cab80e0e18..12b78fe2fc 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_special.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_special.xml
@@ -9,7 +9,7 @@
     <EjectHealth>0.1</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry Cavalry</List>
-    <BuffHeal>1</BuffHeal>
+    <BuffHeal>0</BuffHeal>
     <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>