diff --git a/meta/dns.nix b/meta/dns.nix
index 4d2cb43..d3f4caf 100644
--- a/meta/dns.nix
+++ b/meta/dns.nix
@@ -16,79 +16,66 @@ let
     "dev" = "dev.pages.codeberg.page.";
     "irc" = "public.p.lahfa.xyz.";
     "webmail" = "kurisu.dual.lahfa.xyz.";
-
-    "*.cal" = "cal.dgnum.eu.";
-    "retired" = "web-static";
-    "eleves" = "web-static";
-    "qr" = "web-static";
   };
 
   hosted = fuseAttrs (
     builtins.attrValues (
       builtins.mapAttrs mkHosted {
         compute01 = [
-          # Nextcloud
-          "cloud"
-          # Collabora Online
-          "code"
-          # Démarches Normaliennes
-          "demarches"
-          # Outline
-          "docs"
-          # Hedgedoc
-          "pads"
-          # Vaultwarden
-          "pass"
-          # Mastodon
-          "social"
-          # R Studio
-          "rstudio"
-          # Satosa
-          "saml-idp"
-          # Kanidm
-          "sso"
-          # Support
-          "support"
+          "cloud" # Nextcloud
+          "code" # Collabora Online
+          "demarches" # Démarches Normaliennes
+          "docs" # Outline
+          "grafana" # Grafana
+          "nms" # LibreNMS
+          "pads" # Hedgedoc
+          "pass" # Vaultwarden
+          "saml-idp" # Satosa
+          "social" # Mastodon
+          "sso" # Kanidm
+          "support" # Zammad support
+          "telegraf" # Telegraf
         ];
 
         storage01 = [
-          # Attic
-          "cachix"
-          # Forgejo
-          "git"
-          # Netbird
-          "netbird"
+          "cachix" # Attic
+          "git" # Forgejo
+          "influx" # InfluxDB
+          "netbird" # Netbird
+          "prometheus" # Prometheus
+          "videos" # Peertube
+
           # Garage S3
-          "cdn"
-          "s3"
           "*.cdn"
           "*.s3"
-          # Peertube
-          "videos"
+          "cdn"
+          "s3"
         ];
 
         web01 = [
-          # Plausible Analytics
-          "analytics"
+          "*.wp" # Wordpress
+          "analytics" # Plausible Analytics
+          "calendrier" # Metis
+          "netbox" # Netbox
+          "podcasts" # Castopod
+          "push" # Ntfy.sh
+
+          # Static websites
+          "eleves"
+          "migrated.rz"
+          "qr"
+          "retired"
+          "web-static"
+
           # Linkal
           "*.cal"
           "cal"
           "linkal"
-          # Metis
-          "calendrier"
-          # Static websites
-          "web-static"
+
           # Crab Fit
           "api.meet"
           "meet"
-          # ???
-          "erp"
-          # Castopod
-          "podcasts"
-          # Ntfy.sh
-          "push"
-          # Wordpress
-          "*.wp"
+          "rdv" # C.f. loi Toubon
         ];
       }
     )