diff --git a/skylab/infra/playbooks/terraform/domain.enp.tf b/skylab/infra/playbooks/terraform/domain.enp.tf
index 69591e9..3fe914b 100644
--- a/skylab/infra/playbooks/terraform/domain.enp.tf
+++ b/skylab/infra/playbooks/terraform/domain.enp.tf
@@ -17,7 +17,7 @@ resource "digitalocean_record" "enp_en1" {
   domain = digitalocean_domain.enp.id
   type   = "A"
   name   = "en1"
-  value  = "24.2.156.189"
+  value  = digitalocean_record.enp.value
   ttl    = 3600
 }
 
@@ -28,7 +28,7 @@ resource "digitalocean_record" "enp_vcs" {
   domain = digitalocean_domain.enp.id
   type   = "CNAME"
   name   = "vcs"
-  value  = "en1.enp.one."
+  value  = "${digitalocean_record.enp_en1.fqdn}."
   ttl    = 10600
 }
 
@@ -36,7 +36,7 @@ resource "digitalocean_record" "enp_ssv" {
   domain = digitalocean_domain.enp.id
   type   = "CNAME"
   name   = "ssv"
-  value  = "en1.enp.one."
+  value  = "${digitalocean_record.enp_en1.fqdn}."
   ttl    = 10600
 }
 
@@ -44,7 +44,7 @@ resource "digitalocean_record" "enp_pms" {
   domain = digitalocean_domain.enp.id
   type   = "CNAME"
   name   = "pms"
-  value  = "en1.enp.one."
+  value  = "${digitalocean_record.enp_en1.fqdn}."
   ttl    = 10600
 }
 
@@ -52,7 +52,7 @@ resource "digitalocean_record" "enp_cdn" {
   domain = digitalocean_domain.enp.id
   type   = "CNAME"
   name   = "cdn"
-  value  = "en2-cdn.nyc3.cdn.digitaloceanspaces.com."
+  value  = "${digitalocean_cdn.enp.endpoint}."
   ttl    = 3600
 }
 
@@ -60,7 +60,7 @@ resource "digitalocean_record" "enp_vpn" {
   domain = digitalocean_domain.enp.id
   type   = "CNAME"
   name   = "vpn"
-  value  = "en1.enp.one."
+  value  = "${digitalocean_record.enp_en1.fqdn}."
   ttl    = 10600
 }
 
@@ -68,7 +68,7 @@ resource "digitalocean_record" "enp_www" {
   domain = digitalocean_domain.enp.id
   type   = "CNAME"
   name   = "www"
-  value  = "en1.enp.one."
+  value  = "${digitalocean_record.enp_en1.fqdn}."
   ttl    = 10600
 }
 
@@ -76,7 +76,7 @@ resource "digitalocean_record" "enp_sso" {
   domain = digitalocean_domain.enp.id
   type   = "CNAME"
   name   = "sso"
-  value  = "en1.enp.one."
+  value  = "${digitalocean_record.enp_en1.fqdn}."
   ttl    = 10600
 }
 
@@ -84,7 +84,7 @@ resource "digitalocean_record" "enp_img" {
   domain = digitalocean_domain.enp.id
   type   = "CNAME"
   name   = "img"
-  value  = "en1.enp.one."
+  value  = "${digitalocean_record.enp_en1.fqdn}."
   ttl    = 10600
 }
 
diff --git a/skylab/infra/playbooks/terraform/domain.enpaul.tf b/skylab/infra/playbooks/terraform/domain.enpaul.tf
index 0984a1a..3e53dda 100644
--- a/skylab/infra/playbooks/terraform/domain.enpaul.tf
+++ b/skylab/infra/playbooks/terraform/domain.enpaul.tf
@@ -9,7 +9,7 @@ resource "digitalocean_record" "enpaul" {
   domain = digitalocean_domain.enpaul.id
   type   = "A"
   name   = "@"
-  value  = "24.2.156.189"
+  value  = digitalocean_record.enp.value
   ttl    = 3600
 }
 
diff --git a/skylab/infra/playbooks/terraform/domain.scipiocapital.tf b/skylab/infra/playbooks/terraform/domain.scipiocapital.tf
index b23a892..9ed350a 100644
--- a/skylab/infra/playbooks/terraform/domain.scipiocapital.tf
+++ b/skylab/infra/playbooks/terraform/domain.scipiocapital.tf
@@ -8,7 +8,7 @@ resource "digitalocean_record" "scipiocapital" {
   domain = digitalocean_domain.scipiocapital.id
   type   = "A"
   name   = "@"
-  value  = "24.2.156.189"
+  value  = digitalocean_record.enp.value
   ttl    = 3600
 }
 
@@ -16,7 +16,7 @@ resource "digitalocean_record" "scipiocapital_app" {
   domain = digitalocean_domain.scipiocapital.id
   type   = "CNAME"
   name   = "app"
-  value  = "en1.enp.one."
+  value  = "${digitalocean_record.enp_en1.fqdn}."
   ttl    = 43200
 }
 
@@ -24,7 +24,7 @@ resource "digitalocean_record" "scipiocapital_notify" {
   domain = digitalocean_domain.scipiocapital.id
   type   = "CNAME"
   name   = "notify"
-  value  = "en1.enp.one."
+  value  = "${digitalocean_record.enp_en1.fqdn}."
   ttl    = 43200
 }