diff --git a/dnsconfig.js b/dnsconfig.js
index 39c5348e79..8545ad4caf 100644
--- a/dnsconfig.js
+++ b/dnsconfig.js
@@ -141,8 +141,6 @@ var reserved = require("./util/reserved.json");
 for (var i = 0; i < reserved.length; i++) {
     var subdomainName = reserved[i];
     if (
-        subdomainName !== "autoconfig" &&
-        subdomainName !== "autodiscover" &&
         subdomainName !== "data" &&
         subdomainName !== "docs" &&
         subdomainName !== "ns1" &&
@@ -164,7 +162,6 @@ var ignored = [
     IGNORE("*._domainkey", "TXT"),
     IGNORE("@", "*"),
     IGNORE("_acme-challenge", "TXT"),
-    IGNORE("_autodiscover._tcp", "SRV"),
     IGNORE("_discord", "TXT"),
     IGNORE("_dmarc", "TXT"),
     IGNORE("_gh-is-a-dev-o", "TXT"),
@@ -172,13 +169,13 @@ var ignored = [
     IGNORE("_github-pages-challenge-is-a-dev", "TXT"),
     IGNORE("_github-pages-challenge-is-a-dev.**", "TXT"),
     IGNORE("_psl", "TXT"),
-    IGNORE("autoconfig", "CNAME"),
-    IGNORE("autodiscover", "CNAME"),
-    IGNORE("data", "CNAME"),
-    IGNORE("docs", "CNAME"),
-    IGNORE("ns[1-4]", "A,AAAA"),
-    IGNORE("raw", "CNAME"),
-    IGNORE("www", "*")
+    IGNORE("ns[1-4]", "A,AAAA")
 ];
 
+var internal = require("./util/internal.json");
+
+internal.forEach(function(subdomain) {
+    ignored.push(IGNORE(subdomain, "*"));
+});
+
 D(domainName, registrar, dnsProvider, records, ignored);
diff --git a/util/internal.json b/util/internal.json
index 5e71fc3d10..c55dbed7aa 100644
--- a/util/internal.json
+++ b/util/internal.json
@@ -1,6 +1,4 @@
 [
-    "autoconfig",
-    "autodiscover",
     "data",
     "docs",
     "raw",
diff --git a/util/reserved.json b/util/reserved.json
index 2c6b0e48f1..1744dcb8dc 100644
--- a/util/reserved.json
+++ b/util/reserved.json
@@ -9,6 +9,8 @@
     "apps",
     "assets",
     "auth",
+    "autoconfig",
+    "autodiscover",
     "billing",
     "blog",
     "bot",