diff --git a/salt-pillar/cpe/aps.sls b/salt-pillar/cpe/aps.sls
index 90286fa..3343523 100644
--- a/salt-pillar/cpe/aps.sls
+++ b/salt-pillar/cpe/aps.sls
@@ -783,7 +783,7 @@ cpe:
       -----END PGP MESSAGE-----
     model: Ubnt-UniFi-AP-AC-LR
     version: release
-    location: "Foyer (DS19)"
+    location: "Foyer (DS20)"
     radios:
       'platform/qca956x_wmac':
         channel: 1
diff --git a/salt-pillar/switches/init.sls b/salt-pillar/switches/init.sls
index 29a2395..8136ca9 100644
--- a/salt-pillar/switches/init.sls
+++ b/salt-pillar/switches/init.sls
@@ -418,7 +418,7 @@ switches:
           - GigabitEthernet 1/0/11
           - GigabitEthernet 1/0/20
           - GigabitEthernet 1/0/24
-      ap21:
+      ap18:
         mode: trunk
         ports:
           - GigabitEthernet 1/0/18
@@ -634,10 +634,16 @@ switches:
       iso6:
         mode: access
         ports: '14'
-      priv25:
-        mode: access
+      ap21:
+        mode: trunk
         # Saal A Foyer
         ports: '20'
+        vlans:
+          - mgmt
+          - pub
+          - c3d2
+          - priv25
+          - iso4
       # Saal A Buehne
       switch-a1:
         mode: bond