diff --git a/salt-pillar/cpe/aps.sls b/salt-pillar/cpe/aps.sls
index 80d9992..c1597f5 100644
--- a/salt-pillar/cpe/aps.sls
+++ b/salt-pillar/cpe/aps.sls
@@ -195,7 +195,7 @@ cpe:
       -----END PGP MESSAGE-----
     model: TL-WR1043ND
     version: release
-    location: Dresden School of Lindy Hop
+    location: Returned
     lan-access: priv4
     radios:
       'platform/qca955x_wmac':
@@ -1782,3 +1782,66 @@ cpe:
               a0A+Ovk=
               =PUn+
               -----END PGP MESSAGE-----
+
+  ap42:
+    password: |
+      -----BEGIN PGP MESSAGE-----
+      
+      hQEMA2PKcvDMvlKLAQf+PradiB/Nuq6mHb99lZfNYbL34NshKQ5Iq4CnDXBqRAvz
+      4Y151m7T4JTRKt5mw53rC8jUDvQ0au5IDmar6W5My/Fo9aT9KNkHHFSH9qpzoGeA
+      7DA+2Tudsii1Ug+wkH6EjBOGmTq8wndLrfAQY4xW3/BVStgQIJoSyGU0h5RMz07T
+      70EAKtApfUP15jhCkkdT3e+bF0eHHrNnI1IgFvrEUexI9huYMv/Fs+zTTz73Ohjb
+      Ed2gVVIaa4heU5R3jRBfrKu8bD/8zCCCQ3DaODkQKBiBw2BJeoxUc85ZOa/wTlgq
+      ysDcPlhn6fp7zlQghUKrSWN9ehJcUeFAm92nXFWASdJIAaJlWSkGQ24ShWx1iNQ8
+      IEsZPVtlP0u2grgV1+5+Ls+X7GX5o5H0iMZmJs9p+FmGSr3s78hQdVG7oMtd5S3J
+      kpwuSSzZvXNK
+      =JLKE
+      -----END PGP MESSAGE-----
+    model: TL-Archer-C7v5
+    version: release
+    location: Dresden School of Lindy Hop
+    lan-access: priv4
+    radios:
+      'platform/qca956x_wmac':
+        channel: 11
+        htmode: HT40-
+        ssids:
+          'ZW public':
+            net: pub
+          'jam-circle.de legacy':
+            net: priv4
+            psk: |
+              -----BEGIN PGP MESSAGE-----
+              
+              hQEMA2PKcvDMvlKLAQf8CCFsqahEQIAgZEXLEVzbKpJav5cyoavCvTILJ3SXzulI
+              0oPfziWagOe5iUnM/Vc8E+tt7/X7nXT1T3vckufzd6frN/aGef8m1BgRnWf/DAzg
+              GmDKDs+GZn4bzFGtZ10+aZqjqstP677MOIX7FZXX0+hGIIcltd9Vgkqea5dZ55zz
+              40VNBzjfAvwSLLQzK3HUQGc84Vkd5M7HSEsipJ/0VGASAeYe0B4lz+LYMohW1VJC
+              zGeRQBHeUI1QxXwwKmlAxdhh8ebReCjDDLpeids2U/5Y+rHnE+WpLi/bMP/lnzbQ
+              ocOpKJcN/VaVKXlcDu6LBxwvvTNGBsMgx6QUPm9P89JIAVBvF4UaSMgSzo7iYPjg
+              YJCE4nQK2a3Fomvij6jVq/3NPaH3e8bzURB8zVeZpkV/o0k+mr3S6YVtb8Ofc96u
+              cDHLAixhmoMc
+              =A9lu
+              -----END PGP MESSAGE-----
+      'pci0000:00/0000:00:00.0':
+        channel: 128
+        htmode: HT40+
+        ssids:
+          'ZW public':
+            net: pub
+          'jam-circle.de':
+            net: priv4
+            psk: |
+              -----BEGIN PGP MESSAGE-----
+              
+              hQEMA2PKcvDMvlKLAQf8CCFsqahEQIAgZEXLEVzbKpJav5cyoavCvTILJ3SXzulI
+              0oPfziWagOe5iUnM/Vc8E+tt7/X7nXT1T3vckufzd6frN/aGef8m1BgRnWf/DAzg
+              GmDKDs+GZn4bzFGtZ10+aZqjqstP677MOIX7FZXX0+hGIIcltd9Vgkqea5dZ55zz
+              40VNBzjfAvwSLLQzK3HUQGc84Vkd5M7HSEsipJ/0VGASAeYe0B4lz+LYMohW1VJC
+              zGeRQBHeUI1QxXwwKmlAxdhh8ebReCjDDLpeids2U/5Y+rHnE+WpLi/bMP/lnzbQ
+              ocOpKJcN/VaVKXlcDu6LBxwvvTNGBsMgx6QUPm9P89JIAVBvF4UaSMgSzo7iYPjg
+              YJCE4nQK2a3Fomvij6jVq/3NPaH3e8bzURB8zVeZpkV/o0k+mr3S6YVtb8Ofc96u
+              cDHLAixhmoMc
+              =A9lu
+              -----END PGP MESSAGE-----
+
diff --git a/salt-pillar/switches/init.sls b/salt-pillar/switches/init.sls
index f3df39f..37831d7 100644
--- a/salt-pillar/switches/init.sls
+++ b/salt-pillar/switches/init.sls
@@ -338,7 +338,7 @@ switches:
         mode: access
         ports:
           - GigabitEthernet 1/0/5
-      ap4:
+      ap42:
         mode: trunk
         ports:
           - GigabitEthernet 1/0/6