diff --git a/infrastructure/terraform/dynu/records.tf b/infrastructure/terraform/dynu/records.tf
index 1aa7ca7..00847bd 100644
--- a/infrastructure/terraform/dynu/records.tf
+++ b/infrastructure/terraform/dynu/records.tf
@@ -1,7 +1,6 @@
 locals {
-  dynu_dns_records_catalog = {
+  dynu_dns_records_catalog_base = {
     auth = {
-      fqdn        = "auth.lan.ddnsgeek.com"
       hostname    = "auth"
       service     = "authelia"
       source      = "core/authelia/docker-compose.yml"
@@ -12,7 +11,6 @@ locals {
       proxied     = null
     }
     gitea = {
-      fqdn        = "gitea.lan.ddnsgeek.com"
       hostname    = "gitea"
       service     = "gitea"
       source      = "apps/gitea/docker-compose.yml"
@@ -23,7 +21,6 @@ locals {
       proxied     = null
     }
     gotify = {
-      fqdn        = "gotify.lan.ddnsgeek.com"
       hostname    = "gotify"
       service     = "gotify"
       source      = "monitoring/gotify/docker-compose.yml"
@@ -34,7 +31,6 @@ locals {
       proxied     = null
     }
     grafana = {
-      fqdn        = "grafana.lan.ddnsgeek.com"
       hostname    = "grafana"
       service     = "grafana"
       source      = "monitoring/grafana/docker-compose.yml"
@@ -45,7 +41,6 @@ locals {
       proxied     = null
     }
     familytree = {
-      fqdn        = "familytree.lan.ddnsgeek.com"
       hostname    = "familytree"
       service     = "gramps"
       source      = "apps/gramps/docker-compose.yml"
@@ -56,7 +51,6 @@ locals {
       proxied     = null
     }
     influxdb = {
-      fqdn        = "influxdb.lan.ddnsgeek.com"
       hostname    = "influxdb"
       service     = "influxdb"
       source      = "monitoring/influxdb/docker-compose.yml"
@@ -67,7 +61,6 @@ locals {
       proxied     = null
     }
     monitor_kuma = {
-      fqdn        = "monitor-kuma.lan.ddnsgeek.com"
       hostname    = "monitor-kuma"
       service     = "uptime-kuma"
       source      = "monitoring/uptime-kuma/docker-compose.yml"
@@ -78,7 +71,6 @@ locals {
       proxied     = null
     }
     mtls_bridge = {
-      fqdn        = "mtls-bridge.lan.ddnsgeek.com"
       hostname    = "mtls-bridge"
       service     = "mtls-bridge"
       source      = "monitoring/mtls-bridge/docker-compose.yml"
@@ -89,7 +81,6 @@ locals {
       proxied     = null
     }
     nextcloud = {
-      fqdn        = "nextcloud.lan.ddnsgeek.com"
       hostname    = "nextcloud"
       service     = "nextcloud-webapp"
       source      = "apps/nextcloud/docker-compose.yml"
@@ -100,7 +91,6 @@ locals {
       proxied     = null
     }
     node_red = {
-      fqdn        = "node-red.lan.ddnsgeek.com"
       hostname    = "node-red"
       service     = "node-red"
       source      = "monitoring/node-red/docker-compose.yml"
@@ -111,7 +101,6 @@ locals {
       proxied     = null
     }
     passbolt = {
-      fqdn        = "passbolt.lan.ddnsgeek.com"
       hostname    = "passbolt"
       service     = "passbolt-webapp"
       source      = "apps/passbolt/docker-compose.yml"
@@ -122,7 +111,6 @@ locals {
       proxied     = null
     }
     portainer = {
-      fqdn        = "portainer.lan.ddnsgeek.com"
       hostname    = "portainer"
       service     = "portainer"
       source      = "monitoring/portainer/docker-compose.yml"
@@ -133,7 +121,6 @@ locals {
       proxied     = null
     }
     prometheus = {
-      fqdn        = "prometheus.lan.ddnsgeek.com"
       hostname    = "prometheus"
       service     = "prometheus"
       source      = "monitoring/prometheus/docker-compose.yml"
@@ -143,9 +130,7 @@ locals {
       target      = null
       proxied     = null
     }
-
     searxng = {
-      fqdn        = "searxng.lan.ddnsgeek.com"
       hostname    = "searxng"
       service     = "searxng"
       source      = "apps/searxng/docker-compose.yml"
@@ -156,7 +141,6 @@ locals {
       proxied     = null
     }
     traefik = {
-      fqdn        = "traefik.lan.ddnsgeek.com"
       hostname    = "traefik"
       service     = "traefik"
       source      = "core/traefik/docker-compose.yml"
@@ -167,4 +151,11 @@ locals {
       proxied     = null
     }
   }
+
+  dynu_dns_records_catalog = {
+    for key, record in local.dynu_dns_records_catalog_base :
+    key => merge(record, {
+      fqdn = format("%s.%s", record.hostname, local.dynu_domain)
+    })
+  }
 }