diff --git a/binaries/data/mods/public/maps/scripts/Conquest.js b/binaries/data/mods/public/maps/scripts/Conquest.js
index 11b74db1c8..5fcef13a48 100644
--- a/binaries/data/mods/public/maps/scripts/Conquest.js
+++ b/binaries/data/mods/public/maps/scripts/Conquest.js
@@ -1,7 +1,7 @@
 {
 	let cmpTrigger = Engine.QueryInterface(SYSTEM_ENTITY, IID_Trigger);
 	cmpTrigger.ConquestAddVictoryCondition({
-		"classFilter": "ConquestCritical",
+		"classFilter": "ConquestCritical+!Foundation",
 		"defeatReason": markForTranslation("%(player)s has been defeated (lost all critical units and structures).")
 	});
 }
diff --git a/binaries/data/mods/public/simulation/components/Identity.js b/binaries/data/mods/public/simulation/components/Identity.js
index c47dfdc9bd..a5931c3b0b 100644
--- a/binaries/data/mods/public/simulation/components/Identity.js
+++ b/binaries/data/mods/public/simulation/components/Identity.js
@@ -57,7 +57,7 @@ Identity.prototype.Schema =
 		"</element>" +
 	"</optional>" +
 	"<optional>" +
-		"<element name='Classes' a:help='Optional list of space-separated classes applying to this entity. Choices include: AfricanElephant, AmunGuard, Animal, ApedemakGuard, Ashoka, Barter, CitizenSoldier, CivCentre, CivSpecific, ConquestCritical, Domestic, DropsiteFood, DropsiteMetal, DropsiteStone, DropsiteWood, FastMoving, FemaleCitizen, GarrisonFortress, Human, IndianElephant, Juggernaut, KushTrireme, MercenaryCamp, Organic, Player, PtolemyIV, SeaCreature, Spy, Structure, Unit, WallLong, WallMedium, WallShort, WallTower.'>" +
+		"<element name='Classes' a:help='Optional list of space-separated classes applying to this entity. Choices include: AfricanElephant, AmunGuard, Animal, ApedemakGuard, Ashoka, Barter, CitizenSoldier, CivCentre, CivSpecific, ConquestCritical, Domestic, DropsiteFood, DropsiteMetal, DropsiteStone, DropsiteWood, FastMoving, FemaleCitizen, Foundation, GarrisonFortress, Human, IndianElephant, Juggernaut, KushTrireme, MercenaryCamp, Organic, Player, PtolemyIV, SeaCreature, Spy, Structure, Unit, WallLong, WallMedium, WallShort, WallTower.'>" +
 			"<attribute name='datatype'>" +
 				"<value>tokens</value>" +
 			"</attribute>" +
diff --git a/binaries/data/mods/public/simulation/templates/special/filter/foundation.xml b/binaries/data/mods/public/simulation/templates/special/filter/foundation.xml
index d3bb75b454..28c1d7e65e 100644
--- a/binaries/data/mods/public/simulation/templates/special/filter/foundation.xml
+++ b/binaries/data/mods/public/simulation/templates/special/filter/foundation.xml
@@ -7,15 +7,17 @@
   <Decay merge=""/>
   <Fogging merge=""/>
   <Footprint merge=""/>
-  <!-- Add the Foundation component, to deal with the construction process -->
+  <!-- Add the Foundation component, to deal with the construction process. -->
   <Foundation replace=""/>
   <Health>
     <Initial>1</Initial>
   </Health>
-  <Identity merge=""/>
+  <Identity merge="">
+    <Classes datatype="tokens">Foundation</Classes>
+  </Identity>
   <Market merge=""/>
   <Minimap merge=""/>
-  <!-- Foundations shouldn't initially block unit movement -->
+  <!-- Foundations shouldn't initially block unit movement. -->
   <Obstruction merge="">
     <DisableBlockMovement>true</DisableBlockMovement>
     <DisableBlockPathfinding>true</DisableBlockPathfinding>
@@ -35,12 +37,12 @@
   <StatusBars merge=""/>
   <Visibility merge=""/>
   <!-- Foundations should be visible themselves in fog-of-war if their base template is,
-       but shouldn't have any vision range -->
+       but shouldn't have any vision range. -->
   <Vision merge="">
     <Range>0</Range>
     <RevealShore>false</RevealShore>
   </Vision>
-  <!-- Switch the actor to foundation mode -->
+  <!-- Switch the actor to foundation mode. -->
   <VisualActor>
     <Foundation/>
   </VisualActor>