diff --git a/salt-pillar/cpe/aps.sls b/salt-pillar/cpe/aps.sls
index cf72cd6..11f89ef 100644
--- a/salt-pillar/cpe/aps.sls
+++ b/salt-pillar/cpe/aps.sls
@@ -538,7 +538,7 @@ cpe:
       -----END PGP MESSAGE-----
     model: TL-WR841Nv8
     version: release
-    location: Turm D, D16
+    location: Turm D, 4. Etage
     lan-access: pub
     radios:
       'platform/ar934x_wmac':
diff --git a/salt-pillar/switches/init.sls b/salt-pillar/switches/init.sls
index 9839626..7019abd 100644
--- a/salt-pillar/switches/init.sls
+++ b/salt-pillar/switches/init.sls
@@ -607,11 +607,12 @@ switches:
         vlans:
           - mgmt
           - pub
-      pub:
-        mode: access
-        ports:
-          # Turm D, 4. Etage
-          - 7
+      ap12:
+        mode: trunk
+        ports: 7
+        vlans:
+          - mgmt
+          - pub
     password: |
       -----BEGIN PGP MESSAGE-----