diff --git a/Rakefile b/Rakefile
index f384966..f8f1569 100644
--- a/Rakefile
+++ b/Rakefile
@@ -59,7 +59,7 @@ end
 
 task :all do
   aps = %W(ap-ws-ws1 ap-ws-ws2) # Workshops
-  aps += %W(ap-cf-srv) # server room
+  aps += %W(ap-cf-srv ap-cf-f-l ap-cf-f-r ap-cf-a-2 ap-cf-b ap-cf-ws) # top floor
 
   aps.each do |ap|
     Rake::Task["ap"].reenable
diff --git a/configurations.yml b/configurations.yml
index e285706..3f2f6a1 100644
--- a/configurations.yml
+++ b/configurations.yml
@@ -36,6 +36,7 @@ configurations:
 #      - all
 #      - dap2965
 #      - dap2965-single-trunk
+
   # top floor
   ap-cf-srv:
     config: tplink-eap615
@@ -51,15 +52,132 @@ configurations:
         txpower: 10
       2:
         bssid: 0e:50:ff:11:00:50
-        key: openfest
+        key: REPLACETHIS
       3:
         bssid: 0e:24:ff:11:00:50
-        key: openfest
+        key: REPLACETHIS
 
     mixins:
       - all
       - tplink-eap615
 
+
+  ap-cf-f-l:
+    config: dap2965
+    ip: 10.20.0.51
+    wlans:
+      0:
+        bssid: 0e:50:00:11:00:51
+        channel: 157
+        txpower: 22
+      1:
+        bssid: 0e:24:00:11:00:51
+        channel: 13
+        txpower: 10
+      2:
+        bssid: 0e:50:ff:11:00:51
+        key: REPLACETHIS
+      3:
+        bssid: 0e:24:ff:11:00:51
+        key: REPLACETHIS
+    mixins:
+      - all
+      - dap2965
+      - dap2965-single-trunk
+
+  ap-cf-f-r:
+    config: dap2965
+    ip: 10.20.0.52
+    wlans:
+      0:
+        bssid: 0e:50:00:11:00:52
+        channel: 60
+        txpower: 22
+      1:
+        bssid: 0e:24:00:11:00:52
+        channel: 9
+        txpower: 10
+      2:
+        bssid: 0e:50:ff:11:00:52
+        key: REPLACETHIS
+      3:
+        bssid: 0e:24:ff:11:00:52
+        key: REPLACETHIS
+    mixins:
+      - all
+      - dap2965
+      - dap2965-single-trunk
+
+  ap-cf-a-2:
+    config: dap2965
+    ip: 10.20.0.53
+    wlans:
+      0:
+        bssid: 0e:50:00:11:00:53
+        channel: 44
+        txpower: 22
+      1:
+        bssid: 0e:24:00:11:00:53
+        channel: 5
+        txpower: 10
+      2:
+        bssid: 0e:50:ff:11:00:53
+        key: REPLACETHIS
+      3:
+        bssid: 0e:24:ff:11:00:53
+        key: REPLACETHIS
+    mixins:
+      - all
+      - dap2965
+      - dap2965-single-trunk
+
+  ap-cf-b:
+    config: dap2965
+    ip: 10.20.0.54
+    wlans:
+      0:
+        bssid: 0e:50:00:11:00:54
+        channel: 40
+        txpower: 22
+      1:
+        bssid: 0e:24:00:11:00:54
+        channel: 9
+        txpower: 10
+      2:
+        bssid: 0e:50:ff:11:00:54
+        key: REPLACETHIS
+      3:
+        bssid: 0e:24:ff:11:00:54
+        key: REPLACETHIS
+    mixins:
+      - all
+      - dap2965
+      - dap2965-single-trunk
+
+  ap-cf-ws:
+    config: dap2965
+    ip: 10.20.0.55
+    wlans:
+      0:
+        bssid: 0e:50:00:11:00:55
+        channel: 60
+        txpower: 22
+      1:
+        bssid: 0e:24:00:11:00:55
+        channel: 1
+        txpower: 10
+      2:
+        bssid: 0e:50:ff:11:00:55
+        key: REPLACETHIS
+      3:
+        bssid: 0e:24:ff:11:00:55
+        key: REPLACETHIS
+    mixins:
+      - all
+      - dap2965
+      - dap2965-single-trunk
+
+
   # lower floor
   ap-ws-ws1:
     config: linksys
@@ -75,10 +193,10 @@ configurations:
         txpower: 10
       2:
         bssid: 0e:50:ff:11:00:60
-        key: openfest
+        key: REPLACETHIS
       3:
         bssid: 0e:24:ff:11:00:60
-        key: openfest
+        key: REPLACETHIS
 
     mixins:
       - all
@@ -98,10 +216,10 @@ configurations:
         txpower: 10
       2:
         bssid: 0e:50:ff:11:00:61
-        key: openfest
+        key: REPLACETHIS
       3:
         bssid: 0e:24:ff:11:00:61
-        key: openfest
+        key: REPLACETHIS
 
     mixins:
       - all