diff --git a/config/secrets-production.nix.gpg b/config/secrets-production.nix.gpg
index 876e6e0..902d244 100644
--- a/config/secrets-production.nix.gpg
+++ b/config/secrets-production.nix.gpg
@@ -1,63 +1,62 @@
 -----BEGIN PGP MESSAGE-----
 
-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
-9uVa8FCRRJjTzVLQwiE0DJLXU3zlRxiE++E=
-=aeon
+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
+=5NFQ
 -----END PGP MESSAGE-----
diff --git a/config/secrets.nix b/config/secrets.nix
index 9aec4a9..7d5f552 100644
--- a/config/secrets.nix
+++ b/config/secrets.nix
@@ -21,7 +21,6 @@
     ap17.password = "encrypted";
     ap18.password = "encrypted";
     ap19.password = "encrypted";
-    ap21.password = "encrypted";
     ap22.password = "encrypted";
     ap23.password = "encrypted";
     ap24.password = "encrypted";
@@ -43,7 +42,6 @@
     ap40.password = "encrypted";
     ap41.password = "encrypted";
     ap42.password = "encrypted";
-    ap43.password = "encrypted";
     ap44.password = "encrypted";
     ap45.password = "encrypted";
     ap46.password = "encrypted";
@@ -111,10 +109,6 @@
       "pci0000:01/0000:01:00.0".ssids."C3D2".psk = "encrypted";
       "platform/qca955x_wmac".ssids."C3D2 legacy".psk = "encrypted";
     };
-    ap21.wifi = {
-      "pci0000:00/0000:00:00.0".ssids."ZW stage".psk = "encrypted";
-      "platform/qca956x_wmac".ssids."ZW stage legacy".psk = "encrypted";
-    };
     ap23.wifi = {
       "pci0000:00/0000:00:00.0".ssids."LBK Network".psk = "encrypted";
       "platform/qca956x_wmac".ssids."LBK Network".psk = "encrypted";
@@ -176,7 +170,6 @@
       "pci0000:00/0000:00:00.0".ssids."jam-circle.de".psk = "encrypted";
       "platform/qca956x_wmac".ssids."jam-circle.de legacy".psk = "encrypted";
     };
-    ap43.wifi."platform/qca955x_wmac".ssids."Kaffeetasse".psk = "encrypted";
     ap44.wifi = {
       "1e140000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0".ssids."ZW stage legacy".psk = "encrypted";
       "1e140000.pcie/pci0000:00/0000:00:01.0/0000:02:00.0".ssids."ZW stage".psk = "encrypted";