diff --git a/salt-pillar/switches/init.sls b/salt-pillar/switches/init.sls
index c4752bf..9710766 100644
--- a/salt-pillar/switches/init.sls
+++ b/salt-pillar/switches/init.sls
@@ -109,6 +109,8 @@ switches:
           - priv26
           - priv28
           - priv29
+          - priv31
+          - priv32
           - iso1
           - iso2
           - iso3
@@ -545,6 +547,8 @@ switches:
           - priv26
           - priv28
           - priv29
+          - priv31
+          - priv32
       up1:
         mode: access
         ports: '1'
@@ -595,7 +599,7 @@ switches:
           - mgmt
           - pub
           - priv25
-      # Saal A Buehne
+      # Saal A: durch dummen PoE-Switch mit Aggregation an ap44-50 + switch-a1
       switch-a1:
         mode: bond
         group: 1
@@ -603,9 +607,9 @@ switches:
         vlans:
           - mgmt
           - pub
-          - c3d2
           - priv25
-          - iso4
+          - priv31
+          - priv32
       ap19:
         mode: trunk
         ports: 17
@@ -801,35 +805,30 @@ switches:
     model: 'TL-SG3210'
     location: Saal A
     ports:
+      # ZW stage
       priv25:
         mode: access
         ports:
           - 1
           - 2
+          - 3
+          - 4
           - 5
+      # ZW office
+      priv31:
+        mode: access
+        ports:
           - 6
       switch-c1:
+        # Eigentlich gehen diese Ports durch das dumme PoE-Switch mit
+        # statisch konfigurierter Aggregation
         mode: trunk
         ports: 7,1/0/8
         vlans:
           - mgmt
           - pub
           - priv25
-          - iso4
-      ap32:
-        mode: trunk
-        ports: 3
-        vlans:
-          - mgmt
-          - pub
-          - priv25
-      ap33:
-        mode: trunk
-        ports: 4
-        vlans:
-          - mgmt
-          - pub
-          - priv25
+          - priv31
     password: |
       -----BEGIN PGP MESSAGE-----