diff --git a/terraform/dnsimple.nix b/terraform/dnsimple.nix
index 8236554..2920f17 100644
--- a/terraform/dnsimple.nix
+++ b/terraform/dnsimple.nix
@@ -96,24 +96,24 @@ in
           (dualProxyRecords "buildbot.infra" 300 "AAAA" "2001:bc8:38ee:100:1000::50")
           (dualProxyRecords "public01.infra" 300 "AAAA" "2001:bc8:38ee:100:1000::60")
 
-          (record "cl" 300 "CNAME" "gerrit01.infra.p")
-          (record "fodwatch" 300 "CNAME" "fodwatch.infra.p")
+          (record "cl" 300 "CNAME" "gerrit01.infra.p.forkos.org")
+          (record "fodwatch" 300 "CNAME" "fodwatch.infra.p.forkos.org")
           # git.p.forkos.org is the proxy variant of the Forgejo server.
-          (record "git" 300 "CNAME" "git.p")
-          (record "netbox" 300 "CNAME" "meta01.infra.p")
-          (record "amqp" 300 "CNAME" "bagel-box.infra.p")
-          (record "grafana" 300 "CNAME" "meta01.infra.p")
-          (record "hydra" 300 "CNAME" "build-coord.wob01.infra.p")
-          (record "loki" 300 "CNAME" "meta01.infra.p")
-          (record "mimir" 300 "CNAME" "meta01.infra.p")
-          (record "pyroscope" 300 "CNAME" "meta01.infra.p")
-          (record "tempo" 300 "CNAME" "meta01.infra.p")
-          (record "matrix" 300 "CNAME" "meta01.infra.p")
-          (record "alerts" 300 "CNAME" "meta01.infra.p")
-          (record "buildbot" 300 "CNAME" "buildbot.infra.p")
-          (record "b" 300 "CNAME" "public01.infra.p")
-          (record "postgres" 300 "CNAME" "bagel-box.infra.p")
-          (record "news" 3600 "CNAME" "public01.infra.p")
+          (record "git" 300 "CNAME" "git.p.forkos.org")
+          (record "netbox" 300 "CNAME" "meta01.infra.p.forkos.org")
+          (record "amqp" 300 "CNAME" "bagel-box.infra.p.forkos.org")
+          (record "grafana" 300 "CNAME" "meta01.infra.p.forkos.org")
+          (record "hydra" 300 "CNAME" "build-coord.wob01.infra.p.forkos.org")
+          (record "loki" 300 "CNAME" "meta01.infra.p.forkos.org")
+          (record "mimir" 300 "CNAME" "meta01.infra.p.forkos.org")
+          (record "pyroscope" 300 "CNAME" "meta01.infra.p.forkos.org")
+          (record "tempo" 300 "CNAME" "meta01.infra.p.forkos.org")
+          (record "matrix" 300 "CNAME" "meta01.infra.p.forkos.org")
+          (record "alerts" 300 "CNAME" "meta01.infra.p.forkos.org")
+          (record "buildbot" 300 "CNAME" "buildbot.infra.p.forkos.org")
+          (record "b" 300 "CNAME" "public01.infra.p.forkos.org")
+          (record "postgres" 300 "CNAME" "bagel-box.infra.p.forkos.org")
+          (record "news" 3600 "CNAME" "public01.infra.p.forkos.org")
 
           # S3 in delroth's basement
           (record "cache" 300 "AAAA" "2a02:168:6426::12") # smol.delroth.net
@@ -135,7 +135,7 @@ in
               "channel-scripts-test"
             ];
           in
-          map (bucket: record "${bucket}" 300 "CNAME" "public01.infra.p") buckets
+          map (bucket: record "${bucket}" 300 "CNAME" "public01.infra.p.forkos.org") buckets
         ));
         "flowery.systems" = [
           (record "" 300 "ALIAS" "news.forkos.org")