diff --git a/salt-pillar/cpe/aps.sls b/salt-pillar/cpe/aps.sls
index 1d37d92..80d9992 100644
--- a/salt-pillar/cpe/aps.sls
+++ b/salt-pillar/cpe/aps.sls
@@ -133,21 +133,51 @@ cpe:
 
     model: TL-WDR4300
     version: release
-    location: "Saal A Kleiner Saal (DS19)"
-    lan-access: priv25
+    location: C3D2 Keller
+    lan-access: c3d2
     radios:
       'platform/ar934x_wmac':
-        channel: 13
-        htmode: HT40-
+        channel: 1
+        htmode: HT40+
         ssids:
           'ZW public':
             net: pub
+          'C3D2 legacy':
+            net: c3d2
+            psk: |
+              -----BEGIN PGP MESSAGE-----
+              
+              hQEMA2PKcvDMvlKLAQf/SO/v+xhO1yOG83uCcAN2r5ixNf8+Ksp1dPwBKQHUViwJ
+              /KZHBAUzjTtGFIcpEy3exZcAorJ8SeGaB0hv1zw1HZuHN7Els8KKDu4G5u31Sp8w
+              EFtuwujlkFAt3t57jp02O0qvXBCIA14eNlakc9fcPypibTrIEGp2SCzw/kty4r3g
+              EGUwn1sMPjeQxon5Y4JY4OmZBXsnZkKMwTYjAbL+RS300xV1Nh/WWSTRfueAmT5f
+              xfyHj4NlOoBNBILgm1qlrOdgqJSvHM6rw47BoiDuxeVtgmyPqSbHmN8d7xExbuxB
+              tdcnI6HfSv47ZhLARH08BiI7nLaKNygwgy6yKr0zctJAAetIX8BADb4W4QgyM7VD
+              pYqAfy5Igg342W+ZSMyybiZccncchv4opsyDFTjuby9mqL8OwaMWkeNcNPALaT9v
+              rA==
+              =TEEI
+              -----END PGP MESSAGE-----
       'pci0000:00/0000:00:00.0':
         channel: 128
         htmode: HT40+
         ssids:
           'ZW public':
             net: pub
+          'C3D2':
+            net: c3d2
+            psk: |
+              -----BEGIN PGP MESSAGE-----
+              
+              hQEMA2PKcvDMvlKLAQf/SO/v+xhO1yOG83uCcAN2r5ixNf8+Ksp1dPwBKQHUViwJ
+              /KZHBAUzjTtGFIcpEy3exZcAorJ8SeGaB0hv1zw1HZuHN7Els8KKDu4G5u31Sp8w
+              EFtuwujlkFAt3t57jp02O0qvXBCIA14eNlakc9fcPypibTrIEGp2SCzw/kty4r3g
+              EGUwn1sMPjeQxon5Y4JY4OmZBXsnZkKMwTYjAbL+RS300xV1Nh/WWSTRfueAmT5f
+              xfyHj4NlOoBNBILgm1qlrOdgqJSvHM6rw47BoiDuxeVtgmyPqSbHmN8d7xExbuxB
+              tdcnI6HfSv47ZhLARH08BiI7nLaKNygwgy6yKr0zctJAAetIX8BADb4W4QgyM7VD
+              pYqAfy5Igg342W+ZSMyybiZccncchv4opsyDFTjuby9mqL8OwaMWkeNcNPALaT9v
+              rA==
+              =TEEI
+              -----END PGP MESSAGE-----
 
   ap4:
     password: |
diff --git a/salt-pillar/switches/init.sls b/salt-pillar/switches/init.sls
index f0c9b08..f3df39f 100644
--- a/salt-pillar/switches/init.sls
+++ b/salt-pillar/switches/init.sls
@@ -128,6 +128,7 @@ switches:
           - mgmt
           - core
           - pub
+          - c3d2
           - priv15
           - priv16
           - priv21
@@ -663,6 +664,7 @@ switches:
         vlans:
           - mgmt
           - pub
+          - c3d2
           - priv15
           - priv16
           - priv21
@@ -700,6 +702,13 @@ switches:
         vlans:
           - mgmt
           - pub
+      ap3:
+        mode: trunk
+        ports: 3
+        vlans:
+          - mgmt
+          - pub
+          - c3d2
     password: |
       -----BEGIN PGP MESSAGE-----