diff --git a/config/ap.nix b/config/ap.nix
index e34154a..f075db5 100644
--- a/config/ap.nix
+++ b/config/ap.nix
@@ -1805,7 +1805,46 @@
         };
       };
     };
-    ap60 = { };
+    ap60 = {
+      interfaces = {
+        mgmt = {
+          gw4 = "mgmt-gw";
+          gw6 = "mgmt-gw";
+          type = "phys";
+        };
+        priv35.type = "bridge";
+        pub.type = "bridge";
+      };
+      links = {
+        priv35 = {
+          ports = [ "lan:1" "lan:2" "lan:3" "lan:4" ];
+        };
+        switch-b2 = {
+          ports = [ "wan" ];
+        };
+      };
+      location = "B1.05.02";
+      model = "tplink_archer-c7-v5";
+      role = "ap";
+      wifi = {
+        "pci0000:00/0000:00:00.0" = {
+          channel = 128;
+          htmode = "HT40+";
+          ssids = {
+            Abyssinia = { net = "priv35"; };
+            "ZW public" = { net = "pub"; };
+          };
+        };
+        "platform/qca956x_wmac" = {
+          channel = 1;
+          htmode = "HT40+";
+          ssids = {
+            Abyssinia = { net = "priv35"; };
+            "ZW public" = { net = "pub"; };
+          };
+        };
+      };
+    };
     ap61 = { };
     ap62 = { };
     ap63 = { };
diff --git a/config/secrets-production.nix.gpg b/config/secrets-production.nix.gpg
index 40deac0..10af0cd 100644
--- a/config/secrets-production.nix.gpg
+++ b/config/secrets-production.nix.gpg
@@ -1,67 +1,67 @@
 -----BEGIN PGP MESSAGE-----
 
-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
-WfEUfxiihHcZXcuEQJsUUi73p7w=
-=su/k
+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
+=eOR6
 -----END PGP MESSAGE-----
diff --git a/config/secrets.nix b/config/secrets.nix
index ce3bc56..c53b59d 100644
--- a/config/secrets.nix
+++ b/config/secrets.nix
@@ -58,6 +58,7 @@
     ap57.password = "encrypted";
     ap58.password = "encrypted";
     ap59.password = "encrypted";
+    ap60.password = "encrypted";
     switch-a1.password = "encrypted";
     switch-b1.password = "encrypted";
     switch-b2.password = "encrypted";
@@ -240,6 +241,10 @@
       "pci0000:00/0000:00:00.0".ssids."Ebs 5000".psk = "encrypted";
       "platform/ahb/18100000.wmac".ssids."Ebs 2000".psk = "encrypted";
     };
+    ap60.wifi = {
+      "pci0000:00/0000:00:00.0".ssids."Abyssinia".psk = "encrypted";
+      "platform/qca956x_wmac".ssids."Abyssinia".psk = "encrypted";
+    };
     ap7.wifi."platform/qca953x_wmac".ssids."mino".psk = "encrypted";
     ap8.wifi = {
       "pci0000:00/0000:00:00.0".ssids."C3D2".psk = "encrypted";
diff --git a/config/switch.nix b/config/switch.nix
index 1799614..d0b1547 100644
--- a/config/switch.nix
+++ b/config/switch.nix
@@ -126,6 +126,7 @@
         ap54.ports = [ "GigabitEthernet 1/0/38" ];
         ap55.ports = [ "GigabitEthernet 1/0/19" ];
         ap56.ports = [ "GigabitEthernet 1/0/9" ];
+        ap60.ports = [ "GigabitEthernet1/0/44" ];
         mgmt.ports = [
           "GigabitEthernet1/0/1"
           # server3
@@ -133,8 +134,6 @@
           # server1
           "GigabitEthernet1/0/42"
           "GigabitEthernet1/0/43"
-          # server5
-          "GigabitEthernet1/0/44"
           # server6
           "GigabitEthernet1/0/45"
           # server7