diff --git a/README.md b/README.md
index 364e766..a22e277 100644
--- a/README.md
+++ b/README.md
@@ -21,9 +21,13 @@ Per comodità una volta assegnato un IP questo deve essere impostato su PiHole c
 - Zigbee2Mqtt
 - Metrics: Grafana and Promethus
 
-## Services missing
+## Services missing and TODO
 
-- Uptime Kuma
+- [x] Uptime Kuma
+- [ ] Authentik for Arr services
+- [x] Change mail notification provider
+- [x] Remove pc key from agenix secrets
+- [x] Remove passwordless SSH login for normal user
 
 ## How to
 
diff --git a/hosts/parameters.nix b/hosts/parameters.nix
index 68bf39d..fd504cf 100644
--- a/hosts/parameters.nix
+++ b/hosts/parameters.nix
@@ -1,29 +1,33 @@
+let
+  public-domain = "pasetto.me";
+  private-domain = "home.${public-domain}";
+  ts-domain = "bison-altair.ts.net";
+in
 {
   domains = {
-    public = "pasetto.me";
-    tsDns = "bison-altair.ts.net";
+    public = public-domain;
+    tsDns = ts-domain;
   };
   hosts = {
-    homeassistant = "ha.internal";
-    authentik = "auth.internal";
-    arr = "arr.internal";
-    caddy = "caddy.home.pasetto.me";
-    metrics = "metrics.internal";
-    nextcloud = "nextcloud.internal";
-    vaultwarden = "vaultwarden.internal";
-    plex = "plex.internal";
-    portainer = "portainer.internal";
-    colmena = "colmena.internal";
-    pve01 = "bacco.internal";
-    pve02 = "node.internal";
+    homeassistant = "ha.${private-domain}";
+    authentik = "authentik.${private-domain}";
+    arr = "arr.${private-domain}";
+    caddy = "caddy.${private-domain}";
+    metrics = "metrics.${private-domain}";
+    nextcloud = "nextcloud.${private-domain}";
+    vaultwarden = "vaultwarden.${private-domain}";
+    plex = "plex.${private-domain}";
+    portainer = "portainer.${private-domain}";
+    colmena = "colmena.${private-domain}";
+    pve01 = "bacco${private-domain}";
+    pve02 = "node.${private-domain}";
     dns01 = "192.168.1.2";
     dns02 = "192.168.1.3";
-    shadowsocks = "shadowsocks.internal";
-    librechat = "librechat.internal";
-    immich = "immich.internal";
-    firefly-iii = "firefly-iii.internal";
-    paperless = "paperless.internal";
-    zigbee2mqtt = "zigbee2mqtt.internal";
+    shadowsocks = "shadowsocks.${private-domain}";
+    immich = "immich.${private-domain}";
+    firefly-iii = "firefly-iii.${private-domain}";
+    paperless = "paperless.${private-domain}";
+    zigbee2mqtt = "zigbee2mqtt.${private-domain}";
   };
-  email = "davide@pasetto.me";
+  email = "davide@${public-domain}";
 }