diff --git a/roles/master/tasks/config.yml b/roles/master/tasks/config.yml
index 10b0666..16f4826 100644
--- a/roles/master/tasks/config.yml
+++ b/roles/master/tasks/config.yml
@@ -28,12 +28,12 @@
 - name: render knot zone files
   template:
     src: var/lib/knot/master/zone.j2
-    dest: "/var/lib/knot/master/{{ zone.name }}"
+    dest: "/var/lib/knot/master/{{ zone.name }}zone"
     owner: knot
     group: knot
     mode: 0640
   vars:
-    zone: "hostvars[inventory_hostname]['knot_zone_' + item]"
+    zone: "{{ hostvars[inventory_hostname]['knot_zone_' + item.1] }}"
   loop: "{{ knot_zone_groups | subelements('zones') }}"
   notify: reload knot
 
diff --git a/roles/master/templates/etc/knot/knot.d/10-master.conf.j2 b/roles/master/templates/etc/knot/knot.d/10-master.conf.j2
index 2df82d1..dcec5c8 100644
--- a/roles/master/templates/etc/knot/knot.d/10-master.conf.j2
+++ b/roles/master/templates/etc/knot/knot.d/10-master.conf.j2
@@ -30,6 +30,8 @@ template:
   - id: {{ name }}
     storage: {{ knot_zone_storage_path }}
     semantic-checks: {{ knot_zone_semantic_checks }}
+    serial-policy: unixtime
+    zonefile-load: difference
     dnssec-signing: {{ knot_zone_dnssec_signing }}
     dnssec-policy: dnssec-{{ name }}
     acl: xfr-{{ name }}
diff --git a/roles/master/templates/var/lib/knot/master/zone.j2 b/roles/master/templates/var/lib/knot/master/zone.j2
index 27572f6..5b6ea50 100644
--- a/roles/master/templates/var/lib/knot/master/zone.j2
+++ b/roles/master/templates/var/lib/knot/master/zone.j2
@@ -1,7 +1,7 @@
 
 $TTL	{{ zone.soa.ttl }}
 
-@	{{ zone.soa.class }}	SOA	{{ primary }}	{{ zone.soa.rname }} (
+@	{{ zone.soa.class }}	SOA	{{ zone.soa.primary }}.	{{ zone.soa.rname }}. (
 	{{ ansible_date_time.epoch }}	; serial
 	{{ zone.soa.refresh }}	; refresh
 	{{ zone.soa.retry }}	; retry
@@ -11,6 +11,6 @@ $TTL	{{ zone.soa.ttl }}
 
 {% for r in zone.records %}
 
-{{ r.name }}	{{ r.ttl|default('') }}	{{ r.class|default('') }}	{{ r.type }}	{{ r.content }}
+{{ r.name }}	{{ r.ttl|default('') }}	{{ r.class|default('') }}	{{ r.type }}	{{ r.value }}
 {% endfor %}