diff --git a/ops/glesys/dns-tvix-dev.tf b/ops/glesys/dns-tvix-dev.tf
index 296532a02..d6c56077d 100644
--- a/ops/glesys/dns-tvix-dev.tf
+++ b/ops/glesys/dns-tvix-dev.tf
@@ -8,28 +8,28 @@ resource "glesys_dnsdomain_record" "tvix_dev_apex_A" {
   domain = glesys_dnsdomain.tvix_dev.id
   host   = "@"
   type   = "A"
-  data   = var.whitby_ipv4
+  data   = var.bugry_ipv4
 }
 
 resource "glesys_dnsdomain_record" "tvix_dev_apex_AAAA" {
   domain = glesys_dnsdomain.tvix_dev.id
   host   = "@"
   type   = "AAAA"
-  data   = var.whitby_ipv6
+  data   = var.bugry_ipv6
 }
 
 resource "glesys_dnsdomain_record" "tvix_dev_bolt_CNAME" {
   domain = glesys_dnsdomain.tvix_dev.id
   host   = "bolt"
   type   = "CNAME"
-  data   = "whitby.tvl.su."
+  data   = "bugry.tvl.fyi."
 }
 
 resource "glesys_dnsdomain_record" "tvix_dev_docs_CNAME" {
   domain = glesys_dnsdomain.tvix_dev.id
   host   = "docs"
   type   = "CNAME"
-  data   = "whitby.tvl.fyi."
+  data   = "bugry.tvl.fyi."
 }
 
 resource "glesys_dnsdomain_record" "tvix_dev_NS1" {
diff --git a/ops/glesys/dns-tvl-fyi.tf b/ops/glesys/dns-tvl-fyi.tf
index 4687d5342..5aa374b64 100644
--- a/ops/glesys/dns-tvl-fyi.tf
+++ b/ops/glesys/dns-tvl-fyi.tf
@@ -29,14 +29,14 @@ resource "glesys_dnsdomain_record" "tvl_fyi_apex_A" {
   domain = glesys_dnsdomain.tvl_fyi.id
   host   = "@"
   type   = "A"
-  data   = var.whitby_ipv4
+  data   = var.bugry_ipv4
 }
 
 resource "glesys_dnsdomain_record" "tvl_fyi_apex_AAAA" {
   domain = glesys_dnsdomain.tvl_fyi.id
   host   = "@"
   type   = "AAAA"
-  data   = var.whitby_ipv6
+  data   = var.bugry_ipv6
 }
 
 resource "glesys_dnsdomain_record" "tvl_fyi_whitby_A" {
diff --git a/ops/glesys/dns-tvl-su.tf b/ops/glesys/dns-tvl-su.tf
index 8548b482f..c4a4628a3 100644
--- a/ops/glesys/dns-tvl-su.tf
+++ b/ops/glesys/dns-tvl-su.tf
@@ -29,14 +29,14 @@ resource "glesys_dnsdomain_record" "tvl_su_apex_A" {
   domain = glesys_dnsdomain.tvl_su.id
   host   = "@"
   type   = "A"
-  data   = var.whitby_ipv4
+  data   = var.bugry_ipv4
 }
 
 resource "glesys_dnsdomain_record" "tvl_su_apex_AAAA" {
   domain = glesys_dnsdomain.tvl_su.id
   host   = "@"
   type   = "AAAA"
-  data   = var.whitby_ipv6
+  data   = var.bugry_ipv6
 }
 
 resource "glesys_dnsdomain_record" "tvl_su_whitby_A" {
@@ -88,7 +88,7 @@ resource "glesys_dnsdomain_record" "tvl_su_whitby_services" {
 resource "glesys_dnsdomain_record" "tvl_su_nevsky_services" {
   domain   = glesys_dnsdomain.tvl_su.id
   type     = "CNAME"
-  data     = "nevsky.tvl.su."
+  data     = "nevsky.tvl.fyi."
   host     = each.key
   ttl      = 600
   for_each = toset(local.nevsky_services)
@@ -98,7 +98,7 @@ resource "glesys_dnsdomain_record" "tvl_su_nevsky_services" {
 resource "glesys_dnsdomain_record" "tvl_su_bugry_services" {
   domain   = glesys_dnsdomain.tvl_su.id
   type     = "CNAME"
-  data     = "bugry.tvl.su."
+  data     = "bugry.tvl.fyi."
   host     = each.key
   ttl      = 600
   for_each = toset(local.bugry_services)
diff --git a/ops/glesys/main.tf b/ops/glesys/main.tf
index 74850ab0d..e3463f433 100644
--- a/ops/glesys/main.tf
+++ b/ops/glesys/main.tf
@@ -94,18 +94,13 @@ variable "sanduny_ipv6" {
 locals {
   # Hostnames of all public services on whitby
   whitby_services = [
-    "at",
-    "atward",
     "auth",
     "b",
     "cl",
     "code",
     "cs",
     "deploys",
-    "signup",
-    "static",
     "status",
-    "todo",
   ]
 
   # Hostnames of all public services on nevsky
@@ -114,5 +109,10 @@ locals {
 
   # Hostnames of all public services on bugry
   bugry_services = [
+    "at",
+    "atward",
+    "signup",
+    "static",
+    "todo",
   ]
 }