diff --git a/roles/dns-intern/templates/bind/23.172.in-addr.arpa.zone.j2 b/roles/dns-intern/templates/bind/23.172.in-addr.arpa.zone.j2
index 40f8e83..52ab922 100644
--- a/roles/dns-intern/templates/bind/23.172.in-addr.arpa.zone.j2
+++ b/roles/dns-intern/templates/bind/23.172.in-addr.arpa.zone.j2
@@ -1,7 +1,7 @@
 $ORIGIN 23.172.in-addr.arpa.	; base for unqualified names
 $TTL 1h				; default time-to-live
 @				IN	SOA ns.binary.kitchen. hostmaster.binary.kitchen. (
-					2019113001; serial
+					2020051101; serial
 					1d; refresh
 					2h; retry
 					4w; expire
@@ -76,12 +76,12 @@ $GENERATE 10-240 $.4		IN	PTR	dhcp-${0,3,d}-04.binary.kitchen.
 ; Services RZ
 23.8				IN	PTR	cernunnos.binary.kitchen.
 ; VPN RZ (ER-X)
-1.10				IN	PTR	vtun0.erx-rz.binary.kitchen.
+1.10				IN	PTR	wg1.erx-rz.binary.kitchen.
 $GENERATE 2-254 $.10		IN	PTR	vpn-${0,3,d}-10.binary.kitchen.
 ; VPN RZ (pf)
 $GENERATE 2-254 $.11		IN	PTR	vpn-${0,3,d}-11.binary.kitchen.
 ; Point-to-Point
 1.96				IN	PTR	v400.erx-bk.binary.kitchen.
 2.96				IN	PTR	v400.core.binary.kitchen.
-1.97				IN	PTR	vtun1.erx-rz.binary.kitchen.
-2.97				IN	PTR	vtun1.erx-bk.binary.kitchen.
+1.97				IN	PTR	wg0.erx-rz.binary.kitchen.
+2.97				IN	PTR	wg0.erx-bk.binary.kitchen.
diff --git a/roles/dns-intern/templates/bind/binary.kitchen.zone.j2 b/roles/dns-intern/templates/bind/binary.kitchen.zone.j2
index 69a0b80..86f45e5 100644
--- a/roles/dns-intern/templates/bind/binary.kitchen.zone.j2
+++ b/roles/dns-intern/templates/bind/binary.kitchen.zone.j2
@@ -1,7 +1,7 @@
 $ORIGIN binary.kitchen		; base for unqualified names
 $TTL 1h				; default time-to-live
 @				IN	SOA ns.binary.kitchen. hostmaster.binary.kitchen. (
-					2019113001; serial
+					2020051101; serial
 					1d; refresh
 					2h; retry
 					4w; expire
@@ -91,12 +91,12 @@ salat-bmc			IN	A	172.23.9.81
 ; Services RZ
 cernunnos			IN	A	172.23.8.23
 ; VPN RZ (ER-X)
-vtun0.erx-rz			IN	A	172.23.10.1
+wg1.erx-rz			IN	A	172.23.10.1
 $GENERATE 2-254 vpn-${0,3,d}-10	IN	A	172.23.10.$
 ; VPN RZ (pf)
 $GENERATE 2-254 vpn-${0,3,d}-11	IN	A	172.23.11.$
 ; Point-to-Point
 v400.erx-bk			IN	A	172.23.96.1
 v400.core			IN	A	172.23.96.2
-vtun1.erx-rz			IN	A	172.23.97.1
-vtun1.erx-bk			IN	A	172.23.97.2
+wg0.erx-rz			IN	A	172.23.97.1
+wg0.erx-bk			IN	A	172.23.97.2