diff --git a/Rakefile b/Rakefile
index 31f0495..fe1b97b 100644
--- a/Rakefile
+++ b/Rakefile
@@ -56,7 +56,8 @@ task :ap, [:name] do |t, args|
 end
 
 task :all do
-  aps = %W(ap-cf-mr-1 ap-cf-mr-2 ap-cf-mr-3 ap-cf-mr-4) # Main room
+  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-ch) # Chillout and quiet workshop area
 
diff --git a/configurations.yml b/configurations.yml
index c1c19ef..79e3f9d 100644
--- a/configurations.yml
+++ b/configurations.yml
@@ -1,5 +1,35 @@
 ---
 configurations:
+  # Foaier
+  ap-cf-f-r:
+    config: archer-c5
+    ip: 10.20.0.51
+    wlans:
+      0:
+        bssid: 02:00:0f:20:10:00
+        channel: 60
+      1:
+        bssid: 02:00:0f:20:10:01
+        channel: 5
+    mixins:
+      - all
+      - archer-c5
+      - archer-c5-single-trunk
+  ap-cf-f-l:
+    config: archer-c7
+    ip: 10.20.0.51
+    wlans:
+      0:
+        bssid: 02:00:0f:20:10:10
+        channel: 108
+      1:
+        bssid: 02:00:0f:20:10:11
+        channel: 13
+    mixins:
+      - all
+      - archer-c7
+      - archer-c7-single-trunk
+  # Main room
   ap-cf-mr-1:
     config: dap2965
     ip: 10.20.0.52
@@ -56,7 +86,7 @@ configurations:
       - all
       - dap2965
       - dap2965-single-trunk
-
+  # Small room
   ap-cf-sr-1:
     config: archer-c5
     ip: 10.20.0.56
@@ -85,15 +115,16 @@ configurations:
       - 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:30:01
+        bssid: 02:00:0f:20:40:01
         channel: 44
       1:
-        bssid: 02:00:0f:20:30:11
+        bssid: 02:00:0f:20:40:11
         channel: 1
     mixins:
       - all