diff --git a/Rakefile b/Rakefile
index bd80d2b..d24e92e 100644
--- a/Rakefile
+++ b/Rakefile
@@ -56,10 +56,11 @@ task :ap, [:name] do |t, args|
 end
 
 task :all do
-  aps = %W(ap-bulgaria-1-ac ap-bulgaria-2-ac ap-bulgaria-3-ac ap-chamber-1-ac ap-chamber-2-ac ap-marble-1-ac ap-music-1-ac ap-lobby1-1-an ap-lobby1-2-legacy)
-  aps = %W(ap-lobby1-3-an)
-  aps = %W(ap-lobby2-1-an)
-  aps = %W(ap-bulgaria-4-legacy)
+  aps = %W(ap-l0-1 ap-l0-2 ap-l1-1 ap-l1-2 )
+  # aps = %W(ap-bulgaria-1-ac ap-bulgaria-2-ac ap-bulgaria-3-ac ap-chamber-1-ac ap-chamber-2-ac ap-marble-1-ac ap-music-1-ac ap-lobby1-1-an ap-lobby1-2-legacy)
+  # aps = %W(ap-lobby1-3-an)
+  # aps = %W(ap-lobby2-1-an)
+  # aps = %W(ap-bulgaria-4-legacy)
 
   aps.each do |ap|
     Rake::Task["ap"].reenable
diff --git a/configurations.yml b/configurations.yml
index 92905e0..d3636fc 100644
--- a/configurations.yml
+++ b/configurations.yml
@@ -1,185 +1,185 @@
 ---
 configurations:
-  ap-bulgaria-1-ac:
-    config: archer-c5
-    ip: 10.100.0.200
+  # ap-bulgaria-1-ac:
+  #   config: ar71xx-openwrt
+  #   ip: 10.100.0.200
+  #   wlans:
+  #     0:
+  #       bssid: 02:00:0f:20:16:00
+  #       channel: 36
+  #     1:
+  #       bssid: 02:00:0f:20:16:01
+  #       channel: 1
+  #   mixins:
+  #     - all
+  #     - archer-c5
+  #     - archer-c5-dual-trunk
+  # ap-bulgaria-2-ac:
+  #   config: archer-c5
+  #   ip: 10.100.0.201
+  #   wlans:
+  #     0:
+  #       bssid: 02:00:0f:20:16:10
+  #       channel: 52
+  #     1:
+  #       bssid: 02:00:0f:20:16:11
+  #       channel: 9
+  #   mixins:
+  #     - all
+  #     - archer-c5
+  #     - archer-c5-dual-trunk
+  # ap-bulgaria-3-ac:
+  #   config: archer-c5
+  #   ip: 10.100.0.202
+  #   wlans:
+  #     0:
+  #       bssid: 02:00:0f:20:16:20
+  #       channel: 116
+  #     1:
+  #       bssid: 02:00:0f:20:16:21
+  #       channel: 13
+  #   mixins:
+  #     - all
+  #     - archer-c5
+  #     - archer-c5-triple-trunk
+  # ap-bulgaria-4-legacy:
+  #   config: wr1043-nd
+  #   ip: 10.100.0.203
+  #   wlans:
+  #     0:
+  #       bssid: 02:00:0f:20:16:30
+  #       channel: 5
+  #   mixins:
+  #     - all
+  #     - wr-1043nd
+  # ap-chamber-1-ac:
+  #   config: archer-c5
+  #   ip: 10.100.0.204
+  #   wlans:
+  #     0:
+  #       bssid: 02:00:0f:20:16:40
+  #       channel: 36
+  #     1:
+  #       bssid: 02:00:0f:20:16:41
+  #       channel: 1
+  #   mixins:
+  #     - all
+  #     - archer-c5
+  #     - archer-c5-single-trunk
+  # ap-c-2:
+  #   config: archer-c5
+  #   ip: 10.100.0.205
+  #   wlans:
+  #     0:
+  #       bssid: 02:00:0f:20:16:50
+  #       channel: 116
+  #     1:
+  #       bssid: 02:00:0f:20:16:51
+  #       channel: 1
+  #   mixins:
+  #     - all
+  #     - archer-c5
+  #     - archer-c5-single-trunk
+  # ap-music-1-ac:
+  #   config: archer-c5
+  #   ip: 10.100.0.206
+  #   wlans:
+  #     0:
+  #       bssid: 02:00:0f:20:16:60
+  #       channel: 36
+  #     1:
+  #       bssid: 02:00:0f:20:16:61
+  #       channel: 1
+  #   mixins:
+  #     - all
+  #     - archer-c5
+  #     - archer-c5-single-trunk
+  # ap-marble-1-ac:
+  #   config: archer-c5
+  #   ip: 10.100.0.207
+  #   wlans:
+  #     0:
+  #       bssid: 02:00:0f:20:16:70
+  #       channel: 36
+  #     1:
+  #       bssid: 02:00:0f:20:16:71
+  #       channel: 1
+  #   mixins:
+  #     - all
+  #     - archer-c5
+  #     - archer-c5-single-trunk
+  ap-l0-1:
+    config: ar71xx-openwrt
+    ip: 10.20.0.208
     wlans:
       0:
-        bssid: 02:00:0f:20:15:00
-        channel: 36
-      1:
-        bssid: 02:00:0f:20:15:01
-        channel: 1
-    mixins:
-      - all
-      - archer-c5
-      - archer-c5-dual-trunk
-  ap-bulgaria-2-ac:
-    config: archer-c5
-    ip: 10.100.0.201
-    wlans:
-      0:
-        bssid: 02:00:0f:20:15:10
-        channel: 52
-      1:
-        bssid: 02:00:0f:20:15:11
-        channel: 9
-    mixins:
-      - all
-      - archer-c5
-      - archer-c5-dual-trunk
-  ap-bulgaria-3-ac:
-    config: archer-c5
-    ip: 10.100.0.202
-    wlans:
-      0:
-        bssid: 02:00:0f:20:15:20
-        channel: 116
-      1:
-        bssid: 02:00:0f:20:15:21
-        channel: 13
-    mixins:
-      - all
-      - archer-c5
-      - archer-c5-triple-trunk
-  ap-bulgaria-4-legacy:
-    config: wr1043-nd
-    ip: 10.100.0.203
-    wlans:
-      0:
-        bssid: 02:00:0f:20:15:30
-        channel: 5
-    mixins:
-      - all
-      - wr-1043nd
-  ap-chamber-1-ac:
-    config: archer-c5
-    ip: 10.100.0.204
-    wlans:
-      0:
-        bssid: 02:00:0f:20:15:40
-        channel: 36
-      1:
-        bssid: 02:00:0f:20:15:41
-        channel: 1
-    mixins:
-      - all
-      - archer-c5
-      - archer-c5-single-trunk
-  ap-chamber-2-ac:
-    config: archer-c5
-    ip: 10.100.0.205
-    wlans:
-      0:
-        bssid: 02:00:0f:20:15:50
-        channel: 116
-      1:
-        bssid: 02:00:0f:20:15:51
-        channel: 13
-    mixins:
-      - all
-      - archer-c5
-      - archer-c5-single-trunk
-  ap-music-1-ac:
-    config: archer-c5
-    ip: 10.100.0.206
-    wlans:
-      0:
-        bssid: 02:00:0f:20:15:60
-        channel: 36
-      1:
-        bssid: 02:00:0f:20:15:61
-        channel: 1
-    mixins:
-      - all
-      - archer-c5
-      - archer-c5-single-trunk
-  ap-marble-1-ac:
-    config: archer-c5
-    ip: 10.100.0.207
-    wlans:
-      0:
-        bssid: 02:00:0f:20:15:70
-        channel: 36
-      1:
-        bssid: 02:00:0f:20:15:71
-        channel: 1
-    mixins:
-      - all
-      - archer-c5
-      - archer-c5-single-trunk
-  ap-lobby1-1-an:
-    config: wdr4300
-    ip: 10.100.0.208
-    wlans:
-      0:
-        bssid: 02:00:0f:20:15:80
+        bssid: 02:00:0f:20:16:80
         channel: 13
       1:
-        bssid: 02:00:0f:20:15:81
+        bssid: 02:00:0f:20:16:81
         channel: 100
     mixins:
       - all
-      - wdr-4300
-      - wdr-4300-single-trunk
-  ap-lobby1-2-legacy:
-    config: rs
-    ip: 10.100.0.209
-    wlans:
-      0:
-        bssid: 02:00:0f:20:15:90
-        channel: 5
-    mixins:
-      - all
-      - rs
-  ap-lobby1-3-an:
-    config: wdr4300
+      - archer-c5
+      - archer-c5-single-trunk
+  # ap-lobby1-2-legacy:
+  #   config: rs
+  #   ip: 10.100.0.209
+  #   wlans:
+  #     0:
+  #       bssid: 02:00:0f:20:16:90
+  #       channel: 5
+  #   mixins:
+  #     - all
+  #     - rs
+  ap-l0-2:
+    config: ar71xx-openwrt
     ip: 10.100.0.210
     wlans:
       0:
-        bssid: 02:00:0f:20:15:a0
-        channel: 9
-      1:
-        bssid: 02:00:0f:20:15:a1
+        bssid: 02:00:0f:20:16:a0
         channel: 108
+      1:
+        bssid: 02:00:0f:20:16:a1
+        channel: 9
     mixins:
       - all
-      - wdr-4300
-      - wdr-4300-single-trunk
-  ap-lobby2-1-an:
-    config: wdr4300
+      - archer-c5
+      - archer-c5-single-trunk
+  ap-l1-1:
+    config: ar71xx-openwrt
     ip: 10.100.0.211
     wlans:
       0:
-        bssid: 02:00:0f:20:15:b0
-        channel: 13
-      1:
-        bssid: 02:00:0f:20:15:b1
+        bssid: 02:00:0f:20:16:b0
         channel: 100
+      1:
+        bssid: 02:00:0f:20:16:b1
+        channel: 13
     mixins:
       - all
-      - wdr-4300
-      - wdr-4300-single-trunk
-  ap-lobby2-2-legacy:
-    config: wr841nd
-    ip: 10.100.0.212
-    wlans:
-      0:
-        bssid: 02:00:0f:20:15:c0
-        channel: 5
-    mixins:
-      - all
-  ap-lobby2-3-an:
-    config: wdr4300
+      - archer-c5
+      - archer-c5-single-trunk
+  # ap-lobby2-2-legacy:
+  #   config: wr841nd
+  #   ip: 10.100.0.212
+  #   wlans:
+  #     0:
+  #       bssid: 02:00:0f:20:16:c0
+  #       channel: 5
+  #   mixins:
+  #     - all
+  ap-l1-2:
+    config: ar71xx-openwrt
     ip: 10.100.0.213
     wlans:
       0:
-        bssid: 02:00:0f:20:15:d0
-        channel: 1
-      1:
-        bssid: 02:00:0f:20:15:d1
+        bssid: 02:00:0f:20:16:d0
         channel: 108
+      1:
+        bssid: 02:00:0f:20:16:d1
+        channel: 1
     mixins:
       - all
-      - wdr-4300
-      - wdr-4300-single-trunk
+      - archer-c5
+      - archer-c5-single-trunk