diff --git a/dnsconfig.js b/dnsconfig.js
index 6b015b8..336672c 100644
--- a/dnsconfig.js
+++ b/dnsconfig.js
@@ -52,7 +52,7 @@ for (var subdomain in allDomains) {
         if (Array.isArray(domainData.target.TXT.value)) {
             for (var txt in domainData.target.TXT) {
                 var txtRecord = domainData.target.TXT[txt];
-                commit.push(TXT(txtRecord.name, txtRecord.value));
+                commit.push(TXT(domainData.target.TXT.name === "@" ? subdomainName : txtRecord.name + "." + subdomainName, txtRecord.value));
             }
         } else {
             commit.push(TXT(domainData.target.TXT.name === "@" ? subdomainName : domainData.target.TXT.name + "." + subdomainName, domainData.target.TXT.value));
@@ -60,9 +60,6 @@ for (var subdomain in allDomains) {
     }
 }
 
-// Commit all DNS records
-D("is-a-good.dev", NewRegistrar("none"), DnsProvider(NewDnsProvider("cloudflare")), commit);
-
 // *._domainkey.is-a-good.dev
 commit.push(IGNORE("*._domainkey", "TXT"));
 // _acme-challenge.is-a-good.dev
@@ -78,4 +75,7 @@ commit.push(IGNORE("autoconfig", "CNAME"));
 // autodiscover.is-a-good.dev
 commit.push(IGNORE("autodiscover", "CNAME"));
 // *.mx.is-a-good.dev
-commit.push(IGNORE("*", "MX", "*"));
\ No newline at end of file
+commit.push(IGNORE("*", "MX", "*"));
+
+// Commit all DNS records
+D("is-a-good.dev", NewRegistrar("none"), DnsProvider(NewDnsProvider("cloudflare")), commit);
\ No newline at end of file