diff --git a/inventory/host_vars/ks3370405.yml b/inventory/host_vars/ks3370405.yml
index 24b1551..7206014 100644
--- a/inventory/host_vars/ks3370405.yml
+++ b/inventory/host_vars/ks3370405.yml
@@ -9,3 +9,4 @@ global_smtp_relay_allowed_ips: "{{ allowed_smtp_ips }}"
 ufw_allowed_smtp_ips: "{{ allowed_smtp_ips }}"
 
 nsd_master: true
+nsd_ansible_host: "nsd-master1.ext.mateu.be"
diff --git a/roles/nsd/templates/zones/giteu.be.zone.j2 b/roles/nsd/templates/zones/giteu.be.zone.j2
index b17f299..cb84312 100644
--- a/roles/nsd/templates/zones/giteu.be.zone.j2
+++ b/roles/nsd/templates/zones/giteu.be.zone.j2
@@ -1,5 +1,6 @@
 $TTL 86400
-@		IN SOA {{ groups['master_nsdservers'] | first }}. tech.ovh.net. (
+{% set firstserver = groups['master_nsdservers'] | first %}
+@		IN SOA {{ hostvars[firstserver].nsd_ansible_host | default(hostvars[firstserver].ansible_host) }}. tech.ovh.net. (
 				{{ dns_serial }}; timestamp serial number
 				28800; Refresh
 				7200; Retry
@@ -8,7 +9,7 @@ $TTL 86400
 			)
 
 {% for server in groups['nsdservers'] %}
-@		IN NS {{ hostvars[server].ansible_host }}.
+@		IN NS {{ hostvars[server].nsd_ansible_host | default(hostvars[server].ansible_host) }}.
 {% endfor %}
 
 $ORIGIN {{ item.name }}.
diff --git a/roles/nsd/templates/zones/libertus.eu.zone.j2 b/roles/nsd/templates/zones/libertus.eu.zone.j2
index b1b1736..2488d17 100644
--- a/roles/nsd/templates/zones/libertus.eu.zone.j2
+++ b/roles/nsd/templates/zones/libertus.eu.zone.j2
@@ -1,5 +1,6 @@
 $TTL 86400
-@		IN SOA {{ groups['master_nsdservers'] | first }}. tech.ovh.net. (
+{% set firstserver = groups['master_nsdservers'] | first %}
+@		IN SOA {{ hostvars[firstserver].nsd_ansible_host | default(hostvars[firstserver].ansible_host) }}. tech.ovh.net. (
 				{{ dns_serial }}; timestamp serial number
 				28800; Refresh
 				7200; Retry
@@ -8,7 +9,7 @@ $TTL 86400
 			)
 
 {% for server in groups['nsdservers'] %}
-@		IN NS {{ hostvars[server].ansible_host }}.
+@		IN NS {{ hostvars[server].nsd_ansible_host | default(hostvars[server].ansible_host) }}.
 {% endfor %}
 
 $ORIGIN {{ item.name }}.
diff --git a/roles/nsd/templates/zones/mateu.be.zone.j2 b/roles/nsd/templates/zones/mateu.be.zone.j2
index f5b22d2..c64ecc4 100644
--- a/roles/nsd/templates/zones/mateu.be.zone.j2
+++ b/roles/nsd/templates/zones/mateu.be.zone.j2
@@ -1,5 +1,6 @@
 $TTL 86400
-@		IN	SOA {{ groups['master_nsdservers'] | first }}. tech.ovh.net. (
+{% set firstserver = groups['master_nsdservers'] | first %}
+@		IN SOA {{ hostvars[firstserver].nsd_ansible_host | default(hostvars[firstserver].ansible_host) }}. tech.ovh.net. (
 				{{ dns_serial }}; timestamp serial number
 				28800; Refresh
 				7200; Retry
@@ -8,7 +9,8 @@ $TTL 86400
 			)
 
 {% for server in groups['nsdservers'] %}
-@		IN NS {{ hostvars[server].ansible_host | regex_replace('^([a-z0-9-]+)\\.', '\\1-v4.') if hostvars[server].ansible_host.endswith('dmz.mateu.be') else hostvars[server].ansible_host }}.
+{% set current_host = hostvars[server].nsd_ansible_host | default(hostvars[server].ansible_host) %}
+@		IN NS {{ current_host | regex_replace('^([a-z0-9-]+)\\.', '\\1-v4.') if current_host.endswith('mateu.be') else current_host }}.
 {% endfor %}
 
 $ORIGIN {{ item.name }}.
@@ -40,6 +42,10 @@ machinbox		IN AAAA 2a01:e0a:9bd:2810::1
 mailalt		IN CNAME altsrv
 memcardprogc	IN A 10.233.211.199
 nfs		IN A 10.233.212.60
+nsd-master1.ext		IN A 37.187.5.75
+nsd-master1-v4.ext		IN A 37.187.5.75
+nsd-master1.ext		IN AAAA 2001:41d0:a:54b::1
+nsd-master1-v6.ext		IN AAAA 2001:41d0:a:54b::1
 rb		IN A 194.156.203.253
 rc		IN A 10.233.211.195
 serenor.dmz		IN A {{ global_public_ip_address }}
@@ -48,6 +54,7 @@ serenor.dmz		IN AAAA 2a01:e0a:9bd:2811::59
 {{ proxmox_host }}.dmz	IN A {{ global_public_ip_address }}
 {% if proxmox_host.startswith('dns') %}
 {{ proxmox_host }}-v4.dmz	IN A {{ global_public_ip_address }}
+{{ proxmox_host }}-v6.dmz	IN AAAA {{ hostvars[proxmox_host].proxmox_net0.ip6 | ansible.utils.ipaddr('address') }}
 {% endif %}
 {{ proxmox_host }}.dmz	IN AAAA {{ hostvars[proxmox_host].proxmox_net0.ip6 | ansible.utils.ipaddr('address') }}
 {% endfor %}
diff --git a/roles/nsd/templates/zones/nintendojo.fr.zone.j2 b/roles/nsd/templates/zones/nintendojo.fr.zone.j2
index 951073d..81a8f24 100644
--- a/roles/nsd/templates/zones/nintendojo.fr.zone.j2
+++ b/roles/nsd/templates/zones/nintendojo.fr.zone.j2
@@ -1,5 +1,6 @@
 $TTL 86400
-@		IN SOA {{ groups['master_nsdservers'] | first }}. tech.ovh.net. (
+{% set firstserver = groups['master_nsdservers'] | first %}
+@		IN SOA {{ hostvars[firstserver].nsd_ansible_host | default(hostvars[firstserver].ansible_host) }}. tech.ovh.net. (
 				{{ dns_serial }}; timestamp serial number
 				28800; Refresh
 				7200; Retry
@@ -8,7 +9,7 @@ $TTL 86400
 			)
 
 {% for server in groups['nsdservers'] %}
-@		IN NS {{ hostvars[server].ansible_host }}.
+@		IN NS {{ hostvars[server].nsd_ansible_host | default(hostvars[server].ansible_host) }}.
 {% endfor %}
 
 $ORIGIN {{ item.name }}.
diff --git a/roles/nsd/templates/zones/nintendojofr.com.zone.j2 b/roles/nsd/templates/zones/nintendojofr.com.zone.j2
index 9fa4abb..4e5248a 100644
--- a/roles/nsd/templates/zones/nintendojofr.com.zone.j2
+++ b/roles/nsd/templates/zones/nintendojofr.com.zone.j2
@@ -1,5 +1,6 @@
 $TTL 86400
-@		IN SOA {{ groups['master_nsdservers'] | first }}. tech.ovh.net. (
+{% set firstserver = groups['master_nsdservers'] | first %}
+@		IN SOA {{ hostvars[firstserver].nsd_ansible_host | default(hostvars[firstserver].ansible_host) }}. tech.ovh.net. (
 				{{ dns_serial }}; timestamp serial number
 				28800; Refresh
 				7200; Retry
@@ -8,7 +9,7 @@ $TTL 86400
 			)
 
 {% for server in groups['nsdservers'] %}
-@		IN NS {{ hostvars[server].ansible_host }}.
+@		IN NS {{ hostvars[server].nsd_ansible_host | default(hostvars[server].ansible_host) }}.
 {% endfor %}
 
 $ORIGIN {{ item.name }}.
diff --git a/roles/nsd/templates/zones/parking.zone.j2 b/roles/nsd/templates/zones/parking.zone.j2
index fb0f0e9..334e027 100644
--- a/roles/nsd/templates/zones/parking.zone.j2
+++ b/roles/nsd/templates/zones/parking.zone.j2
@@ -1,5 +1,6 @@
 $TTL 86400
-@		IN SOA {{ groups['master_nsdservers'] | first }}. tech.ovh.net. (
+{% set firstserver = groups['master_nsdservers'] | first %}
+@		IN SOA {{ hostvars[firstserver].nsd_ansible_host | default(hostvars[firstserver].ansible_host) }}. tech.ovh.net. (
 				{{ dns_serial }}; timestamp serial number
 				28800; Refresh
 				7200; Retry
@@ -8,7 +9,7 @@ $TTL 86400
 			)
 
 {% for server in groups['nsdservers'] %}
-@		IN NS {{ hostvars[server].ansible_host }}.
+@		IN NS {{ hostvars[server].nsd_ansible_host | default(hostvars[server].ansible_host) }}.
 {% endfor %}
 
 $ORIGIN {{ item.name }}.