diff --git a/src/diagnosers/12-dnsrecords.py b/src/diagnosers/12-dnsrecords.py
index 4d30bb1a7..9876da791 100644
--- a/src/diagnosers/12-dnsrecords.py
+++ b/src/diagnosers/12-dnsrecords.py
@@ -105,7 +105,7 @@ class MyDiagnoser(Diagnoser):
                 if r["value"] == "@":
                     r["value"] = domain + "."
                 elif r["type"] == "CNAME":
-                    r["value"] = r["value"] + f".{base_dns_zone}."
+                    r["value"] = r["value"]  # + f".{base_dns_zone}."
 
                 if self.current_record_match_expected(r):
                     results[id_] = "OK"
diff --git a/src/dns.py b/src/dns.py
index c8bebed41..1d0b4486f 100644
--- a/src/dns.py
+++ b/src/dns.py
@@ -235,10 +235,10 @@ def _build_dns_conf(base_domain, include_empty_AAAA_if_no_ipv6=False):
                     "SRV",
                     f"0 5 5269 {domain}.",
                 ],
-                [f"muc{suffix}", ttl, "CNAME", basename],
-                [f"pubsub{suffix}", ttl, "CNAME", basename],
-                [f"vjud{suffix}", ttl, "CNAME", basename],
-                [f"xmpp-upload{suffix}", ttl, "CNAME", basename],
+                [f"muc{suffix}", ttl, "CNAME", f"{domain}."],
+                [f"pubsub{suffix}", ttl, "CNAME", f"{domain}."],
+                [f"vjud{suffix}", ttl, "CNAME", f"{domain}."],
+                [f"xmpp-upload{suffix}", ttl, "CNAME", f"{domain}."],
             ]
 
         #########