diff --git a/salt-pillar/switches/init.sls b/salt-pillar/switches/init.sls
index 1c4dfa3..745a19c 100644
--- a/salt-pillar/switches/init.sls
+++ b/salt-pillar/switches/init.sls
@@ -766,7 +766,7 @@ switches:
           - c3d2
           - bmx
       # For testing a new ap
-      ap-test:
+      ap-test1:
         mode: trunk
         ports: 4
         vlans:
@@ -774,9 +774,22 @@ switches:
           - pub
           - c3d2
           - bmx
+      # For testing a new ap
+      ap-test2:
+        mode: trunk
+        ports: 5
+        vlans:
+          - mgmt
+          - pub
+          - c3d2
+          - bmx
+      # Freifunk Mesh-on-LAN
+      bmx:
+        mode: access
+        ports: '6-7'
       c3d2:
         mode: access
-        ports: '5-20'
+        ports: '8-20'
 
     password: |
       -----BEGIN PGP MESSAGE-----