diff --git a/config/ap.nix b/config/ap.nix
index f909a06..8429c80 100644
--- a/config/ap.nix
+++ b/config/ap.nix
@@ -95,7 +95,7 @@
       model = "tplink_tl-wr1043nd-v1";
       role = "ap";
       wifi = {
-        "platform/qca955x_wmac" = {
+        "platform/ahb/18100000.wmac" = {
           channel = 1;
           htmode = "HT40+";
           ssids = {
@@ -163,7 +163,7 @@
       model = "tplink_tl-wr1043nd-v3";
       role = "ap";
       wifi = {
-        "platform/qca955x_wmac" = {
+        "platform/ahb/18100000.wmac" = {
           channel = 1;
           htmode = "HT40+";
           ssids = {
@@ -198,7 +198,7 @@
       model = "tplink_tl-wr1043nd-v1";
       role = "ap";
       wifi = {
-        "platform/qca955x_wmac" = {
+        "platform/ahb/18100000.wmac" = {
           channel = 5;
           htmode = "HT40+";
           ssids = {
@@ -993,7 +993,7 @@
 
       role = "ap";
       wifi = {
-        "platform/qca955x_wmac" = {
+        "platform/ahb/18100000.wmac" = {
           channel = 11;
           htmode = "HT40-";
           ssids = {
@@ -1373,7 +1373,7 @@
       model = "tplink_tl-wr1043nd-v1";
       role = "ap";
       wifi = {
-        "platform/qca955x_wmac" = {
+        "platform/ahb/18100000.wmac" = {
           channel = 1;
           htmode = "HT40+";
           ssids = {
@@ -1452,7 +1452,7 @@
             antrares = { net = "priv17"; };
           };
         };
-        "platform/qca955x_wmac" = {
+        "platform/ahb/18100000.wmac" = {
           channel = 9;
           htmode = "HT40+";
           ssids = {
diff --git a/config/secrets-production.nix.gpg b/config/secrets-production.nix.gpg
index c79cda4..cbfd3e9 100644
--- a/config/secrets-production.nix.gpg
+++ b/config/secrets-production.nix.gpg
@@ -1,67 +1,67 @@
 -----BEGIN PGP MESSAGE-----
 
-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
-=Rc2o
+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
+=3pbw
 -----END PGP MESSAGE-----
diff --git a/config/secrets.nix b/config/secrets.nix
index 0e95582..3c0a023 100644
--- a/config/secrets.nix
+++ b/config/secrets.nix
@@ -91,13 +91,13 @@
     ap10.wifi."platform/qca953x_wmac".ssids = {
       "iz-dresden.org".psk = "encrypted";
     };
-    ap11.wifi."platform/qca955x_wmac".ssids."braeunigkoschnik".psk = "encrypted";
+    ap11.wifi."platform/ahb/18100000.wmac".ssids."braeunigkoschnik".psk = "encrypted";
     ap12.wifi."platform/ar934x_wmac".ssids = {
       "IrèneMélix".psk = "encrypted";
       "paperheart".psk = "encrypted";
     };
-    ap15.wifi."platform/qca955x_wmac".ssids."etz250".psk = "encrypted";
-    ap17.wifi."platform/qca955x_wmac".ssids = {
+    ap15.wifi."platform/ahb/18100000.wmac".ssids."etz250".psk = "encrypted";
+    ap17.wifi."platform/ahb/18100000.wmac".ssids = {
       "EDUB".psk = "encrypted";
       "Zweitwohnsitz".psk = "encrypted";
       "e-Stuetzpunkt".psk = "encrypted";
@@ -159,7 +159,7 @@
       };
     };
     ap39.wifi."platform/10180000.wmac".ssids."EckiTino".psk = "encrypted";
-    ap4.wifi."platform/qca955x_wmac".ssids."jam-circle.de".psk = "encrypted";
+    ap4.wifi."platform/ahb/18100000.wmac".ssids."jam-circle.de".psk = "encrypted";
     ap40.wifi = {
       "pci0000:00/0000:00:00.0".ssids."M".psk = "encrypted";
       "platform/ahb/18100000.wmac".ssids."M legacy".psk = "encrypted";
@@ -202,7 +202,7 @@
       "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";
     };
-    ap5.wifi."platform/qca955x_wmac".ssids."verbalwerk.de".psk = "encrypted";
+    ap5.wifi."platform/ahb/18100000.wmac".ssids."verbalwerk.de".psk = "encrypted";
     ap50.wifi = {
       "1e140000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0".ssids = {
         "ZW stage legacy".psk = "encrypted";
@@ -212,7 +212,7 @@
     };
     ap51.wifi = {
       "pci0000:01/0000:01:00.0".ssids."antrares".psk = "encrypted";
-      "platform/qca955x_wmac".ssids."antrares".psk = "encrypted";
+      "platform/ahb/18100000.wmac".ssids."antrares".psk = "encrypted";
     };
     ap52.wifi = {
       "1e140000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0".ssids."ZW stage legacy".psk = "encrypted";