diff --git a/salt-pillar/cpe/aps.sls b/salt-pillar/cpe/aps.sls
index 8524aa7..4c3a38f 100644
--- a/salt-pillar/cpe/aps.sls
+++ b/salt-pillar/cpe/aps.sls
@@ -3,7 +3,7 @@ cpe:
   ap1:
     password: |
       -----BEGIN PGP MESSAGE-----
-      
+
       hQEMA2PKcvDMvlKLAQf+KxWwNiC4VCjdkTUVRcfqzsGRXHUrfBqyoqpPahT7yu8v
       JiYAc8/zPO0oniP+tM+zCqnIq/kwUe+muh4RTPjcx7Yv4nVA4Y4bcGgbnGqACMjq
       AEZ8qiv+0yBSxqeVgwlfc/eOtyXlYELCwKM9zUnrmS+0J66zd4zKKbfT029izL0e
@@ -15,8 +15,8 @@ cpe:
       =QPF0
       -----END PGP MESSAGE-----
     model: TL-WR841N
-    location: In stock
-    lan-access: pub
+    location: leihgabe
+    lan-access: priv6
     radios:
       'platform/qca953x_wmac':
         channel: 1
@@ -24,8 +24,8 @@ cpe:
         ssids:
           'ZW public':
             net: pub
-          'C3D2 legacy':
-            net: c3d2
+          'uebergangsnetz':
+            net: priv6
             psk: |
               -----BEGIN PGP MESSAGE-----
               
@@ -40,7 +40,6 @@ cpe:
               =TEEI
               -----END PGP MESSAGE-----
 
-
   ap2:
     password: |
       -----BEGIN PGP MESSAGE-----
@@ -204,6 +203,7 @@ cpe:
               cDHLAixhmoMc
               =A9lu
               -----END PGP MESSAGE-----
+
   ap5:
     password: |
       -----BEGIN PGP MESSAGE-----
diff --git a/salt-pillar/switches/init.sls b/salt-pillar/switches/init.sls
index 7b8eb05..ec017e6 100644
--- a/salt-pillar/switches/init.sls
+++ b/salt-pillar/switches/init.sls
@@ -20,6 +20,7 @@ switches:
           - priv3
           - priv4
           - priv5
+          - priv6
       mgmt:
         mode: access
         ports:
@@ -202,6 +203,7 @@ switches:
           - priv3
           - priv4
           - priv5
+          - priv6
       mgmt:
         mode: access
         ports:
@@ -235,10 +237,17 @@ switches:
           - mgmt
           - priv5
           - pub
+      ap1:
+        mode: trunk
+        ports:
+          - GigabitEthernet 1/0/8
+        vlans:
+          - mgmt
+          - priv6
+          - pub
       pub:
         mode: access
         ports:
-          - GigabitEthernet 1/0/8
           - GigabitEthernet 1/0/9
           - GigabitEthernet 1/0/10
           - GigabitEthernet 1/0/11