diff --git a/terraform/0rng.one.tf b/terraform/0rng.one.tf
index 9f58455..9d2ae95 100644
--- a/terraform/0rng.one.tf
+++ b/terraform/0rng.one.tf
@@ -6,7 +6,7 @@ resource "desec_rrset" "orngone_apex" {
   domain  = desec_domain.orngone.name
   subname = ""
   type    = "A"
-  records = gandi_livedns_record.sys_domain_walker.values
+  records = desec_rrset.sys_domain_walker.records
   ttl     = 3600
 }
 
@@ -14,7 +14,7 @@ resource "desec_rrset" "orngone_apex_v6" {
   domain  = desec_domain.orngone.name
   subname = ""
   type    = "AAAA"
-  records = gandi_livedns_record.sys_domain_walker_v6.values
+  records = desec_rrset.sys_domain_walker_v6.records
   ttl     = 3600
 }
 
@@ -30,6 +30,6 @@ resource "desec_rrset" "orngone_who" {
   domain  = desec_domain.orngone.name
   subname = "who"
   type    = "CNAME"
-  records = ["${gandi_livedns_record.sys_domain_pve.name}.${gandi_livedns_record.sys_domain_pve.zone}."]
+  records = ["${desec_rrset.sys_domain_pve.subname}.${desec_rrset.sys_domain_pve.domain}."]
   ttl     = 3600
-}
+}
\ No newline at end of file
diff --git a/terraform/casey_vps.tf b/terraform/casey_vps.tf
index eb129a4..65d7df5 100644
--- a/terraform/casey_vps.tf
+++ b/terraform/casey_vps.tf
@@ -96,10 +96,10 @@ resource "linode_firewall" "casey" {
 
 resource "linode_rdns" "casey_reverse_ipv4" {
   address = linode_instance.casey.ip_address
-  rdns    = "${gandi_livedns_record.sys_domain_casey.name}.${gandi_livedns_record.sys_domain_casey.zone}"
+  rdns    = "${desec_rrset.sys_domain_casey.subname}.${desec_rrset.sys_domain_casey.domain}"
 }
 
 resource "linode_rdns" "casey_reverse_ipv6" {
   address = split("/", linode_instance.casey.ipv6)[0]
-  rdns    = "${gandi_livedns_record.sys_domain_casey.name}.${gandi_livedns_record.sys_domain_casey.zone}"
+  rdns    = "${desec_rrset.sys_domain_casey.subname}.${desec_rrset.sys_domain_casey.domain}"
 }
diff --git a/terraform/grimes_vps.tf b/terraform/grimes_vps.tf
index 239d92f..d183023 100644
--- a/terraform/grimes_vps.tf
+++ b/terraform/grimes_vps.tf
@@ -16,11 +16,11 @@ resource "hcloud_server" "grimes" {
 resource "hcloud_rdns" "grimes_reverse_ipv4" {
   server_id  = hcloud_server.grimes.id
   ip_address = hcloud_server.grimes.ipv4_address
-  dns_ptr    = "${gandi_livedns_record.sys_domain_grimes.name}.${gandi_livedns_record.sys_domain_grimes.zone}"
+  dns_ptr    = "${desec_rrset.sys_domain_grimes.subname}.${desec_rrset.sys_domain_grimes.domain}"
 }
 
 resource "hcloud_rdns" "grimes_reverse_ipv6" {
   server_id  = hcloud_server.grimes.id
   ip_address = hcloud_server.grimes.ipv6_address
-  dns_ptr    = "${gandi_livedns_record.sys_domain_grimes.name}.${gandi_livedns_record.sys_domain_grimes.zone}"
+  dns_ptr    = "${desec_rrset.sys_domain_grimes.subname}.${desec_rrset.sys_domain_grimes.domain}"
 }
diff --git a/terraform/jakehoward.tech.tf b/terraform/jakehoward.tech.tf
index 632c95c..b9a3866 100644
--- a/terraform/jakehoward.tech.tf
+++ b/terraform/jakehoward.tech.tf
@@ -69,7 +69,7 @@ resource "desec_rrset" "jakehowardtech_speed" {
   type    = "CNAME"
   ttl     = 3600
   records = [
-    "${gandi_livedns_record.sys_domain_pve.name}.${gandi_livedns_record.sys_domain_pve.zone}."
+    "${desec_rrset.sys_domain_pve.subname}.${desec_rrset.sys_domain_pve.domain}."
   ]
 }
 
@@ -79,7 +79,7 @@ resource "desec_rrset" "jakehowardtech_media" {
   type    = "CNAME"
   ttl     = 3600
   records = [
-    "${gandi_livedns_record.sys_domain_pve.name}.${gandi_livedns_record.sys_domain_pve.zone}."
+    "${desec_rrset.sys_domain_pve.subname}.${desec_rrset.sys_domain_pve.domain}."
   ]
 }
 
@@ -89,7 +89,7 @@ resource "desec_rrset" "jakehowardtech_matrix" {
   type    = "CNAME"
   ttl     = 3600
   records = [
-    "${gandi_livedns_record.sys_domain_pve.name}.${gandi_livedns_record.sys_domain_pve.zone}."
+    "${desec_rrset.sys_domain_pve.subname}.${desec_rrset.sys_domain_pve.domain}."
   ]
 }
 
@@ -99,7 +99,7 @@ resource "desec_rrset" "jakehowardtech_intersect" {
   type    = "CNAME"
   ttl     = 3600
   records = [
-    "${gandi_livedns_record.sys_domain_pve.name}.${gandi_livedns_record.sys_domain_pve.zone}."
+    "${desec_rrset.sys_domain_pve.subname}.${desec_rrset.sys_domain_pve.domain}."
   ]
 }
 
@@ -109,7 +109,7 @@ resource "desec_rrset" "jakehowardtech_calibre" {
   type    = "CNAME"
   ttl     = 3600
   records = [
-    "${gandi_livedns_record.sys_domain_pve.name}.${gandi_livedns_record.sys_domain_pve.zone}."
+    "${desec_rrset.sys_domain_pve.subname}.${desec_rrset.sys_domain_pve.domain}."
   ]
 }
 
@@ -119,7 +119,7 @@ resource "desec_rrset" "jakehowardtech_homeassistant" {
   type    = "CNAME"
   ttl     = 3600
   records = [
-    "${gandi_livedns_record.sys_domain_pve_private.name}.${gandi_livedns_record.sys_domain_pve_private.zone}."
+    "${desec_rrset.sys_domain_pve_private.subname}.${desec_rrset.sys_domain_pve_private.domain}."
   ]
 }
 
@@ -129,7 +129,7 @@ resource "desec_rrset" "jakehowardtech_grafana" {
   type    = "CNAME"
   ttl     = 3600
   records = [
-    "${gandi_livedns_record.sys_domain_pve.name}.${gandi_livedns_record.sys_domain_pve.zone}."
+    "${desec_rrset.sys_domain_pve.subname}.${desec_rrset.sys_domain_pve.domain}."
   ]
 }
 
@@ -139,7 +139,7 @@ resource "desec_rrset" "jakehowardtech_vaultwarden" {
   type    = "CNAME"
   ttl     = 3600
   records = [
-    "${gandi_livedns_record.sys_domain_pve_private.name}.${gandi_livedns_record.sys_domain_pve_private.zone}."
+    "${desec_rrset.sys_domain_pve_private.subname}.${desec_rrset.sys_domain_pve_private.domain}."
   ]
 }
 
@@ -149,7 +149,7 @@ resource "desec_rrset" "jakehowardtech_recipes" {
   type    = "CNAME"
   ttl     = 3600
   records = [
-    "${gandi_livedns_record.sys_domain_pve.name}.${gandi_livedns_record.sys_domain_pve.zone}."
+    "${desec_rrset.sys_domain_pve.subname}.${desec_rrset.sys_domain_pve.domain}."
   ]
 }
 
@@ -189,7 +189,7 @@ resource "desec_rrset" "jakehowardtech_synapse_admin" {
   type    = "CNAME"
   ttl     = 3600
   records = [
-    "${gandi_livedns_record.sys_domain_pve.name}.${gandi_livedns_record.sys_domain_pve.zone}."
+    "${desec_rrset.sys_domain_pve.subname}.${desec_rrset.sys_domain_pve.domain}."
   ]
 }
 
@@ -199,7 +199,7 @@ resource "desec_rrset" "jakehowardtech_apex" {
   type    = "ALIAS"
   ttl     = 3600
   records = [
-    "${gandi_livedns_record.sys_domain_walker.name}.${gandi_livedns_record.sys_domain_walker.zone}."
+    "${desec_rrset.sys_domain_walker.subname}.${desec_rrset.sys_domain_walker.domain}."
   ]
 }
 
@@ -209,7 +209,7 @@ resource "desec_rrset" "jakehowardtech_collabora" {
   type    = "CNAME"
   ttl     = 3600
   records = [
-    "${gandi_livedns_record.sys_domain_pve.name}.${gandi_livedns_record.sys_domain_pve.zone}."
+    "${desec_rrset.sys_domain_pve.subname}.${desec_rrset.sys_domain_pve.domain}."
   ]
 }
 
@@ -219,7 +219,7 @@ resource "desec_rrset" "jakehowardtech_tasks" {
   type    = "CNAME"
   ttl     = 3600
   records = [
-    "${gandi_livedns_record.sys_domain_pve.name}.${gandi_livedns_record.sys_domain_pve.zone}."
+    "${desec_rrset.sys_domain_pve.subname}.${desec_rrset.sys_domain_pve.domain}."
   ]
 }
 
@@ -229,7 +229,7 @@ resource "desec_rrset" "jakehowardtech_auth" {
   type    = "CNAME"
   ttl     = 3600
   records = [
-    "${gandi_livedns_record.sys_domain_pve.name}.${gandi_livedns_record.sys_domain_pve.zone}."
+    "${desec_rrset.sys_domain_pve.subname}.${desec_rrset.sys_domain_pve.domain}."
   ]
 }
 
@@ -239,7 +239,7 @@ resource "desec_rrset" "jakehowardtech_ntfy" {
   type    = "CNAME"
   ttl     = 3600
   records = [
-    "${gandi_livedns_record.sys_domain_pve.name}.${gandi_livedns_record.sys_domain_pve.zone}."
+    "${desec_rrset.sys_domain_pve.subname}.${desec_rrset.sys_domain_pve.domain}."
   ]
 }
 
@@ -249,7 +249,7 @@ resource "desec_rrset" "jakehowardtech_headscale" {
   type    = "CNAME"
   ttl     = 3600
   records = [
-    "${gandi_livedns_record.sys_domain_casey.name}.${gandi_livedns_record.sys_domain_casey.zone}."
+    "${desec_rrset.sys_domain_casey.subname}.${desec_rrset.sys_domain_casey.domain}."
   ]
 }
 
@@ -259,7 +259,7 @@ resource "desec_rrset" "jakehowardtech_slides" {
   type    = "CNAME"
   ttl     = 3600
   records = [
-    "${gandi_livedns_record.sys_domain_walker.name}.${gandi_livedns_record.sys_domain_walker.zone}."
+    "${desec_rrset.sys_domain_walker.subname}.${desec_rrset.sys_domain_walker.domain}."
   ]
 }
 
@@ -269,7 +269,7 @@ resource "desec_rrset" "jakehowardtech_uptime" {
   type    = "CNAME"
   ttl     = 3600
   records = [
-    "${gandi_livedns_record.sys_domain_pve.name}.${gandi_livedns_record.sys_domain_pve.zone}."
+    "${desec_rrset.sys_domain_pve.subname}.${desec_rrset.sys_domain_pve.domain}."
   ]
 }
 
@@ -279,7 +279,7 @@ resource "desec_rrset" "jakehowardtech_baby-buddy" {
   type    = "CNAME"
   ttl     = 3600
   records = [
-    "${gandi_livedns_record.sys_domain_pve_private.name}.${gandi_livedns_record.sys_domain_pve_private.zone}."
+    "${desec_rrset.sys_domain_pve_private.subname}.${desec_rrset.sys_domain_pve_private.domain}."
   ]
 }
 
@@ -289,7 +289,7 @@ resource "desec_rrset" "jakehowardtech_immich" {
   type    = "CNAME"
   ttl     = 3600
   records = [
-    "${gandi_livedns_record.sys_domain_pve_private.name}.${gandi_livedns_record.sys_domain_pve_private.zone}."
+    "${desec_rrset.sys_domain_pve_private.subname}.${desec_rrset.sys_domain_pve_private.domain}."
   ]
 }
 
@@ -299,7 +299,7 @@ resource "desec_rrset" "jakehowardtech_photos" {
   type    = "CNAME"
   ttl     = 3600
   records = [
-    "${gandi_livedns_record.sys_domain_pve.name}.${gandi_livedns_record.sys_domain_pve.zone}."
+    "${desec_rrset.sys_domain_pve.subname}.${desec_rrset.sys_domain_pve.domain}."
   ]
 }
 
@@ -309,7 +309,7 @@ resource "desec_rrset" "jakehowardtech_freshrss" {
   type    = "CNAME"
   ttl     = 3600
   records = [
-    "${gandi_livedns_record.sys_domain_pve_private.name}.${gandi_livedns_record.sys_domain_pve_private.zone}."
+    "${desec_rrset.sys_domain_pve_private.subname}.${desec_rrset.sys_domain_pve_private.domain}."
   ]
 }
 
@@ -319,7 +319,7 @@ resource "desec_rrset" "jakehowardtech_atuin" {
   type    = "CNAME"
   ttl     = 3600
   records = [
-    "${gandi_livedns_record.sys_domain_pve_private.name}.${gandi_livedns_record.sys_domain_pve_private.zone}."
+    "${desec_rrset.sys_domain_pve_private.subname}.${desec_rrset.sys_domain_pve_private.domain}."
   ]
 }
 
@@ -329,7 +329,7 @@ resource "desec_rrset" "jakehowardtech_karakeep" {
   type    = "CNAME"
   ttl     = 3600
   records = [
-    "${gandi_livedns_record.sys_domain_pve_private.name}.${gandi_livedns_record.sys_domain_pve_private.zone}."
+    "${desec_rrset.sys_domain_pve_private.subname}.${desec_rrset.sys_domain_pve_private.domain}."
   ]
 }
 
diff --git a/terraform/sys_domains.tf b/terraform/sys_domains.tf
index 156fa22..eabc7c2 100644
--- a/terraform/sys_domains.tf
+++ b/terraform/sys_domains.tf
@@ -1,79 +1,79 @@
-resource "gandi_livedns_record" "sys_domain_casey" {
-  zone = data.gandi_livedns_domain.theorangeonenet.id
-  name = "casey.sys"
-  type = "A"
-  ttl  = 3600
-  values = [
+resource "desec_rrset" "sys_domain_casey" {
+  domain  = desec_domain.theorangeonenet.name
+  subname = "casey.sys"
+  type    = "A"
+  ttl     = 3600
+  records = [
     linode_instance.casey.ip_address
   ]
 }
 
-resource "gandi_livedns_record" "sys_domain_casey_v6" {
-  zone = data.gandi_livedns_domain.theorangeonenet.id
-  name = "casey.sys"
-  type = "AAAA"
-  ttl  = 3600
-  values = [
+resource "desec_rrset" "sys_domain_casey_v6" {
+  domain  = desec_domain.theorangeonenet.name
+  subname = "casey.sys"
+  type    = "AAAA"
+  ttl     = 3600
+  records = [
     split("/", linode_instance.casey.ipv6)[0]
   ]
 }
 
-resource "gandi_livedns_record" "sys_domain_walker" {
-  zone = data.gandi_livedns_domain.theorangeonenet.id
-  name = "walker.sys"
-  type = "A"
-  ttl  = 3600
-  values = [
+resource "desec_rrset" "sys_domain_walker" {
+  domain  = desec_domain.theorangeonenet.name
+  subname = "walker.sys"
+  type    = "A"
+  ttl     = 3600
+  records = [
     hcloud_server.walker.ipv4_address
   ]
 }
 
-resource "gandi_livedns_record" "sys_domain_walker_v6" {
-  zone = data.gandi_livedns_domain.theorangeonenet.id
-  name = "walker.sys"
-  type = "AAAA"
-  ttl  = 3600
-  values = [
+resource "desec_rrset" "sys_domain_walker_v6" {
+  domain  = desec_domain.theorangeonenet.name
+  subname = "walker.sys"
+  type    = "AAAA"
+  ttl     = 3600
+  records = [
     hcloud_server.walker.ipv6_address
   ]
 }
 
-resource "gandi_livedns_record" "sys_domain_pve" {
-  zone = data.gandi_livedns_domain.theorangeonenet.id
-  name = "pve.sys"
-  type = "A"
-  ttl  = 3600
-  values = [
+resource "desec_rrset" "sys_domain_pve" {
+  domain  = desec_domain.theorangeonenet.name
+  subname = "pve.sys"
+  type    = "A"
+  ttl     = 3600
+  records = [
     linode_instance.casey.ip_address
   ]
 }
 
-resource "gandi_livedns_record" "sys_domain_pve_private" {
-  zone = data.gandi_livedns_domain.theorangeonenet.id
-  name = "pve-private.sys"
-  type = "AAAA"
-  ttl  = 3600
-  values = [
+resource "desec_rrset" "sys_domain_pve_private" {
+  domain  = desec_domain.theorangeonenet.name
+  subname = "pve-private.sys"
+  type    = "AAAA"
+  ttl     = 3600
+  records = [
     local.private_ipv6_marker
   ]
 }
 
-resource "gandi_livedns_record" "sys_domain_grimes" {
-  zone = data.gandi_livedns_domain.theorangeonenet.id
-  name = "grimes.sys"
-  type = "A"
-  ttl  = 3600
-  values = [
+resource "desec_rrset" "sys_domain_grimes" {
+  domain  = desec_domain.theorangeonenet.name
+  subname = "grimes.sys"
+  type    = "A"
+  ttl     = 3600
+  records = [
     hcloud_server.grimes.ipv4_address
   ]
 }
 
-resource "gandi_livedns_record" "sys_domain_grimes_v6" {
-  zone = data.gandi_livedns_domain.theorangeonenet.id
-  name = "grimes.sys"
-  type = "AAAA"
-  ttl  = 3600
-  values = [
+resource "desec_rrset" "sys_domain_grimes_v6" {
+  domain  = desec_domain.theorangeonenet.name
+  subname = "grimes.sys"
+  type    = "AAAA"
+  ttl     = 3600
+  records = [
     hcloud_server.grimes.ipv6_address
   ]
-}
+}
\ No newline at end of file
diff --git a/terraform/theorangeone.net.tf b/terraform/theorangeone.net.tf
index 8cb1b51..d48af9d 100644
--- a/terraform/theorangeone.net.tf
+++ b/terraform/theorangeone.net.tf
@@ -8,7 +8,7 @@ resource "desec_rrset" "theorangeonenet_git" {
   type    = "CNAME"
   ttl     = 3600
   records = [
-    "${gandi_livedns_record.sys_domain_pve.name}.${gandi_livedns_record.sys_domain_pve.zone}."
+    "${desec_rrset.sys_domain_pve.subname}.${desec_rrset.sys_domain_pve.domain}."
   ]
 }
 
@@ -18,7 +18,7 @@ resource "desec_rrset" "theorangeonenet_whoami" {
   type    = "CNAME"
   ttl     = 3600
   records = [
-    "${gandi_livedns_record.sys_domain_pve.name}.${gandi_livedns_record.sys_domain_pve.zone}."
+    "${desec_rrset.sys_domain_pve.subname}.${desec_rrset.sys_domain_pve.domain}."
   ]
 }
 
@@ -107,7 +107,7 @@ resource "desec_rrset" "theorangeonenet_apex" {
   type    = "ALIAS"
   ttl     = 3600
   records = [
-    "${gandi_livedns_record.sys_domain_walker.name}.${gandi_livedns_record.sys_domain_walker.zone}."
+    "${desec_rrset.sys_domain_walker.subname}.${desec_rrset.sys_domain_walker.domain}."
   ]
 }
 
@@ -127,7 +127,7 @@ resource "desec_rrset" "theorangeonenet_matrix" {
   type    = "CNAME"
   ttl     = 3600
   records = [
-    "${gandi_livedns_record.sys_domain_pve.name}.${gandi_livedns_record.sys_domain_pve.zone}."
+    "${desec_rrset.sys_domain_pve.subname}.${desec_rrset.sys_domain_pve.domain}."
   ]
 }
 
@@ -137,7 +137,7 @@ resource "desec_rrset" "theorangeonenet_plausible" {
   type    = "CNAME"
   ttl     = 3600
   records = [
-    "${gandi_livedns_record.sys_domain_walker.name}.${gandi_livedns_record.sys_domain_walker.zone}."
+    "${desec_rrset.sys_domain_walker.subname}.${desec_rrset.sys_domain_walker.domain}."
   ]
 }
 
@@ -147,7 +147,7 @@ resource "desec_rrset" "theorangeonenet_plausible_bare" {
   type    = "CNAME"
   ttl     = 3600
   records = [
-    "${gandi_livedns_record.sys_domain_walker.name}.${gandi_livedns_record.sys_domain_walker.zone}."
+    "${desec_rrset.sys_domain_walker.subname}.${desec_rrset.sys_domain_walker.domain}."
   ]
 }
 
@@ -167,7 +167,7 @@ resource "desec_rrset" "theorangeonenet_bin" {
   type    = "CNAME"
   ttl     = 3600
   records = [
-    "${gandi_livedns_record.sys_domain_pve.name}.${gandi_livedns_record.sys_domain_pve.zone}."
+    "${desec_rrset.sys_domain_pve.subname}.${desec_rrset.sys_domain_pve.domain}."
   ]
 }
 
@@ -207,7 +207,7 @@ resource "desec_rrset" "theorangeonenet_mastodon" {
   type    = "CNAME"
   ttl     = 3600
   records = [
-    "${gandi_livedns_record.sys_domain_grimes.name}.${gandi_livedns_record.sys_domain_grimes.zone}."
+    "${desec_rrset.sys_domain_grimes.subname}.${desec_rrset.sys_domain_grimes.domain}."
   ]
 }
 
@@ -217,7 +217,7 @@ resource "desec_rrset" "theorangeonenet_comentario" {
   type    = "CNAME"
   ttl     = 3600
   records = [
-    "${gandi_livedns_record.sys_domain_walker.name}.${gandi_livedns_record.sys_domain_walker.zone}."
+    "${desec_rrset.sys_domain_walker.subname}.${desec_rrset.sys_domain_walker.domain}."
   ]
 }
 
@@ -227,7 +227,7 @@ resource "desec_rrset" "theorangeonenet_bsky" {
   type    = "CNAME"
   ttl     = 3600
   records = [
-    "${gandi_livedns_record.sys_domain_grimes.name}.${gandi_livedns_record.sys_domain_grimes.zone}."
+    "${desec_rrset.sys_domain_grimes.subname}.${desec_rrset.sys_domain_grimes.domain}."
   ]
 }
 
diff --git a/terraform/walker_vps.tf b/terraform/walker_vps.tf
index 5691946..67d35a9 100644
--- a/terraform/walker_vps.tf
+++ b/terraform/walker_vps.tf
@@ -16,11 +16,11 @@ resource "hcloud_server" "walker" {
 resource "hcloud_rdns" "walker_reverse_ipv4" {
   server_id  = hcloud_server.walker.id
   ip_address = hcloud_server.walker.ipv4_address
-  dns_ptr    = "${gandi_livedns_record.sys_domain_walker.name}.${gandi_livedns_record.sys_domain_walker.zone}"
+  dns_ptr    = "${desec_rrset.sys_domain_walker.subname}.${desec_rrset.sys_domain_walker.domain}"
 }
 
 resource "hcloud_rdns" "walker_reverse_ipv6" {
   server_id  = hcloud_server.walker.id
   ip_address = hcloud_server.walker.ipv6_address
-  dns_ptr    = "${gandi_livedns_record.sys_domain_walker.name}.${gandi_livedns_record.sys_domain_walker.zone}"
+  dns_ptr    = "${desec_rrset.sys_domain_walker.subname}.${desec_rrset.sys_domain_walker.domain}"
 }