diff --git a/domains/fudo.org.nix b/domains/fudo.org.nix
index ed71f54..51935b0 100644
--- a/domains/fudo.org.nix
+++ b/domains/fudo.org.nix
@@ -19,8 +19,10 @@
   ldap-servers = [ "germany" "legatus" ];
   zone = "fudo.org";
   xmpp-servers = [ "germany" ];
-  prometheus-hosts = [ "germany" ];
-  grafana-hosts = [ "nutboy3" ];
+  metrics = {
+    prometheus-host = "germany";
+    grafana-host = "germany";
+  };
   postgresql-server = "nutboy3";
   log-aggregator = "germany";
   chat-server = "legatus";
diff --git a/domains/informis.land.nix b/domains/informis.land.nix
index d56c907..b945af3 100644
--- a/domains/informis.land.nix
+++ b/domains/informis.land.nix
@@ -10,12 +10,13 @@
 
   ldap-servers = [ "locum" ];
   kerberos-master = "locum";
-  # primary-nameserver = "procul";
-  # primary-mailserver = "locum";
+
   zone = "informis.land";
-  prometheus-hosts = [ "locum" ];
   postgresql-server = "procul";
-  grafana-hosts = [ "locum" ];
+  metrics = {
+    grafanaHost = "locum";
+    prometheusHost = "locum";
+  };
   log-aggregator = "locum";
   backplane = {
     dns-service = "nutboy3";
diff --git a/domains/sea.fudo.org.nix b/domains/sea.fudo.org.nix
index aa8fffc..d22a790 100644
--- a/domains/sea.fudo.org.nix
+++ b/domains/sea.fudo.org.nix
@@ -15,8 +15,11 @@
   postgresql-server = "nostromo";
   kerberos-master = "nostromo";
 
-  prometheus-hosts = [ "fimbria" ];
-  grafana-hosts = [ "nostromo" ];
+  metrics = {
+    prometheusHost = "fimbria";
+    grafanaHost = "nostromo";
+  };
+
   log-aggregator = "nostromo";
   backplane = {
     dns-service = "nutboy3";