diff --git a/mods/ra/maps/fort-lonestar/map.yaml b/mods/ra/maps/fort-lonestar/map.yaml
index 3dbdc3ae12..fdc907b7c1 100644
--- a/mods/ra/maps/fort-lonestar/map.yaml
+++ b/mods/ra/maps/fort-lonestar/map.yaml
@@ -538,7 +538,7 @@ Rules:
 		Health:
 			HP: 1000
 		Production:
-			Produces: Defense, Infantry, Soldier
+			Produces: Defense, Infantry, Soldier, Dog
 		-Sellable:
 		BaseProvider:
 			Range: 12
diff --git a/mods/ra/maps/training-camp/map.yaml b/mods/ra/maps/training-camp/map.yaml
index 130bb4c24d..322a7560b5 100644
--- a/mods/ra/maps/training-camp/map.yaml
+++ b/mods/ra/maps/training-camp/map.yaml
@@ -812,30 +812,26 @@ Rules:
 		-MPStartLocations:
 	Player:
 		ClassicProductionQueue@Infantry:
-			Type: Infantry
 			BuildSpeed: 1
-			LowPowerSlowdown: 3
 		ClassicProductionQueue@Vehicle:
-			Type: Vehicle
 			BuildSpeed: 1
-			LowPowerSlowdown: 3
 	OILB:
 		Health:
 			HP: 6000
 	BARR:
 		Buildable:
-			Owner: allies
+			Prerequisites: ~disabled
 		Health:
 			HP: 5000
 		Production:
-			Produces: Building,Infantry
+			Produces: Building, Infantry, Soldier, Dog
 		BaseProvider:
 			Range: 16
 		Power:
 			Amount: 0
 	WEAP:
 		Buildable:
-			Owner: allies
+			Prerequisites: ~disabled
 		Health:
 			HP: 10000
 		Valued:
@@ -847,226 +843,212 @@ Rules:
 			Amount: 0
 	SPEN:
 		Buildable:
-			Owner: allies
+			Prerequisites: ~disabled
 	DOME:
 		Buildable:
-			Owner: allies
+			Prerequisites: ~disabled
 	PROC:
 		Buildable:
-			Owner: allies
+			Prerequisites: ~disabled
 	SILO:
 		Buildable:
-			Owner: allies
+			Prerequisites: ~disabled
 	APWR:
 		Buildable:
-			Owner: allies
+			Prerequisites: ~disabled
 	STEK:
 		Buildable:
-			Owner: allies
+			Prerequisites: ~disabled
 	FIX:
 		Buildable:
-			Owner: allies
+			Prerequisites: ~disabled
 	POWR:
 		Buildable:
-			Owner: allies
+			Prerequisites: ~disabled
 	MIG:
 		Buildable:
-			Owner: soviet
-			Prerequisites: barr,afld
+			Prerequisites: afld
 		Valued:
 			Cost: 2000
 	YAK:
 		Buildable:
-			Owner: soviet
-			Prerequisites: barr,afld
+			Prerequisites: afld
 		Valued:
 			Cost: 150
 	TRAN:
 		Buildable:
-			Owner: soviet
-			Prerequisites: barr,hpad
+			Prerequisites: hpad
 		Valued:
 			Cost: 150
 	HIND:
 		Buildable:
-			Owner: soviet
-			Prerequisites: barr,hpad
+			Prerequisites: hpad
 		Valued:
 			Cost: 200
 	HELI:
 		Buildable:
-			Owner: soviet
-			Prerequisites: barr,hpad
+			Prerequisites: hpad
 		Valued:
 			Cost: 200
 	HPAD:
 		Buildable:
-			Owner: soviet
 			Prerequisites: barr
 		Valued:
 			Cost: 200
 		Power:
-			Power: 0
+			Amount: 0
 	FENC:
 		Buildable:
 			Queue: Building
-			Owner: soviet
 			Prerequisites: barr
 		Valued:
 			Cost: 10
 	AFLD:
 		Buildable:
-			Owner: soviet
 			Prerequisites: barr
 		Valued:
 			Cost: 200
 		Power:
-			Power: 0
+			Amount: 0
 	DOG:
 		Buildable:
-			Owner: soviet
-			Prerequisites: barr,oilb
+			Prerequisites: barr
 		Valued:
 			Cost: 20
 	E1:
 		Buildable:
-			Owner: soviet
-			Prerequisites: barr,oilb
+			Prerequisites: barr
 		Valued:
 			Cost: 20
 	E2:
 		Buildable:
-			Owner: soviet
-			Prerequisites: barr,oilb
+			Prerequisites: barr
 		Valued:
 			Cost: 32
 	E3:
 		Buildable:
-			Owner: soviet
-			Prerequisites: barr,oilb
+			Prerequisites: barr
 		Valued:
 			Cost: 60
 	E4:
 		Buildable:
-			Owner: soviet
-			Prerequisites: barr,oilb
+			Prerequisites: barr
 		Valued:
 			Cost: 60
 	E6:
 		Buildable:
-			Owner: soviet
 			Prerequisites: barr
 		Valued:
 			Cost: 100
 	SPY:
 		Buildable:
-			Owner: soviet
-			Prerequisites: barr,oilb
+			Prerequisites: barr
 		Valued:
 			Cost: 100
 	E7:
 		Buildable:
-			Owner: soviet
-			Prerequisites: barr,oilb
+			Prerequisites: barr
 		Valued:
 			Cost: 400
 	MEDI:
 		Buildable:
-			Owner: soviet
-			Prerequisites: barr,oilb
+			Prerequisites: barr
 		Valued:
 			Cost: 60
 	SHOK:
 		Buildable:
-			Owner: soviet
-			Prerequisites: barr,oilb
+			Prerequisites: barr
 		Valued:
 			Cost: 200
 	SNIPER:
 		Buildable:
-			Owner: soviet
-			Prerequisites: barr,oilb
+			Prerequisites: barr
 		Valued:
 			Cost: 200
+	HIJACKER:
+		Buildable:
+			Prerequisites: ~disabled
 	V2RL:
 		Buildable:
-			Owner: soviet
-			Prerequisites: barr,oilb
+			Prerequisites: weap
 		Valued:
 			Cost: 1250
 	1TNK:
 		Buildable:
-			Owner: soviet
-			Prerequisites: barr,oilb
+			Prerequisites: weap
 		Valued:
 			Cost: 125
 	2TNK:
 		Buildable:
-			Owner: soviet
-			Prerequisites: barr,oilb
+			Prerequisites: weap
 		Valued:
 			Cost: 175
 	3TNK:
 		Buildable:
-			Owner: soviet
-			Prerequisites: barr,oilb
+			Prerequisites: weap
 		Valued:
 			Cost: 250
 	4TNK:
 		Buildable:
-			Owner: soviet
-			Prerequisites: barr,oilb
+			Prerequisites: weap
 		Valued:
 			Cost: 500
 	ARTY:
 		Buildable:
-			Owner: soviet
-			Prerequisites: barr,oilb
+			Prerequisites: weap
 		Valued:
 			Cost: 1000
 	HARV:
 		Buildable:
-			Owner: allies
+			Prerequisites: ~disabled
 	MCV:
 		Buildable:
-			Owner: allies
+			Prerequisites: ~disabled
 	MNLY.AP:
 		Buildable:
-			Owner: allies
+			Prerequisites: ~disabled
 	MNLY.AT:
 		Buildable:
-			Owner: allies
+			Prerequisites: ~disabled
 	TRUK:
 		Buildable:
-			Owner: allies
+			Prerequisites: ~disabled
+	STNK:
+		Buildable:
+			Prerequisites: ~disabled
+	MRJ:
+		Buildable:
+			Prerequisites: ~disabled
+	MGG:
+		Buildable:
+			Prerequisites: ~disabled
+	CTNK:
+		Buildable:
+			Prerequisites: ~disabled
 	JEEP:
 		Buildable:
-			Owner: soviet
-			Prerequisites: barr,oilb
+			Prerequisites: weap
 		Valued:
 			Cost: 50
 	APC:
 		Buildable:
-			Owner: soviet
-			Prerequisites: barr,oilb
+			Prerequisites: weap
 		Valued:
 			Cost: 250
 	TTNK:
 		Buildable:
-			Owner: soviet
-			Prerequisites: barr,oilb
+			Prerequisites: weap
 		Valued:
 			Cost: 200
 	FTRK:
 		Buildable:
-			Owner: soviet
-			Prerequisites: barr,oilb
+			Prerequisites: weap
 		Valued:
 			Cost: 150
 	DTRK:
 		Buildable:
 			BuildPaletteOrder: 10
-			Prerequisites: barr,oilb
+			Prerequisites: weap
 		Valued:
 			Cost: 150