diff --git a/zones/pvv.ntnu.no.nix b/zones/pvv.ntnu.no.nix
index 2319f34..cde5177 100644
--- a/zones/pvv.ntnu.no.nix
+++ b/zones/pvv.ntnu.no.nix
@@ -1,16 +1,20 @@
 { dns, lib, ... }:
 
 lib.recursiveUpdate (import ../pvv-domain.nix { inherit dns lib; }) {
+  DKIM = [
+    {
+      selector = "mail";
+      h = [ "sha256" ];
+      k = "rsa";
+      p = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsLAI4Fj8lGS1gQbumMCftoynu9G5LCOrs8G/EzbXysKuV5EtCCS3ioJVdt3Bbu5RoTZq0lv0KbIClzW7qPa3u0spt9skOQswkSOhzoraPIwPacEUBRMyc2NYSmnIPthKyb6BTAYB1qcKpRswrNzZ6zbsG8DFD8zEJsbpPGjYSxbluLm+FsQXiX21Biha+psCpDTAGcQODri+Fh5UChYi7MnT7UGd8rvNIYlVPAYPeU0xoUcRRZxHfxLNyOU6TrFQ3MhjSKq06p35y3nN2z/6hjbkxQ8aKc30GB+y2SPrTE8TAXKmIMlWbmhaReFHhOS25XGWfzNVhUfNxa21b5UY7wIDAQAB";
+    }
+  ];
+
   subdomains = {
     # *.stackit.pvv.ntnu.no handled by openstack-designate
     stackit.NS = [
       "ns1.stack.it.ntnu.no."
       "ns2.stack.it.ntnu.no."
     ];
-
-    # DKIM
-    "mail._domainkey".TXT = [
-      "v=DKIM1; h=sha256; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsLAI4Fj8lGS1gQbumMCftoynu9G5LCOrs8G/EzbXysKuV5EtCCS3ioJVdt3Bbu5RoTZq0lv0KbIClzW7qPa3u0spt9skOQswkSOhzoraPIwPacEUBRMyc2NYSmnIPthKyb6BTAYB1qcKpRswrNzZ6zbsG8DFD8zEJsbpPGjYSxbluLm+FsQXiX21Biha+psCpDTAGcQODri+Fh5UChYi7MnT7UGd8rvNIYlVPAYPeU0xoUcRRZxHfxLNyOU6TrFQ3MhjSKq06p35y3nN2z/6hjbkxQ8aKc30GB+y2SPrTE8TAXKmIMlWbmhaReFHhOS25XGWfzNVhUfNxa21b5UY7wIDAQAB"
-    ];
   };
 }
diff --git a/zones/pvv.org.nix b/zones/pvv.org.nix
index c1cb934..45a36cb 100644
--- a/zones/pvv.org.nix
+++ b/zones/pvv.org.nix
@@ -3,14 +3,23 @@
 lib.recursiveUpdate (import ../pvv-domain.nix { inherit dns lib; }) {
   CNAME = [ "www.pvv.org" ];
 
-  subdomains = {
-    # DKIM
-    "mail._domainkey".TXT = [
-      "v=DKIM1; h=sha256; k=rsa;p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwfk8XRbUjXEmnqkZHu6+zH+D6Z26mXZt3SZzKStCdoCz8YGE4N7z4WapOXp/q/5SygY4RJbKvPBi60C0TDTeTbVZ479BGwqveDW3Xa0j7SWE4zM8ygB9wF7iPut4zeQUVPsswpF7FOx4wV8mdECvpjPHr3LmfIcvyJvAy4Au/Vu6hU841sXuMHq0FOUNSz4vcnhgv8uy+QHW38uWqu5D7arL4Md19xGu1Wm5t6m2qegSM1ygWC1kxf2zVHC3dhVInLdc6UPCOZhxhSOYHVRW6muSu6pSxcvJcBLNLBmGBUhEAnkpSfAtq0db6lWl+IcjR9yDfpw2+Q0ULTwhtbY3HQIDAQAB"
-    ];
+  DKIM = [
+    {
+      selector = "mail";
+      h = [ "sha256" ];
+      k = "rsa";
+      p = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwfk8XRbUjXEmnqkZHu6+zH+D6Z26mXZt3SZzKStCdoCz8YGE4N7z4WapOXp/q/5SygY4RJbKvPBi60C0TDTeTbVZ479BGwqveDW3Xa0j7SWE4zM8ygB9wF7iPut4zeQUVPsswpF7FOx4wV8mdECvpjPHr3LmfIcvyJvAy4Au/Vu6hU841sXuMHq0FOUNSz4vcnhgv8uy+QHW38uWqu5D7arL4Md19xGu1Wm5t6m2qegSM1ygWC1kxf2zVHC3dhVInLdc6UPCOZhxhSOYHVRW6muSu6pSxcvJcBLNLBmGBUhEAnkpSfAtq0db6lWl+IcjR9yDfpw2+Q0ULTwhtbY3HQIDAQAB";
+    }
+  ];
 
-    "mail._domainkey.list".TXT = [
-      "v=DKIM1; h=sha256; k=rsa;p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxe+hAmB+L9QpPc6q05pRuG/opqnajHV8BydpABgxGbo5gv6RD4JadB9Ve2+38LJ7t7hdjdkIcZA39njFlpekO3ShcjlHi1JpgZ42pSdUbLihRbKnQoAX63WelC8cT7zstpoE31yOlVAyEcMipnc/9pYYX5VsiJEH6iZUyqNu5X81Sldt6EGqCNE+f+fW1ZC1jXICWJ94Ky52qbmra//u/gdHLX/yDSf3W6nU8IRhQf53nORrUOLacEC61mJiCFGmc7u41HYoh50xRLbd5ZLtKPZ/brgEuxQCJsQikqO67l52p6VJskn+1sBof3M6jdsl2e/M2xayrmQqpvEXZpjFCQIDAQAB"
+  subdomains = {
+    list.DKIM = [
+      {
+        selector = "mail";
+        h = [ "sha256" ];
+        k = "rsa";
+        p = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxe+hAmB+L9QpPc6q05pRuG/opqnajHV8BydpABgxGbo5gv6RD4JadB9Ve2+38LJ7t7hdjdkIcZA39njFlpekO3ShcjlHi1JpgZ42pSdUbLihRbKnQoAX63WelC8cT7zstpoE31yOlVAyEcMipnc/9pYYX5VsiJEH6iZUyqNu5X81Sldt6EGqCNE+f+fW1ZC1jXICWJ94Ky52qbmra//u/gdHLX/yDSf3W6nU8IRhQf53nORrUOLacEC61mJiCFGmc7u41HYoh50xRLbd5ZLtKPZ/brgEuxQCJsQikqO67l52p6VJskn+1sBof3M6jdsl2e/M2xayrmQqpvEXZpjFCQIDAQAB";
+      }
     ];
   };
 }