diff --git a/flake.lock b/flake.lock
index e786722..f382057 100644
--- a/flake.lock
+++ b/flake.lock
@@ -216,11 +216,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713453913,
-        "narHash": "sha256-vbXq52VRlL1defMHrwhsoeHm95O3mFefsSSJyNEghbA=",
+        "lastModified": 1713294767,
+        "narHash": "sha256-LmaabaQZdx52MPGKPRt9Opoc9Gd9RbwvCdysUUYQoXI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "178e26895b3aef028a00a32fb7e7ed0fc660645c",
+        "rev": "fa8c16e2452bf092ac76f09ee1fb1e9f7d0796e7",
         "type": "github"
       },
       "original": {
diff --git a/hosts/falkenstein/modules/dns/default.nix b/hosts/falkenstein/modules/dns/default.nix
index 0447cf2..520990e 100644
--- a/hosts/falkenstein/modules/dns/default.nix
+++ b/hosts/falkenstein/modules/dns/default.nix
@@ -1,22 +1,18 @@
 { self, pkgs, lib, config, dns, ... }:
 let
+  modulo = number: mod: (number - ((number / mod) * mod));
   secondary = "185.181.104.96";
-  domain = config.networking.domain;
-  zonefile = with dns.lib.combinators; pkgs.writeText "rfive.de.zone.txt" (dns.lib.toString domain {
+  zonefile = with dns.lib.combinators; pkgs.writeText "rfive.de.zone.txt" (dns.lib.toString "rfive.de" {
     TTL = 3600;
-    SOA =
-      let
-        modulo = number: mod: (number - ((number / mod) * mod));
-      in
-      {
-        nameServer = "ns.rfive.de.";
-        adminEmail = "hostmaster@rfive.de";
-        serial = lib.strings.toInt (builtins.substring 0 8 self.sourceInfo.lastModifiedDate + toString ((modulo self.sourceInfo.lastModified 86400) / 864));
-        refresh = 10800;
-        retry = 3600;
-        expire = 604800;
-        minimum = 3600;
-      };
+    SOA = {
+      nameServer = "ns.rfive.de.";
+      adminEmail = "hostmaster@rfive.de";
+      serial = lib.strings.toInt (builtins.substring 0 8 self.sourceInfo.lastModifiedDate + toString ((modulo self.sourceInfo.lastModified 86400) / 864));
+      refresh = 10800;
+      retry = 3600;
+      expire = 604800;
+      minimum = 3600;
+    };
     NS = [
       "ns.inwx.de."
       "ns2.inwx.de."
@@ -33,29 +29,24 @@ let
       (spf.soft [ "mx" ])
     ];
 
-    subdomains =
-      let
-        getVirtualHosts = hostname: map (name: builtins.substring 0 (builtins.stringLength name - (builtins.stringLength domain + 1)) name) (builtins.attrNames self.nixosConfigurations."${hostname}".config.services.nginx.virtualHosts);
-        genCNAMEs = hostname: lib.attrsets.genAttrs (getVirtualHosts hostname) (label: { CNAME = [ "${hostname}.${domain}." ]; });
-      in
-      lib.attrsets.mergeAttrsList [
-        rec {
-          nuc = {
-            A = [ "141.30.227.6" ];
-          };
-          falkenstein = {
-            A = [ "23.88.121.184" ];
-            AAAA = [ "2a01:4f8:c012:49de::1" ];
-          };
-          ns = falkenstein;
-          mail = falkenstein;
-          _dmarc.TXT = [ "v=DMARC1; p=none; adkim=s; fo=1; rua=mailto:dmarc@rfive.de; ruf=mailto:dmarc@rfive.de" ];
-          _domainkey.subdomains.rspamd.TXT = [ "v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDoirUMubro4nlmY6a8JMwK9QB2agAXiJzexDU/7ba6KCggONfoSTfUHlrM/XeM1GG/9oKpngApxDPP97adJuxc8/EELyo4HjTyYD8GBFZhg0AN7V8IPaJ1o5k6dGDk8ZLh41ZCnlAVWkhVSKs5pYtzkrlJIfUSzyuoe8nuFsVe3QIDAQAB" ];
+    subdomains = lib.attrsets.mergeAttrsList [
+      rec {
+        nuc = {
+          A = [ "141.30.227.6" ];
+        };
+        falkenstein = {
+          A = [ "23.88.121.184" ];
+          AAAA = [ "2a01:4f8:c012:49de::1" ];
+        };
+        ns = falkenstein;
+        mail = falkenstein;
+        _dmarc.TXT = [ "v=DMARC1; p=none; adkim=s; fo=1; rua=mailto:dmarc@rfive.de; ruf=mailto:dmarc@rfive.de" ];
+        _domainkey.subdomains.rspamd.TXT = [ "v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDoirUMubro4nlmY6a8JMwK9QB2agAXiJzexDU/7ba6KCggONfoSTfUHlrM/XeM1GG/9oKpngApxDPP97adJuxc8/EELyo4HjTyYD8GBFZhg0AN7V8IPaJ1o5k6dGDk8ZLh41ZCnlAVWkhVSKs5pYtzkrlJIfUSzyuoe8nuFsVe3QIDAQAB" ];
 
-        }
-        (genCNAMEs "nuc")
-        (builtins.removeAttrs (genCNAMEs "falkenstein") [ "mail" ])
-      ];
+      }
+      (lib.attrsets.genAttrs [ "cache" "chat" "matrix" "seafile" "vault" ] (label: { CNAME = [ "nuc.rfive.de." ]; }))
+      (lib.attrsets.genAttrs [ "purge" "rspamd" "trucks" ] (label: { CNAME = [ "falkenstein.rfive.de." ]; }))
+    ];
   });
 in
 {
diff --git a/hosts/falkenstein/modules/networks/default.nix b/hosts/falkenstein/modules/networks/default.nix
index 33dc1d7..2efbd03 100644
--- a/hosts/falkenstein/modules/networks/default.nix
+++ b/hosts/falkenstein/modules/networks/default.nix
@@ -90,11 +90,7 @@
       networkConfig = {
         Address = "192.168.43.4/32";
         DNS = "192.168.43.1";
-        Domains = [
-          "~vpn.rfive.de"
-          "~42.168.192.in-addr.arpa"
-          "~43.168.192.in-addr.arpa"
-        ];
+        Domains = "~vpn.rfive.de ~43.168.192.in-addr.arpa";
         DNSSEC = false;
         BindCarrier = [ "ens3" ];
       };
diff --git a/hosts/thinkpad/modules/networks/default.nix b/hosts/thinkpad/modules/networks/default.nix
index adfaf20..c00bec5 100644
--- a/hosts/thinkpad/modules/networks/default.nix
+++ b/hosts/thinkpad/modules/networks/default.nix
@@ -25,7 +25,6 @@
     nmap
     curlFull
     wireguard-tools
-    etherape
   ];
   services.timesyncd.servers = lib.mkForce [ ];
   services.resolved = {
@@ -166,11 +165,7 @@
       networkConfig = {
         Address = "192.168.43.3/32";
         DNS = "192.168.43.1";
-        Domains = [
-          "~vpn.rfive.de"
-          "~42.168.192.in-addr.arpa"
-          "~43.168.192.in-addr.arpa"
-        ];
+        Domains = "~vpn.rfive.de ~43.168.192.in-addr.arpa";
         DNSSEC = false;
       };
     };