diff --git a/bundles/bind/items.py b/bundles/bind/items.py
index 4414cbc..bea90d7 100644
--- a/bundles/bind/items.py
+++ b/bundles/bind/items.py
@@ -53,6 +53,7 @@ svc_systemd['bind9'] = {}
 
 actions['named-checkconf'] = {
     'command': 'named-checkconf -z',
+    'unless': 'named-checkconf -z',
     'needs': [
         'svc_systemd:bind9',
     ]
diff --git a/bundles/bind/metadata.py b/bundles/bind/metadata.py
index b5845c6..e0d5b7c 100644
--- a/bundles/bind/metadata.py
+++ b/bundles/bind/metadata.py
@@ -19,12 +19,12 @@ defaults = {
 def dns(metadata):
     return {
         'dns': {
-            'ns.sublimity.de': {
+            metadata.get('bind/domain'): {
                 'A': [
-                    str(ip_interface(metadata.get('network/ipv4')).ip)
+                    str(ip_interface(metadata.get('network/ipv4')).ip),
                 ],
                 'AAAA': [
-                    str(ip_interface(metadata.get('network/ipv6')).ip)
+                    str(ip_interface(metadata.get('network/ipv6')).ip),
                 ]
             },
         },