diff --git a/Rakefile b/Rakefile
index 7843be5..31f0495 100644
--- a/Rakefile
+++ b/Rakefile
@@ -56,7 +56,9 @@ task :ap, [:name] do |t, args|
 end
 
 task :all do
-  aps = %W(ap-cf-sr-1 ap-cf-sr-2 ap-cf-ch)
+  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
 
   aps.each do |ap|
     Rake::Task["ap"].reenable
diff --git a/configurations.yml b/configurations.yml
index d665ecb..c1c19ef 100644
--- a/configurations.yml
+++ b/configurations.yml
@@ -1,5 +1,62 @@
 ---
 configurations:
+  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
+    mixins:
+      - all
+      - dap2965
+      - dap2965-single-trunk
+  ap-cf-mr-2:
+    config: dap2965
+    ip: 10.20.0.53
+    wlans:
+      0:
+        bssid: 02:00:0f:20:20:10
+        channel: 44
+      1:
+        bssid: 02:00:0f:20:20:11
+        channel: 1
+    mixins:
+      - all
+      - dap2965
+      - dap2965-single-trunk
+  ap-cf-mr-3:
+    config: dap2965
+    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
+      - dap2965
+      - dap2965-single-trunk
+  ap-cf-mr-4:
+    config: dap2965
+    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
+      - dap2965
+      - dap2965-single-trunk
+
   ap-cf-sr-1:
     config: archer-c5
     ip: 10.20.0.56