diff --git a/resources/layouts/anti_air/HQ-7_Site.yaml b/resources/layouts/anti_air/HQ-7_Site.yaml
index 1c0f7a29..cd7597f8 100644
--- a/resources/layouts/anti_air/HQ-7_Site.yaml
+++ b/resources/layouts/anti_air/HQ-7_Site.yaml
@@ -14,8 +14,9 @@ groups:
       unit_types:
         - HQ-7_LN_SP
     - name: HQ-7 Site 2
+      optional: true
       unit_count:
         - 2
-      unit_types:
-        - Ural-375 ZU-23
+      unit_classes:
+        - Logistics
 layout_file: resources/layouts/anti_air/legacy_ground_templates.miz
diff --git a/resources/layouts/anti_air/Roland_Site.yaml b/resources/layouts/anti_air/Roland_Site.yaml
index feaf050f..43459716 100644
--- a/resources/layouts/anti_air/Roland_Site.yaml
+++ b/resources/layouts/anti_air/Roland_Site.yaml
@@ -14,8 +14,9 @@ groups:
       unit_types:
         - Roland ADS
     - name: Roland Site 2
+      optional: true
       unit_count:
         - 1
-      unit_types:
-        - M 818
+      unit_classes:
+        - Logistics
 layout_file: resources/layouts/anti_air/legacy_ground_templates.miz
diff --git a/resources/layouts/anti_air/SA-5_S-200_Site.yaml b/resources/layouts/anti_air/SA-5_S-200_Site.yaml
index 3264f5bf..6d0f4bd6 100644
--- a/resources/layouts/anti_air/SA-5_S-200_Site.yaml
+++ b/resources/layouts/anti_air/SA-5_S-200_Site.yaml
@@ -14,10 +14,11 @@ groups:
       unit_types:
         - RPC_5N62V
     - name: SA-5/S-200 Site 2
+      optional: true
       unit_count:
         - 1
-      unit_types:
-        - Ural-375
+      unit_classes:
+        - Logistics
     - name: SA-5/S-200 Site 3
       unit_count:
         - 6