diff --git a/config/ap.nix b/config/ap.nix
index 1d4856d..717f329 100644
--- a/config/ap.nix
+++ b/config/ap.nix
@@ -1846,7 +1846,42 @@
         };
       };
     };
-    ap61 = { };
+    ap61 = {
+      interfaces = {
+        mgmt = {
+          gw4 = "mgmt-gw";
+          gw6 = "mgmt-gw";
+          type = "phys";
+        };
+        priv44.type = "bridge";
+        pub.type = "bridge";
+      };
+      links = {
+        pub.ports = [ "lan:1" "lan:2" "lan:3" "lan:4" ];
+        switch-b3.ports = [ "wan" ];
+      };
+      location = "Turm C, 3. Etage";
+      model = "tplink_archer-c7-v5";
+      role = "ap";
+      wifi = {
+        "pci0000:00/0000:00:00.0" = {
+          channel = 36;
+          htmode = "HT40+";
+          ssids = {
+            tomiru = { net = "priv44"; };
+            "ZW public" = { net = "pub"; };
+          };
+        };
+        "platform/ahb/18100000.wmac" = {
+          channel = 1;
+          htmode = "HT40+";
+          ssids = {
+            tomiru = { net = "priv44"; };
+            "ZW public" = { net = "pub"; };
+          };
+        };
+      };
+    };
     ap62 = { };
     ap63 = { };
     ap64 = { };
diff --git a/config/secrets-production.nix.gpg b/config/secrets-production.nix.gpg
index 0e484c8..d15e81b 100644
--- a/config/secrets-production.nix.gpg
+++ b/config/secrets-production.nix.gpg
@@ -1,71 +1,71 @@
 -----BEGIN PGP MESSAGE-----
 
-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
-cI8/A26D8J0=
-=Zfxk
+hQEMA2PKcvDMvlKLAQf/TbiQ8YxFmvGbvToa+mSrXZGIkkWZRyy1QabSzJCxKmJU
+jPTij+zVuaSpnl1MVkag+LR9L+UYATgLn9qC4EZTAPzghCJVPyMKUFelhVRZHrk3
+21JRG4nMBGBelTQOSCdgy7iEUeWy8DQez2IFv4usTPzDXo3F5pWk8mPWdMCllS/q
+RMCCbMAPYeEmcc01pSuET2vrf7C4+nUjJWvdzWM6ABoW06AJALxOCJLqCSTwAM1f
+CK4NnP3BVbjOJmtFUFqCXj89Oj8r4f6Ks4tQpKox1a8vwQo3Dqi84V/E8MWNuwrE
+mGmBbf6D2nBV6NO6B3Ylp5LEFBO3v5SFh7YKKpdDuNLqAX9RNPXehTsgion+Iw6W
+LlD/786ieiCQ5gj8ucsMtx42/f038Kx9W3cIPFWIe2M9J66KxbvooUYtCL2M29Um
+QCej85fLEVLsedYIiIrDlXBPiNnkkAn4FLkfTdRFa3Ybqycai83ecfgp/Ij44QrA
+M18rdgw9EsYAPJdp2wfZdaBMaVssjSUUIxRPY+0jMyFIAaWFsB19cnomXR5aMzWt
+1ol5TuUQPXjkMOUIWMdUHAxmBPQMtftbyGlpWkjNeMVk48nAIwHwPW5Ig1x5BlZx
+mcEfIHu8xbpzRqvAUvZqq27h67aNwB1lXXJd9kVL29U47dwiNbvR4ALEuS4NO5l+
+Jqar/sPBjTYFxsUd1YjhWp+SznwPWatskyeAUphSCG6I37MW0ehstvjtMb9N7yMT
+KBiQpI+FZnnsFNAtYs9AfmoGdo34yIhXicQ7wUVXoaE9RpiXhP0NUuM5URL1TMXn
+l1lIBfXBBugNhicxQLhQRhWJr8KuusADdiuFJMh/tBvMJgPV6DwgJASQacgVcCWP
+P/yEhVVptKii1FL48ahPopELZEGnBP2xV+vBdI9hZKRVSbmTkhckwXj3OyivhczY
+S17zrbTXMprYz1enmt5CuDHCXfqBBhUvLEs0mVgAVihVloEwfZFfdh5L4WopG3kM
+hmt5UMPOJGAf0aKG4Q5FBXF/38yAMWEsuljIoSqJd6XYb7a40Cg2UUF1XXVU+9xQ
+FkQEPyeyh3extR5Yh5f1tWfrktnPtD5n0w7zgkR4M77CXCj3nYZqLAsvlFGQDu8/
+kBLg5bybl4IguDYDKy0ZTgyF0crk6UI5nOPL7cbbXYnurSorbc140sZZX4N/WVNm
+1Z+aEkg8gy0YaupC2xiMdBXLK/ZDSm1jaxGbkmIs5O0nwgkjpXmxXHIXUjmGHCVs
+OIW7a4j7yzVOYeHqtDRfYuQWtpHo4j8CB4wBzEt2NsLqmwnIPs+PwBzi4nS8ylG9
+BDOS7F8eYXEb7RE5eoNsIbHufla9LMGPbk/7jmvDgGCcoaGBZXQMypRNmc/N+y/U
+JvON7csCFEb34H0MVnkTSXjqPezEVoIz+4eNC4kRJOfrEJ4JJCoE66zgrcCzzRQ8
+s3X8xgcBUITCD1CCKOEGvL4AccL89D7eBwVrToK1F+oG1N7nLK4u6rPuaNeFSa+S
+PkqhncDXy/5yQusWrepseqyZYTGS7WM9UumzYYmkKjkoEsn5YUZ4u9gfgO7YJ5Dp
+xLo90bIRigUIJTFupIzgDKwPeyQ3L1H8fT93LrSTvqgETxoA4y68O+pOb//cldwl
+dOT1W9GjagV8kEjg+40Is+db2tDoxSzECXgfIuI2DcZNiqsiQu4jgcaAOtwBRHUB
+1+oS+LMNo1QYEC9BzIWQ6RXUX7QFO0Ohk//bp0Z4IMicdhV6MIUuCXjg7/KJuQUH
+VreQJQ06LauL2dkH2MekstQhhGjDrvNevlU8nf2/s+eyE47LwbJeWFDauH8BG/k7
+0lqAgun11aucEphylfhEXrenIJE5gXzQU2sh0uzdZix3teqWLSE0SFiInKewacUP
+pRRcKnVtsQjucTU9VR5RJTnNnEYyLiw0OOBhBPnJcqEu3EZeC8qQ05ohF9/Tund/
+SPQ+MdD3oL29pvwS5TxUqnBTjUCfcvr9LH8xS8XLb5u+EoINYM42ik0l4mn5C7t6
+hdjHkfawFp1/8ItEs9F7nD79i6dHs1iQrztBjTonZibROWRcsbXye5ygbKc/oq1n
+uA3YAPosrdr8ssX2ofm2QWSAuZqehzWeUan8glAazMZODLXOFx3/vWWSyCqBD6xK
+QAm9Yk+N9pp4UqG4xcWjZAzt62y9NSIFyARCKbfvBS7h5Obb04Iqzjilo4DQbfG2
+yqCT/F4Q+OYO/Ko/gKvkrZkIZ+jVg1vLXOCmcNETOhEyod4zfDAKVoGHl7ZOZMBs
+ZYplzxSxBWnZWDKcAcxG3vc6nvZIOk3QINoCpL2qmKyWl91MV3Jha4MfCQeTHCPu
+Ym0JTZ1KtW+gFAcHJWr4SxpdINHL9G2oz42djCYicNRTJdrrKTluZKUa/D4+fSw9
+3v+ERM6MmYvczZw7aac3Dg1xMEJEgwA/OCihO/qKK5BLkQtTVfuXAySlBDYGZ4b6
+5+1ehZ8ZTp4ne1kisdIeCxx880bOTeS0EJzF0NReXTebHRd3OrSG8AREgXka9Or9
+vUX1ODN5up7sQIk38IcG4X5ibOm/jEfRrUiu7RIjSfoBCJkR5jhPKPBrPzBiyVMS
+i8mKnQxPbyRcGHMEFtVEsBduz3nmw/U0x8n2RVBbptVd0K/ff79da8VxkdNn/c5x
+5up/g03sf2YVqLHJNH1FP95BobtoYtcPk9tXCvBOl5ru5s8T0GQ6LTMvfWOgzMwo
+V/Ph1GbpWYr9qXvVO3/9ysnlxLTTOjKUVCnOA3hY2eXgIUPPB0nEwVMe8JzXF8z7
+81rT1B4HV00yrRZs7gMzLUcBa+0GeM6X0F0D2Sxx5rsGzQRTevvCMwWBDBCLgtMu
+Z+fwPghO0KuaKVqrPXdBLwGf7L+hwVED+9r0bXTulHpbs2SbYrr4tM1jt5E+kkDf
+OSXeVX/ACgsYgGUJgW3/URYuLD6lWk1+Ir9iat4Y3PEnkWo+H4X3Qtabxw5IOlUF
+hQy07O/omjwlhK6jd9u1PGw2KSXOU24Rjmj4OPZ94g4nUulbyY7YEVj5QB/dhOKe
+m2ilIxk57oJAblzW50Oyl6dp6TY4S6sqwGJqEiCpdU4WhRRQKXGdtHOVpOxWq3cO
+tET8l08INpboRFv2kySko/luzWgIDB68HI7EWBUTBHzkbAg41jvzbzAVLUuN2FyI
+Vn8QGpxDtwHa9CQXNSlj0aiMleZ64TC7X8BlcsvNSUPQk0k1Mc6fnSywsbo85nGj
+sql7U7R0TXkrkTgHKphnJJhqufixZs5Ha2f+T9hfEq9yMpmehXh3+aFvcmBZ9gNq
+h/aQ7qpNWjiUYj7ocuAwOcfxr18UlmzFB/euv/fFbklfCwB3LEMHRTj7v48DndbW
+zPHTwnJdTA81JP1KRQaf706i/Vnko3SwTHtrHbcyXnUrV2z+yS9pRn9qK57zCgRJ
+qkAcr49BqDgV6h+BGE+xtcUm+ukfcJ9ptDA28qEeLtc/pBGL5sLxgSyZ+XOIBdU7
+R9t7cWIkG3vu8b5t/h6/UHAkpzlj0mrTN/V0+qnam9UjBcPwAvYk8whhxw1vm4Rf
+JQSaEfSzdhHuA2WTLD0PU1hfz73X8GjciQwJLh4If4EzIbPMN7Ma8e08gkyIshCJ
+5MRrrBIClkwPZwk6jYZIWKFTRjMp2HTKaae0kAuhbB5aMa9gtBz6yvw5pj9O2eYs
+dr4LZRYRLF49i7fyjgstq7qzxKhc0rzFzOY8uHPCTKwQRmn9cm0T7I95clA851zK
+sDqcwLKklmsmZNSmy69AvbBNHS2IFigkl+4L9Xl0mUS8lBcHSoc09j803hDDjb7s
+qEkRWKgK0XLywTL58wJWPLwAZDTGmt60QkO5YIMHN4Y0k+V+UC5nDEZDoRu3D1iI
+Qx/RtGfVOoDIqq94vdLAdcxRIQGosFaPwov94IAp5hv3Tpqes/1psQWh707e+XvE
+417rqVT01rumD/qNy9PIkElwpcaKqHcN/BnAN+YgndhOAfNLd1IMx0GzRzwolpUv
+d5sWvR7zVRnI4hUcUMVLFWu8OHidUK2Y3wO5AIWihj/dyM6ZVVmO4+YgIT4c9nZU
+ndlXahBeML6FgNWgOJzIHO4+RyH/6JVot24+b48AMJ00UHJFO7YmR75NiKznX8bR
+XRCPnIipzhEhlsbaAcdNm7tSeR1R6zMXeAgBRTNZvFVjtesHa/jBFn9YtKoVuEcM
+72Sv31BdTZSODPGSeIxS9p2WvKndYi3UcKuQwnfVQa4ePopvAnIJ
+=M+e1
 -----END PGP MESSAGE-----
diff --git a/config/secrets.nix b/config/secrets.nix
index a336795..75da96b 100644
--- a/config/secrets.nix
+++ b/config/secrets.nix
@@ -59,6 +59,7 @@
     ap58.password = "encrypted";
     ap59.password = "encrypted";
     ap60.password = "encrypted";
+    ap61.password = "encrypted";
     switch-a1.password = "encrypted";
     switch-b1.password = "encrypted";
     switch-b2.password = "encrypted";
@@ -248,6 +249,10 @@
       "pci0000:00/0000:00:00.0".ssids."Abyssinia".psk = "encrypted";
       "platform/ahb/18100000.wmac".ssids."Abyssinia".psk = "encrypted";
     };
+    ap61.wifi = {
+      "pci0000:00/0000:00:00.0".ssids."tomiru".psk = "encrypted";
+      "platform/ahb/18100000.wmac".ssids."tomiru".psk = "encrypted";
+    };
     ap7.wifi."platform/qca953x_wmac".ssids."mino".psk = "encrypted";
     ap8.wifi = {
       "pci0000:00/0000:00:00.0".ssids."C3D2".psk = "encrypted";