diff --git a/roles/dhcpd/templates/default/isc-dhcp-server b/roles/dhcpd/templates/default/isc-dhcp-server.j2
similarity index 100%
rename from roles/dhcpd/templates/default/isc-dhcp-server
rename to roles/dhcpd/templates/default/isc-dhcp-server.j2
diff --git a/roles/dhcpd/templates/dhcp/dhcpd.conf.j2 b/roles/dhcpd/templates/dhcp/dhcpd.conf.j2
index b951990..d559a46 100644
--- a/roles/dhcpd/templates/dhcp/dhcpd.conf.j2
+++ b/roles/dhcpd/templates/dhcp/dhcpd.conf.j2
@@ -109,9 +109,9 @@ host matrix {
   fixed-address matrix.binary.kitchen;
 }
 
-host sushi {
-  hardware ethernet 52:54:00:17:02:23;
-  fixed-address sushi.binary.kitchen;
+host pizza {
+  hardware ethernet 52:54:00:17:02:21;
+  fixed-address pizza.binary.kitchen;
 }
 
 host punsch {
@@ -124,6 +124,11 @@ host spiegelei {
   fixed-address spiegelei.binary.kitchen;
 }
 
+host sushi {
+  hardware ethernet 52:54:00:17:02:23;
+  fixed-address sushi.binary.kitchen;
+}
+
 
 # OMAPI
 
diff --git a/roles/dns/templates/bind/23.172.in-addr.arpa.zone.j2 b/roles/dns/templates/bind/23.172.in-addr.arpa.zone.j2
index 9c31a05..0a81bb2 100644
--- a/roles/dns/templates/bind/23.172.in-addr.arpa.zone.j2
+++ b/roles/dns/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. (
-					2017070100; serial
+					2017083101; serial
 					1d; refresh
 					2h; retry
 					4w; expire
@@ -10,9 +10,13 @@ $TTL 1h				; default time-to-live
 				IN	NS	ns.binary.kitchen.
 ; Management
 1.1				IN	PTR	v2301.core.binary.kitchen.
-11.1				IN	PTR	apcusv.binary.kitchen.
-21.1				IN	PTR	sw01.binary.kitchen.
-22.1				IN	PTR	sw02.binary.kitchen.
+11.1				IN	PTR	ups1.binary.kitchen.
+12.1				IN	PTR	ups2.binary.kitchen.
+21.1				IN	PTR	pdu1.binary.kitchen.
+22.1				IN	PTR	pdu2.binary.kitchen.
+23.1				IN	PTR	pdu3.binary.kitchen.
+31.1				IN	PTR	sw01.binary.kitchen.
+32.1				IN	PTR	sw02.binary.kitchen.
 41.1				IN	PTR	ap01.binary.kitchen.
 42.1				IN	PTR	ap02.binary.kitchen.
 43.1				IN	PTR	ap03.binary.kitchen.
@@ -30,6 +34,7 @@ $TTL 1h				; default time-to-live
 11.2				IN	PTR	homer.binary.kitchen.
 12.2				IN	PTR	lock.binary.kitchen.
 13.2				IN	PTR	matrix.binary.kitchen.
+33.2				IN	PTR	pizza.binary.kitchen.
 35.2				IN	PTR	sushi.binary.kitchen.
 43.2				IN	PTR	cannelloni.binary.kitchen.
 44.2				IN	PTR	cashdesk.binary.kitchen.
diff --git a/roles/dns/templates/bind/binary.kitchen.zone.j2 b/roles/dns/templates/bind/binary.kitchen.zone.j2
index 15443d7..18be7cf 100644
--- a/roles/dns/templates/bind/binary.kitchen.zone.j2
+++ b/roles/dns/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. (
-					2017070100; serial
+					2017083101; serial
 					1d; refresh
 					2h; retry
 					4w; expire
@@ -24,9 +24,13 @@ radius1				IN	A	172.23.2.3
 radius2				IN	A	172.23.2.4
 ; Management
 v2301.core			IN	A	172.23.1.1
-apcusv				IN	A	172.23.1.11
-sw01				IN	A	172.23.1.21
-sw02				IN	A	172.23.1.22
+ups1				IN	A	172.23.1.11
+ups2				IN	A	172.23.1.12
+pdu1				IN	A	172.23.1.21
+pdu2				IN	A	172.23.1.22
+pdu3				IN	A	172.23.1.23
+sw01				IN	A	172.23.1.31
+sw02				IN	A	172.23.1.32
 ap01				IN	A	172.23.1.41
 ap02				IN	A	172.23.1.42
 ap03				IN	A	172.23.1.43
@@ -44,6 +48,7 @@ nabia				IN	A	172.23.2.6
 homer				IN	A	172.23.2.11
 lock				IN	A	172.23.2.12
 matrix				IN	A	172.23.2.13
+pizza				IN	A	172.23.2.33
 sushi				IN	A	172.23.2.35
 cannelloni			IN	A	172.23.2.43
 cashdesk			IN	A	172.23.2.44