diff --git a/Rakefile b/Rakefile
index fe1b97b..b76dced 100644
--- a/Rakefile
+++ b/Rakefile
@@ -60,6 +60,10 @@ 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-sr-1 ap-cf-sr-2 ) # Small room
   aps += %W(ap-cf-ch) # Chillout and quiet workshop area
+ 
+  # Workshop floor
+  aps += %W(ap-ws-ws1 ap-ws-ws2) # workshop and overflow area
+  aps += %W(ap-ws-noc) # NOC/Team room
 
   aps.each do |ap|
     Rake::Task["ap"].reenable
diff --git a/configurations.yml b/configurations.yml
index 79e3f9d..26bdf09 100644
--- a/configurations.yml
+++ b/configurations.yml
@@ -59,7 +59,7 @@ configurations:
       - dap2965
       - dap2965-single-trunk
   ap-cf-mr-3:
-    config: dap2965
+    config: linksys
     ip: 10.20.0.54
     wlans:
       0:
@@ -70,8 +70,8 @@ configurations:
         channel: 9
     mixins:
       - all
-      - dap2965
-      - dap2965-single-trunk
+      - linksys
+      - linksys-single-trunk
   ap-cf-mr-4:
     config: dap2965
     ip: 10.20.0.55
@@ -84,8 +84,8 @@ configurations:
         channel: 13
     mixins:
       - all
-      - dap2965
-      - dap2965-single-trunk
+      - linksys
+      - linksys-single-trunk
   # Small room
   ap-cf-sr-1:
     config: archer-c5