diff --git a/consul.py b/consul.py
index eca7da5..d63393e 100644
--- a/consul.py
+++ b/consul.py
@@ -13,13 +13,15 @@ def query_zone_entries(zone):
 
 
 def read_raw_from_consul(zone):
-    resp = requests.get('{}/v1/kv/dns/{}?recurse=true'.format(
-        os.getenv('CONSUL_HTTP_ADDR'),
-        zone.rstrip('.'),
-    ),
+    resp = requests.get(
+        '{}/v1/kv/dns/{}?recurse=true'.format(
+            os.getenv('CONSUL_HTTP_ADDR'),
+            zone.rstrip('.'),
+        ),
         headers={
-        'X-Consul-Token': os.getenv('CONSUL_HTTP_TOKEN'),
-    })
+            'X-Consul-Token': os.getenv('CONSUL_HTTP_TOKEN'),
+        }
+    )
 
     if resp.status_code == 404:
         return []
diff --git a/zones.yml b/zones.yml
index 1e74a4e..6b71e33 100644
--- a/zones.yml
+++ b/zones.yml
@@ -9,12 +9,6 @@ soa:
   ttl: 86400
 
 mailserver_sets:
-  google:
-    aspmx.l.google.com.: 1
-    alt1.aspmx.l.google.com.: 5
-    alt2.aspmx.l.google.com.: 5
-    alt3.aspmx.l.google.com.: 10
-    alt4.aspmx.l.google.com.: 10
 
 nameserver:
   - ns1.kserver.biz.
@@ -26,47 +20,7 @@ zones:
     from_consul: true
 
   ahlers.me:
-    mailserver_set: google
-    entries:
-      - name: ""
-        ttl: 600
-        alias: docker01.cloud.kserver.biz
-      - name: ""
-        type: TXT
-        records:
-          - "keybase-site-verification=ctGylibf7WuSJwVBmuJjYbqRMvBQ5Z-On-GvYIH6PRI"
-          - "v=spf1 include:spf.mandrillapp.com include:_spf.google.com include:mailgun.org -all"
-          - "google-site-verification=f42bs3G-0kCtXwHQZitx0qiydRBSwoFluRDXkvjOR80"
-          - "adn_verification=luzifer https"
-          - "detectify-verification=a77f9d40e702b0baf2430477feb08e10"
-      - name: email
-        type: CNAME
-        records:
-          - mailgun.org.
-      - name: google._domainkey
-        type: TXT
-        records:
-          - "v=DKIM1; k=rsa; t=y; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCUiZftSvAAKuCOtC3A5ciYTr2sCJMVu/cL9sE2tuFK2mNzypuWtW/2GUtq3xif1Lah38rTm8iN0m3JiSK1OV9E3B6i7esFwb/rWlLr8ZpqEY1h0TuSudMw20X0AqnywRWihk9cYWqqlg6Lp2JLbzfPm4docM/+TBFgmhEhr531jQIDAQAB"
-      - name: k1._domainkey
-        type: TXT
-        records:
-          - "k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDZeWPyiBeIhjzqz/YQm7uYXdqbNcuzKal9cfNsEVez8qAFehahY4wAULlDju8u7RfF1A0dhgLIrCVhd9Xiu4nyHgttOhXOJbP7R/mZQM4jXgJ/aO23WwlI5PJCmwUVVY77P+rm2PZfcCBHIKWTX43lnuqfO1CTokbgXCmso7QmfwIDAQAB"
-      - name: mandrill._domainkey
-        type: TXT
-        records:
-          - "v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrLHiExVd55zd/IQ/J/mRwSRMAocV/hMB3jXwaHH36d9NaVynQFYV8NaWi69c1veUtRzGt7yAioXqLj7Z4TeEUoOLgrKsn8YnckGs9i3B3tVFB+Ch/4mPhXWiNfNdynHWBcPcbJ8kjEQ2U8y78dHZj1YeRXXVvWob2OaKynO8/lQIDAQAB;"
-      - name: photos
-        type: CNAME
-        records:
-          - d18eku8b6z7cbu.cloudfront.net.
-      - name: stuff
-        type: CNAME
-        records:
-          - knuttest.jimdo.com.
-      - name: www
-        type: CNAME
-        records:
-          - luzifer_io.hub.luzifer.io.
+    from_consul: true
 
   ahlers.space:
     from_consul: true
@@ -87,30 +41,10 @@ zones:
     from_consul: true
 
   kahlers.biz:
-    mailserver:
-      encke.uberspace.de.: 10
-    entries:
-      - name: ""
-        type: TXT
-        records:
-          - "google-site-verification=5b7YhL9wNQdAk8Rp_oJ7w1hLxtFvFHwoTXxYwFRC5S0"
-      - name: google81ff6671578c2507
-        type: CNAME
-        records:
-          - google.com.
+    from_consul: true
 
   kahlers.de:
-    mailserver:
-      encke.uberspace.de.: 10
-    entries:
-      - name: ""
-        type: TXT
-        records:
-          - "google-site-verification: URJxtDWBr9AeG1MDQ18PoyryKS4skXu9peObdIJrqYM"
-      - name: google80107f63578c2507
-        type: CNAME
-        records:
-          - google.com.
+    from_consul: true
 
   knut-ahlers.de:
     from_consul: true
@@ -122,46 +56,13 @@ zones:
     from_consul: true
 
   knut.me:
-    mailserver_set: google
-    entries:
-      - name: 28d72ef8af97.blog
-        type: CNAME
-        records:
-          - cname.bitly.com.
-      - name: blog
-        alias: docker01.cloud.kserver.biz.
-      - name: blog
-        type: TXT
-        records:
-          - "keybase-site-verification=kQezjhieHIJrz7WEQJU1qJqGghgWDki4fOU33b2HfRE"
-      - name: cdn
-        type: CNAME
-        records:
-          - d1h18dxou97pb9.cloudfront.net.
-      - name: googleffffffffffc3b235
-        type: CNAME
-        records:
-          - google.com.
-      - name: k7nxmbsyyxqy
-        type: CNAME
-        records:
-          - gv-4biqxjktgogszaj4vvruyyhcvcmtilwaapsxl2id6bfdm5elw6da.domainverify.googlehosted.com.
-      - name: pwd
-        type: CNAME
-        records:
-          - docker01.cloud.kserver.biz.
-      - name: timesheet
-        type: CNAME
-        records:
-          - timesheet.knut.me.s3-website-us-east-1.amazonaws.com.
+    from_consul: true
 
   knut.page:
     from_consul: true
 
   knut.so:
-    entries:
-      - name: ""
-        alias: cname.bitly.com.
+    from_consul: true
 
   knut.work:
     from_consul: true
@@ -170,216 +71,25 @@ zones:
     from_consul: true
 
   knutahlers.de:
-    entries:
-      - name: ""
-        alias: docker01.cloud.kserver.biz
-      - name: www
-        type: CNAME
-        records:
-          - docker01.cloud.kserver.biz.
+    from_consul: true
 
   knutshome.de:
-    mailserver_set: google
-    entries:
-      - name: ""
-        type: TXT
-        records:
-          - "v=spf1 a include:_spf.google.com ~all"
-      - name: googlef15fb95f578c2507
-        type: CNAME
-        records:
-          - google.com.
+    from_consul: true
 
   luzifer.cc:
-    entries:
-      - name: ""
-        alias: luzifer.cc.s3-website-us-east-1.amazonaws.com.
-      - name: 2
-        type: CNAME
-        records:
-          - kstuff.cloud.kserver.biz.
-      - name: cdn
-        type: CNAME
-        records:
-          - cdn.luzifer.cc.s3.amazonaws.com.
+    from_consul: true
 
   luzifer.io:
-    mailserver_set: google
-    entries:
-      - name: ""
-        alias: docker01.cloud.kserver.biz.
-      - name: ""
-        type: TXT
-        records:
-          - "google-site-verification=YCAOwbf_Tzc9ueQllrjbU2lb5gng0myMf3OAcV0nMtI"
-          - "v=spf1 include:spf.mandrillapp.com include:_spf.google.com include:mailgun.org -all"
-      - name: '*.hub'
-        type: CNAME
-        records:
-          - docker01.cloud.kserver.biz.
-      - name: _amazonses.ses
-        ttl: 600
-        type: TXT
-        records:
-          - "EGFLDxdkQDfm4TEBGkFCcsSum+S6RDldJ24ix6TK3Ps="
-      - name: _keybase
-        type: TXT
-        records:
-          - "keybase-site-verification=fG1G7tbhgVeC7b7a2V_CJ1oq1Ylx-DCy-EQAt9Tynxc"
-      - name: 4j6vz7jbf3vama3f45pkmzjjliqgirqc._domainkey.ses
-        ttl: 600
-        type: CNAME
-        records:
-          - 4j6vz7jbf3vama3f45pkmzjjliqgirqc.dkim.amazonses.com.
-      - name: ark
-        type: A
-        records:
-          - 31.214.232.18
-      - name: assets
-        type: CNAME
-        records:
-          - assets.luzifer.io.s3-website-eu-west-1.amazonaws.com.
-      - name: badge
-        ttl: 600
-        type: CNAME
-        records:
-          - docker01.cloud.kserver.biz.
-      - name: email
-        type: CNAME
-        records:
-          - mailgun.org.
-      - name: g5phbb6dpvdqoyh4zajk2vsc6rmxljtv._domainkey.ses
-        ttl: 600
-        type: CNAME
-        records:
-          - g5phbb6dpvdqoyh4zajk2vsc6rmxljtv.dkim.amazonses.com.
-      - name: gh-private
-        type: CNAME
-        records:
-          - d35wqb997f1hjd.cloudfront.net.
-      - name: hackmd
-        ttl: 600
-        type: CNAME
-        records:
-          - docker01.cloud.kserver.biz.
-      - name: jenkins
-        type: CNAME
-        records:
-          - docker01.cloud.kserver.biz.
-      - name: kchtfptsjxl2nj4luhksupj4hazmcf3r._domainkey.ses
-        ttl: 600
-        type: CNAME
-        records:
-          - kchtfptsjxl2nj4luhksupj4hazmcf3r.dkim.amazonses.com.
-      - name: latest
-        type: CNAME
-        records:
-          - docker01.cloud.kserver.biz.
-      - name: login
-        ttl: 60
-        type: CNAME
-        records:
-          - docker01.cloud.kserver.biz.
-      - name: lv
-        type: CNAME
-        records:
-          - docker01.cloud.kserver.biz.
-      - name: mailo._domainkey
-        type: TXT
-        records:
-          - "k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDdQwCnp0S0EFg1UJP38MdcHxP/5i0mvAy0sIBN3U+wOmSy/wJkrbBDQG3l61D/DSgEca7h9aKaZ/SYFm1v0y0aUxya1215TtiS5K1T3FyEkGXo/MX2O0A+yPotQS1cr3fMuhSTmStRTbXydbSc+iQukmSl8b8VS8Gy5F2srjj5XQIDAQAB"
-      - name: mandrill._domainkey
-        type: TXT
-        records:
-          - "v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrLHiExVd55zd/IQ/J/mRwSRMAocV/hMB3jXwaHH36d9NaVynQFYV8NaWi69c1veUtRzGt7yAioXqLj7Z4TeEUoOLgrKsn8YnckGs9i3B3tVFB+Ch/4mPhXWiNfNdynHWBcPcbJ8kjEQ2U8y78dHZj1YeRXXVvWob2OaKynO8/lQIDAQAB;"
-      - name: openvpn
-        type: NS
-        records:
-          - ns-104.awsdns-13.com.
-          - ns-1103.awsdns-09.org.
-          - ns-1709.awsdns-21.co.uk.
-          - ns-581.awsdns-08.net.
-      - name: ots
-        type: CNAME
-        records: 
-          - docker01.cloud.kserver.biz.
-      - name: paste
-        ttl: 600
-        type: CNAME
-        records:
-          - d1nv3hwf1jweft.cloudfront.net.
-      - name: pwd
-        type: CNAME
-        records:
-          - docker01.cloud.kserver.biz.
-      - name: repo-runner
-        ttl: 600
-        type: CNAME
-        records:
-          - docker01.cloud.kserver.biz.
-      - name: rss-status
-        ttl: 600
-        type: CNAME
-        records:
-          - docker01.cloud.kserver.biz.
-      - name: ses
-        type: MX
-        records:
-          - 10 inbound-smtp.eu-west-1.amazonaws.com.
-      - name: share
-        ttl: 600
-        type: CNAME
-        records:
-          - ddba39e146dcw.cloudfront.net.
-      - name: stuff
-        ttl: 600
-        type: CNAME
-        records:
-          - knuttest.jimdo.com.
-      - name: ts
-        ttl: 60
-        type: CNAME
-        records:
-          - docker01.cloud.kserver.biz.
-      - name: twtxt
-        ttl: 60
-        type: CNAME
-        records:
-          - twtxt.luzifer.io.s3-website-eu-west-1.amazonaws.com.
-      - name: update
-        ttl: 600
-        type: CNAME
-        records:
-          - update.luzifer.io.s3-website-eu-west-1.amazonaws.com.
-      - name: vault
-        ttl: 60
-        type: A
-        records:
-          - 94.130.184.108
+    from_consul: true
 
   luzifer.link:
     from_consul: true
 
   luzifer.rip:
-    entries:
-      - name: ""
-        type: A
-        records:
-          - 151.101.1.195
-          - 151.101.65.195
-      - name: ""
-        type: TXT
-        records:
-          - google-site-verification=KtEBY5ch2sbz-DIaIYkvZgb8C1IO1DiAzu2hnHs8xOw  # Firebase
+    from_consul: true
 
   mondash.org:
-    entries:
-      - name: ""
-        alias: docker01.cloud.kserver.biz.
-      - name: www
-        type: CNAME
-        records:
-          - docker01.cloud.kserver.biz.
+    from_consul: true
 
   ots.fyi:
     from_consul: true