diff --git a/tasks/main.yml b/tasks/main.yml
index b031220..adf5898 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -12,10 +12,9 @@
         - unbound
         - config
 - name: Set unbound as default dns
-  replace:
-        path: /etc/resolv.conf
-        regexp: "^nameserver.*$"
-        replace: "nameserver 127.0.0.1"
+  template:
+        src: 'resolv.conf'
+        dest: /etc/resolv.conf
   tags:
         - unbound
         - config
diff --git a/templates/redxen-dns.conf.j2 b/templates/redxen-dns.conf.j2
index e91c3f9..8d713e5 100644
--- a/templates/redxen-dns.conf.j2
+++ b/templates/redxen-dns.conf.j2
@@ -7,7 +7,7 @@ server:
 	local-data: "redxen.eu. IN SOA n0.redxen.eu admin.redxen.eu 2020053102 1800 120 604800 3600"
 
 {% for record in unbound.public.TXT %}
-	local-data: "{{ record.name }}redxen.eu. 86400 IN TXT {{ record.content }}"
+	local-data: '{{ record.name }}redxen.eu. 86400 IN TXT "{{ record.content }}" {% if record.content2|default(false) %}"{{ record.content2 }}"{% endif %}'
 {% endfor %}
 
 {% for record in unbound.public.CNAME %}
@@ -18,8 +18,8 @@ server:
 	local-data: "_{{ record.service }}._{{ record.proto }}.redxen.eu. 86400 IN SRV 0 5 {{ record.port }} {{ record.host }}."
 {% endfor %}
 
-{% for record in unbound.public.A %}
-	local-data: "{{ record.name }}redxen.eu. 86400 IN A {{ record.addr }}"
+{% for record in unbound.public.MX %}
+	local-data: "{{ record.name }}redxen.eu. 86400 IN MX {{ record.priority|default(10) }} {{ record.host }}"
 {% endfor %}
 
 {% for domains in unbound.public.group.A %}
diff --git a/templates/resolv.conf b/templates/resolv.conf
new file mode 100644
index 0000000..bbc8559
--- /dev/null
+++ b/templates/resolv.conf
@@ -0,0 +1 @@
+nameserver 127.0.0.1