diff --git a/terraform/gandi.nix b/terraform/gandi.nix
index cf7c6a7..c3ee37d 100644
--- a/terraform/gandi.nix
+++ b/terraform/gandi.nix
@@ -31,7 +31,7 @@ in
 
       # TODO: make less fragile and have actual unique and stable names
       canonicalName = record: let
-        name = builtins.replaceStrings ["."] ["_"] record.name;
+        name = builtins.replaceStrings ["." "@"] ["_" "_root_"] record.name;
       in
         "forkos_org_${record.type}_${name}";
 
@@ -44,6 +44,9 @@ in
         }) records);
 
     in forkosRecords [
+      # (record "@" 3600 "A" ["163.172.69.160"])
+      (record "@" 3600 "AAAA" ["2001:bc8:38ee:100:1000::20"])
+
       (record "cl" 3600 "A" ["163.172.69.160"])
       (record "cl" 3600 "AAAA" ["2001:bc8:38ee:100:1000::10"])
 
@@ -58,10 +61,12 @@ in
       (record "fodwatch.infra" 3600 "AAAA" ["2001:bc8:38ee:100:1000::30"])
       (record "meta01.infra" 3600 "AAAA" ["2001:bc8:38ee:100:1000::20"])
 
-      (record "grafana" 3600 "CNAME" ["netbox"])
       (record "hydra" 3600 "CNAME" ["bagel-box.infra"])
+
+      (record "grafana" 3600 "CNAME" ["meta01.infra"])
       (record "loki" 3600 "CNAME" ["meta01.infra"])
-      (record "mimir" 3600 "CNAME" ["grafana"])
+      (record "mimir" 3600 "CNAME" ["meta01.infra"])
+      (record "matrix" 3600 "CNAME" ["meta01.infra"])
     ];
   };
 }