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 d598adb..cb40234 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 ns1.binary.kitchen. hostmaster.binary.kitchen. (
-					2021061701; serial
+					2021070501; serial
 					1d; refresh
 					2h; retry
 					4w; expire
@@ -13,8 +13,7 @@ $TTL 1h				; default time-to-live
 1.0				IN	PTR	core.binary.kitchen.
 2.0				IN	PTR	erx-bk.binary.kitchen.
 3.0				IN	PTR	erx-rz.binary.kitchen.
-4.0				IN	PTR	pf-bk.binary.kitchen.
-5.0				IN	PTR	pf-rz.binary.kitchen.
+4.0				IN	PTR	erx-auweg.binary.kitchen.
 ; Management
 1.1				IN	PTR	v2301.core.binary.kitchen.
 11.1				IN	PTR	ups1.binary.kitchen.
@@ -76,14 +75,13 @@ $GENERATE 10-240 $.4		IN	PTR	dhcp-${0,3,d}-04.binary.kitchen.
 61.9				IN	PTR	salat.binary.kitchen.
 81.9				IN	PTR	salat-bmc.binary.kitchen.
 ; Services RZ
-23.8				IN	PTR	cernunnos.binary.kitchen.
 ; VPN RZ (ER-X)
-1.10				IN	PTR	wg1.erx-rz.binary.kitchen.
+1.10				IN	PTR	wg0.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	wg0.erx-rz.binary.kitchen.
-2.97				IN	PTR	wg0.erx-bk.binary.kitchen.
+1.97				IN	PTR	wg1.erx-rz.binary.kitchen.
+2.97				IN	PTR	wg1.erx-bk.binary.kitchen.
+5.97				IN	PTR	wg2.erx-rz.binary.kitchen.
+6.97				IN	PTR	wg2.erx-auweg.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 4979950..cbfe8cd 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 ns1.binary.kitchen. hostmaster.binary.kitchen. (
-					2021061701; serial
+					2021070501; serial
 					1d; refresh
 					2h; retry
 					4w; expire
@@ -34,8 +34,7 @@ radius				IN	A	172.23.2.4
 core				IN	A	172.23.0.1
 erx-bk				IN	A	172.23.0.2
 erx-rz				IN	A	172.23.0.3
-pf-bk				IN	A	172.23.0.4
-pf-rz				IN	A	172.23.0.5
+erx-auweg			IN	A	172.23.0.4
 ; Management
 v2301.core			IN	A	172.23.1.1
 ups1				IN	A	172.23.1.11
@@ -95,14 +94,13 @@ switch0.erx-rz			IN	A	172.23.9.1
 salat				IN	A	172.23.9.61
 salat-bmc			IN	A	172.23.9.81
 ; Services RZ
-cernunnos			IN	A	172.23.8.23
 ; VPN RZ (ER-X)
-wg1.erx-rz			IN	A	172.23.10.1
+wg0.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
-wg0.erx-rz			IN	A	172.23.97.1
-wg0.erx-bk			IN	A	172.23.97.2
+wg1.erx-rz			IN	A	172.23.97.1
+wg1.erx-bk			IN	A	172.23.97.2
+wg2.erx-rz			IN	A	172.23.97.5
+wg2.erx-auweg			IN	A	172.23.97.6