diff --git a/linux/blitzar/zfs.nix b/linux/blitzar/zfs.nix
index 1f46715..4e0c76e 100644
--- a/linux/blitzar/zfs.nix
+++ b/linux/blitzar/zfs.nix
@@ -70,7 +70,7 @@
               {
                 type = "grid";
                 regex = "^zrepl-.*";
-                grid = lib.concatStringsSep " | " ["1x1h(keep=all)" "365x1d" "52x1w"];
+                grid = lib.concatStringsSep " | " ["1x1h(keep=all)" "30x1d" "52x1w"];
               }
             ];
           };
diff --git a/linux/singularity/headscale.nix b/linux/singularity/headscale.nix
index e4ed077..c5d80b5 100644
--- a/linux/singularity/headscale.nix
+++ b/linux/singularity/headscale.nix
@@ -4,7 +4,10 @@
       enable = true;
       address = localhost;
       port = port.headscale;
-      settings.server_url = "https://headscale.${domain}";
+      settings = {
+        dns.base_domain = "tailscale.${domain}";
+        server_url = "https://headscale.${domain}";
+      };
     };
     tailscale = {
       enable = true;