diff --git a/mods/d2k/maps/atreides-02a/rules.yaml b/mods/d2k/maps/atreides-02a/rules.yaml
index dfdbd6182e..00cf4a6c89 100644
--- a/mods/d2k/maps/atreides-02a/rules.yaml
+++ b/mods/d2k/maps/atreides-02a/rules.yaml
@@ -23,9 +23,21 @@ carryall.reinforce:
 	Cargo:
 		MaxWeight: 10
 
-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-02b/rules.yaml b/mods/d2k/maps/atreides-02b/rules.yaml
index e4f1468e3f..a8b5031393 100644
--- a/mods/d2k/maps/atreides-02b/rules.yaml
+++ b/mods/d2k/maps/atreides-02b/rules.yaml
@@ -23,9 +23,21 @@ carryall.reinforce:
 	Cargo:
 		MaxWeight: 10
 
-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-02a/rules.yaml b/mods/d2k/maps/harkonnen-02a/rules.yaml
index cf2942a270..5f6e1f84a1 100644
--- a/mods/d2k/maps/harkonnen-02a/rules.yaml
+++ b/mods/d2k/maps/harkonnen-02a/rules.yaml
@@ -23,9 +23,21 @@ carryall.reinforce:
 	Cargo:
 		MaxWeight: 10
 
-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-02b/rules.yaml b/mods/d2k/maps/harkonnen-02b/rules.yaml
index 42f4d04023..2c574ab4e9 100644
--- a/mods/d2k/maps/harkonnen-02b/rules.yaml
+++ b/mods/d2k/maps/harkonnen-02b/rules.yaml
@@ -23,9 +23,21 @@ carryall.reinforce:
 	Cargo:
 		MaxWeight: 10
 
-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-02a/rules.yaml b/mods/d2k/maps/ordos-02a/rules.yaml
index a29ee83bfc..648a074dda 100644
--- a/mods/d2k/maps/ordos-02a/rules.yaml
+++ b/mods/d2k/maps/ordos-02a/rules.yaml
@@ -23,9 +23,21 @@ carryall.reinforce:
 	Cargo:
 		MaxWeight: 10
 
-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-02b/rules.yaml b/mods/d2k/maps/ordos-02b/rules.yaml
index ac0751796e..a7d986cdec 100644
--- a/mods/d2k/maps/ordos-02b/rules.yaml
+++ b/mods/d2k/maps/ordos-02b/rules.yaml
@@ -23,9 +23,21 @@ carryall.reinforce:
 	Cargo:
 		MaxWeight: 10
 
-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: