diff --git a/machines/dns01/beta.dgnum.eu.nix b/machines/dns01/beta.dgnum.eu.nix
index 44d903d..d7129c3 100644
--- a/machines/dns01/beta.dgnum.eu.nix
+++ b/machines/dns01/beta.dgnum.eu.nix
@@ -3,9 +3,11 @@
 with dns.lib.combinators;
 {
   SOA = {
-    nameServer = "ns1";
-    adminEmail = "webmaster@dgnum.eu";
+    nameServer = "ns01.beta.dgnum.eu";
+    adminEmail = "dns@dgnum.eu";
     serial = 2019030800;
+    retry = 3600;
+    minimum = 300;
   };
 
   NS = [
@@ -16,7 +18,36 @@ with dns.lib.combinators;
   #AAAA = [ "4321:0:1:2:3:4:567:89ab" ];
 
   subdomains = {
+    # Hosted services
+    # NOTE: for now manually supplied, in the future automatically filled in
     photoprism = host "129.199.146.101" null;
     immich = host "129.199.146.101" null;
+
+    # Nameservers
+    # TODO: fill this in
+    ns01 = host "" null;
+
+    # *.infra.beta.dgnum.eu
+    infra = {
+      subdomains = mapAttrs' (
+        host:
+        { site, ... }:
+        # NOTE: Originally "${host}.${site}"
+        # I think it makes sense to ditch the site info in the case of the lab
+        nameValuePair "${host}" (
+          with meta.network.${host}.addresses;
+          {
+            A = ipv4;
+            # FIXME: Enable ipv6 in all VM nodes
+
+            #AAAA = ipv6;
+            subdomains = {
+              v4.A = ipv4;
+              #v6.AAAA = ipv6;
+            };
+          }
+        )
+      ) meta.nodes;
+    };
   };
 }