diff --git a/mods/cnc/chrome/dialogs.yaml b/mods/cnc/chrome/dialogs.yaml
index 4f5f8c78ae..deefa547d7 100644
--- a/mods/cnc/chrome/dialogs.yaml
+++ b/mods/cnc/chrome/dialogs.yaml
@@ -224,12 +224,18 @@ Background@LOBBY_OPTIONS_BIN:
 			Width:230
 			Height:20
 			Text:Enable Crates
-		Checkbox@FRAGILEALLIANCES_CHECKBOX:
+		Label@STARTINGUNITS_DESC:
 			X:150
 			Y:140
-			Width:230
-			Height:20
-			Text:Allow Team Changes
+			Width:120
+			Height:25
+			Text:Starting Units:
+		DropDownButton@STARTINGUNITS_DROPDOWNBUTTON:
+			X:245
+			Y:140
+			Width:140
+			Height:25
+			Font:Bold
 		Label@DIFFICULTY_DESC:
 			X:150
 			Y:170
diff --git a/mods/cnc/maps/gdi01/map.yaml b/mods/cnc/maps/gdi01/map.yaml
index 3bc9b2f4b8..991c77c73e 100644
--- a/mods/cnc/maps/gdi01/map.yaml
+++ b/mods/cnc/maps/gdi01/map.yaml
@@ -20,6 +20,8 @@ UseAsShellmap: False
 
 Type: Campaign
 
+AllowStartUnitConfig: False
+
 Players:
 	PlayerReference@BadGuy:
 		Name: BadGuy
diff --git a/mods/cnc/maps/nod01/map.yaml b/mods/cnc/maps/nod01/map.yaml
index 5950dca237..ec171cb53b 100644
--- a/mods/cnc/maps/nod01/map.yaml
+++ b/mods/cnc/maps/nod01/map.yaml
@@ -20,6 +20,8 @@ UseAsShellmap: False
 
 Type: Campaign
 
+AllowStartUnitConfig: False
+
 Players:
 	PlayerReference@Neutral:
 		Name: Neutral
diff --git a/mods/cnc/rules/system.yaml b/mods/cnc/rules/system.yaml
index 5d1133fe79..f3dc876469 100644
--- a/mods/cnc/rules/system.yaml
+++ b/mods/cnc/rules/system.yaml
@@ -309,9 +309,50 @@ World:
 	SpawnMapActors:
 	MPStartLocations:
 	CreateMPPlayers:
-	MPStartUnits:
+	MPStartUnits@mcvonly:
+		Class: none
 		Races: gdi, nod
 		BaseActor: mcv
+	MPStartUnits@defaultgdia:
+		Races: gdi
+		BaseActor: mcv
+		SupportActors: e1,e1,e1,e1,e1,e3,e3,jeep
+	MPStartUnits@defaultgdib:
+		Races: gdi
+		BaseActor: mcv
+		SupportActors: e1,e1,e1,e1,e1,e1,e3,apc
+	MPStartUnits@defaultnoda:
+		Races: nod
+		BaseActor: mcv
+		SupportActors: e1,e1,e1,e1,e3,bggy,bike
+	MPStartUnits@defaultnodb:
+		Races: nod
+		BaseActor: mcv
+		SupportActors: e1,e1,e1,e3,e3,e3,bggy
+	MPStartUnits@defaultnodc:
+		Races: nod
+		BaseActor: mcv
+		SupportActors: e1,e1,e1,e1,e1,e1,e1,e3,bike
+	MPStartUnits@heavynoda:
+		Class: heavy
+		Races: nod
+		BaseActor: mcv
+		SupportActors: e1,e1,e1,e1,e3,e3,ltnk,ltnk,ftnk
+	MPStartUnits@heavynodb:
+		Class: heavy
+		Races: nod
+		BaseActor: mcv
+		SupportActors: e1,e1,e1,e1,e1,e3,e3,e3,ftnk,ftnk
+	MPStartUnits@heavygdia:
+		Class: heavy
+		Races: gdi
+		BaseActor: mcv
+		SupportActors: e1,e1,e1,e1,e3,e3,jeep,mtnk,mtnk
+	MPStartUnits@heavygdib:
+		Class: heavy
+		Races: gdi
+		BaseActor: mcv
+		SupportActors: e1,e1,e1,e1,e1,e2,e2,e2,e3,e3,apc,mtnk
 	SpawnMPUnits:
 	SpatialBins:
 		BinSize: 4