diff --git a/source4/setup/dns_update_list b/source4/setup/dns_update_list
index 91b182188b5..d866495e7ac 100644
--- a/source4/setup/dns_update_list
+++ b/source4/setup/dns_update_list
@@ -4,7 +4,7 @@ A                                                        ${DNSDOMAIN} $IP
 A                                                        ${HOSTNAME} $IP
 AAAA                                                     ${DNSDOMAIN} $IP
 AAAA                                                     ${HOSTNAME} $IP
-CNAME ${NTDSGUID}._msdcs.${DNSDOMAIN}                    ${HOSTNAME}
+CNAME ${NTDSGUID}._msdcs.${DNSFOREST}                    ${HOSTNAME}
 SRV _kerberos._tcp.${SITE}._sites.dc._msdcs.${DNSDOMAIN} ${HOSTNAME} 88
 SRV _ldap._tcp.${SITE}._sites.dc._msdcs.${DNSDOMAIN}     ${HOSTNAME} 389
 SRV _kerberos._tcp.dc._msdcs.${DNSDOMAIN}                ${HOSTNAME} 88
diff --git a/source4/setup/spn_update_list b/source4/setup/spn_update_list
index da892c26eda..8e6fb6c01fd 100644
--- a/source4/setup/spn_update_list
+++ b/source4/setup/spn_update_list
@@ -5,13 +5,13 @@
 HOST/${HOSTNAME}
 HOST/${HOSTNAME}/${WORKGROUP}
 ldap/${HOSTNAME}/${WORKGROUP}
-GC/${HOSTNAME}/${DNSDOMAIN}
+GC/${HOSTNAME}/${DNSFOREST}
 ldap/${HOSTNAME}
 HOST/${HOSTNAME}/${DNSDOMAIN}
 ldap/${HOSTNAME}/${DNSDOMAIN}
 HOST/${NETBIOSNAME}
 E3514235-4B06-11D1-AB04-00C04FC2DCD2/${NTDSGUID}/${DNSDOMAIN}
-ldap/${NTDSGUID}._msdcs.${DNSDOMAIN}
+ldap/${NTDSGUID}._msdcs.${DNSFOREST}
 ldap/${NETBIOSNAME}
 RestrictedKrbHost/${NETBIOSNAME}
 RestrictedKrbHost/${HOSTNAME}