diff --git a/Rakefile b/Rakefile
index 00376d1..258e0b2 100644
--- a/Rakefile
+++ b/Rakefile
@@ -56,9 +56,8 @@ task :ap, [:name] do |t, args|
 end
 
 task :all do
-  aps = %W(ap-cf-f-l ap-cf-f-r) # Foaier
-  aps += %W(ap-cf-mr-1 ap-cf-mr-2 ap-cf-mr-3 ap-cf-mr-4) # Main room
-  aps += %W(ap-cf-sr-1 ap-cf-sr-2 ) # Small room
+  aps = %W(ap-cf-f-l ap-cf-f-r ap-cf-srv) # Foaier
+  aps += %W(ap-cf-a1 ap-cf-a2 ap-cf-b1 ap-cf-c1) # Rooms
   aps += %W(ap-cf-ch ap-cf-qws) # Chillout and quiet workshop area
  
   # Workshop floor
diff --git a/configurations.yml b/configurations.yml
index ce09a08..9b43889 100644
--- a/configurations.yml
+++ b/configurations.yml
@@ -1,22 +1,36 @@
 ---
 configurations:
   # Foaier
-  ap-cf-f-l:
-    config: archer-c5
-    ip: 10.20.0.50
+  ap-cf-srv:
+    config: archer-c7
+    ip: 10.20.0.55
     wlans:
       0:
-        bssid: 02:00:0f:20:10:00
-        channel: 108
+        bssid: 02:00:0f:20:ff:20
+        channel: 157
       1:
-        bssid: 02:00:0f:20:10:01
-        channel: 13
+        bssid: 02:00:0f:20:ff:21
+        channel: 12
     mixins:
       - all
       - archer-c5
       - archer-c5-single-trunk
+  ap-cf-f-l:
+    config: dap2965
+    ip: 10.20.0.50
+    wlans:
+      0:
+        bssid: 02:00:0f:20:10:00
+        channel: 157
+      1:
+        bssid: 02:00:0f:20:10:01
+        channel: 12
+    mixins:
+      - all
+      - dap2965
+      - dap2965-single-trunk
   ap-cf-f-r:
-    config: archer-c5
+    config: dap2965
     ip: 10.20.0.51
     wlans:
       0:
@@ -24,27 +38,27 @@ configurations:
         channel: 60
       1:
         bssid: 02:00:0f:20:10:11
-        channel: 5
-    mixins:
-      - all
-      - archer-c5
-      - archer-c5-single-trunk
-  # Main room
-  ap-cf-mr-1:
-    config: dap2965
-    ip: 10.20.0.52
-    wlans:
-      0:
-        bssid: 02:00:0f:20:20:00
-        channel: 124
-      1:
-        bssid: 02:00:0f:20:20:01
-        channel: 5
+        channel: 6
     mixins:
       - all
       - dap2965
       - dap2965-single-trunk
-  ap-cf-mr-2:
+  # Main room
+  ap-cf-a1:
+    config: linksys
+    ip: 10.20.0.52
+    wlans:
+      0:
+        bssid: 02:00:0f:20:20:00
+        channel: 157
+      1:
+        bssid: 02:00:0f:20:20:01
+        channel: 6
+    mixins:
+      - all
+      - linksys
+      - linksys-single-trunk
+  ap-cf-a2:
     config: dap2965
     ip: 10.20.0.53
     wlans:
@@ -53,47 +67,47 @@ configurations:
         channel: 44
       1:
         bssid: 02:00:0f:20:20:11
+        channel: 12
+    mixins:
+      - all
+      - dap2965
+      - dap2965-single-trunk
+  ap-cf-b1:
+    config: archer-c7
+    ip: 10.20.0.54
+    wlans:
+      0:
+        bssid: 02:00:0f:20:20:20
+        channel: 60
+      1:
+        bssid: 02:00:0f:20:20:21
+        channel: 12
+    mixins:
+      - all
+      - archer-c5
+      - archer-c5-single-trunk
+  ap-cf-c1:
+    config: dap2965
+    ip: 10.20.0.55
+    wlans:
+      0:
+        bssid: 02:00:0f:20:20:30
+        channel: 108
+      1:
+        bssid: 02:00:0f:20:20:31
         channel: 1
     mixins:
       - all
       - dap2965
       - dap2965-single-trunk
-  ap-cf-mr-3:
-    config: linksys
-    ip: 10.20.0.54
-    wlans:
-      0:
-        bssid: 02:00:0f:20:20:20
-        channel: 108
-      1:
-        bssid: 02:00:0f:20:20:21
-        channel: 9
-    mixins:
-      - all
-      - linksys
-      - linksys-single-trunk
-  ap-cf-mr-4:
-    config: linksys
-    ip: 10.20.0.55
-    wlans:
-      0:
-        bssid: 02:00:0f:20:20:30
-        channel: 60
-      1:
-        bssid: 02:00:0f:20:20:31
-        channel: 13
-    mixins:
-      - all
-      - linksys
-      - linksys-single-trunk
   # Small room
-  ap-cf-sr-1:
-    config: archer-c5
-    ip: 10.20.0.56
+  ap-cf-qws:
+    config: archer-c7
+    ip: 10.20.0.59
     wlans:
       0:
         bssid: 02:00:0f:20:30:00
-        channel: 44
+        channel: 108
       1:
         bssid: 02:00:0f:20:30:01
         channel: 1
@@ -101,45 +115,16 @@ configurations:
       - all
       - archer-c5
       - archer-c5-single-trunk
-  ap-cf-sr-2:
-    config: archer-c7
-    ip: 10.20.0.57
-    wlans:
-      0:
-        bssid: 02:00:0f:20:30:10
-        channel: 60
-      1:
-        bssid: 02:00:0f:20:30:11
-        channel: 1
-    mixins:
-      - all
-      - archer-c5
-      - archer-c5-single-trunk
-  # Chillout area and quiet workshops
   ap-cf-ch:
     config: archer-c5
     ip: 10.20.0.58
     wlans:
       0:
-        bssid: 02:00:0f:20:40:00
+        bssid: 02:00:0f:20:30:10
         channel: 44
       1:
-        bssid: 02:00:0f:20:40:01
-        channel: 1
-    mixins:
-      - all
-      - archer-c5
-      - archer-c5-single-trunk
-  ap-cf-qws:
-    config: archer-c7
-    ip: 10.20.0.59
-    wlans:
-      0:
-        bssid: 02:00:0f:20:40:10
-        channel: 44
-      1:
-        bssid: 02:00:0f:20:40:11
-        channel: 1
+        bssid: 02:00:0f:20:30:11
+        channel: 12
     mixins:
       - all
       - archer-c5
@@ -154,25 +139,25 @@ configurations:
         channel: 44
       1:
         bssid: 02:00:0f:20:50:01
-        channel: 9
+        channel: 1
     mixins:
       - all
       - linksys
       - linksys-single-trunk
   ap-ws-ws2:
-    config: archer-c5
+    config: linksys
     ip: 10.20.0.61
     wlans:
       0:
         bssid: 02:00:0f:20:50:10
-        channel: 108
+        channel: 157
       1:
         bssid: 02:00:0f:20:50:11
-        channel: 1
+        channel: 12
     mixins:
       - all
-      - archer-c5
-      - archer-c5-single-trunk
+      - linksys
+      - linksys-single-trunk
   # NOC/Team room
   ap-ws-noc:
     config: archer-c5
@@ -183,7 +168,7 @@ configurations:
         channel: 108
       1:
         bssid: 02:00:0f:20:50:21
-        channel: 13
+        channel: 6
     mixins:
       - all
       - archer-c5