diff --git a/mods/d2k/maps/atreides-01a/rules.yaml b/mods/d2k/maps/atreides-01a/rules.yaml
index 29fd1aea88..e62655fd52 100644
--- a/mods/d2k/maps/atreides-01a/rules.yaml
+++ b/mods/d2k/maps/atreides-01a/rules.yaml
@@ -19,9 +19,21 @@ World:
 			hard: Hard
 		Default: easy
 
-construction_yard:
-	Production:
-		Produces: Building
+upgrade.conyard:
+	Buildable:
+		Prerequisites: ~disabled
+
+upgrade.barracks:
+	Buildable:
+		Prerequisites: ~disabled
+
+upgrade.light:
+	Buildable:
+		Prerequisites: ~disabled
+
+upgrade.heavy:
+	Buildable:
+		Prerequisites: ~disabled
 
 concreteb:
 	Buildable:
diff --git a/mods/d2k/maps/atreides-01b/rules.yaml b/mods/d2k/maps/atreides-01b/rules.yaml
index b31308eca7..f30fd10f9c 100644
--- a/mods/d2k/maps/atreides-01b/rules.yaml
+++ b/mods/d2k/maps/atreides-01b/rules.yaml
@@ -19,9 +19,21 @@ World:
 			hard: Hard
 		Default: easy
 
-construction_yard:
-	Production:
-		Produces: Building
+upgrade.conyard:
+	Buildable:
+		Prerequisites: ~disabled
+
+upgrade.barracks:
+	Buildable:
+		Prerequisites: ~disabled
+
+upgrade.light:
+	Buildable:
+		Prerequisites: ~disabled
+
+upgrade.heavy:
+	Buildable:
+		Prerequisites: ~disabled
 
 concreteb:
 	Buildable:
diff --git a/mods/d2k/maps/harkonnen-01a/rules.yaml b/mods/d2k/maps/harkonnen-01a/rules.yaml
index 2d22acec06..7a7f810f1b 100644
--- a/mods/d2k/maps/harkonnen-01a/rules.yaml
+++ b/mods/d2k/maps/harkonnen-01a/rules.yaml
@@ -19,9 +19,21 @@ World:
 			hard: Hard
 		Default: easy
 
-construction_yard:
-	Production:
-		Produces: Building
+upgrade.conyard:
+	Buildable:
+		Prerequisites: ~disabled
+
+upgrade.barracks:
+	Buildable:
+		Prerequisites: ~disabled
+
+upgrade.light:
+	Buildable:
+		Prerequisites: ~disabled
+
+upgrade.heavy:
+	Buildable:
+		Prerequisites: ~disabled
 
 concreteb:
 	Buildable:
diff --git a/mods/d2k/maps/harkonnen-01b/rules.yaml b/mods/d2k/maps/harkonnen-01b/rules.yaml
index 1d110cfb33..8abfb7b504 100644
--- a/mods/d2k/maps/harkonnen-01b/rules.yaml
+++ b/mods/d2k/maps/harkonnen-01b/rules.yaml
@@ -19,9 +19,21 @@ World:
 			hard: Hard
 		Default: easy
 
-construction_yard:
-	Production:
-		Produces: Building
+upgrade.conyard:
+	Buildable:
+		Prerequisites: ~disabled
+
+upgrade.barracks:
+	Buildable:
+		Prerequisites: ~disabled
+
+upgrade.light:
+	Buildable:
+		Prerequisites: ~disabled
+
+upgrade.heavy:
+	Buildable:
+		Prerequisites: ~disabled
 
 concreteb:
 	Buildable:
diff --git a/mods/d2k/maps/ordos-01a/rules.yaml b/mods/d2k/maps/ordos-01a/rules.yaml
index 8994ccf91b..3677914353 100644
--- a/mods/d2k/maps/ordos-01a/rules.yaml
+++ b/mods/d2k/maps/ordos-01a/rules.yaml
@@ -19,9 +19,21 @@ World:
 			hard: Hard
 		Default: easy
 
-construction_yard:
-	Production:
-		Produces: Building
+upgrade.conyard:
+	Buildable:
+		Prerequisites: ~disabled
+
+upgrade.barracks:
+	Buildable:
+		Prerequisites: ~disabled
+
+upgrade.light:
+	Buildable:
+		Prerequisites: ~disabled
+
+upgrade.heavy:
+	Buildable:
+		Prerequisites: ~disabled
 
 concreteb:
 	Buildable:
diff --git a/mods/d2k/maps/ordos-01b/rules.yaml b/mods/d2k/maps/ordos-01b/rules.yaml
index 43ef9be36f..f0b43b2ce1 100644
--- a/mods/d2k/maps/ordos-01b/rules.yaml
+++ b/mods/d2k/maps/ordos-01b/rules.yaml
@@ -19,9 +19,21 @@ World:
 			hard: Hard
 		Default: easy
 
-construction_yard:
-	Production:
-		Produces: Building
+upgrade.conyard:
+	Buildable:
+		Prerequisites: ~disabled
+
+upgrade.barracks:
+	Buildable:
+		Prerequisites: ~disabled
+
+upgrade.light:
+	Buildable:
+		Prerequisites: ~disabled
+
+upgrade.heavy:
+	Buildable:
+		Prerequisites: ~disabled
 
 concreteb:
 	Buildable: