diff --git a/roles/dhcpd/templates/dhcp/dhcpd.conf.j2 b/roles/dhcpd/templates/dhcp/dhcpd.conf.j2
index 283819d..0eb9398 100644
--- a/roles/dhcpd/templates/dhcp/dhcpd.conf.j2
+++ b/roles/dhcpd/templates/dhcp/dhcpd.conf.j2
@@ -134,11 +134,6 @@ host spiegelei {
   fixed-address spiegelei.binary.kitchen;
 }
 
-host sushi {
-  hardware ethernet 52:54:00:17:02:23;
-  fixed-address sushi.binary.kitchen;
-}
-
 
 # VoIP Phones
 
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 c09b631..1a84506 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. (
-					2017091801; serial
+					2018011101; serial
 					1d; refresh
 					2h; retry
 					4w; expire
@@ -36,7 +36,6 @@ $TTL 1h				; default time-to-live
 13.2				IN	PTR	matrix.binary.kitchen.
 33.2				IN	PTR	pizza.binary.kitchen.
 34.2				IN	PTR	apfelkuchen.binary.kitchen.
-35.2				IN	PTR	sushi.binary.kitchen.
 36.2				IN	PTR	schweinshaxn.binary.kitchen.
 43.2				IN	PTR	cannelloni.binary.kitchen.
 44.2				IN	PTR	cashdesk.binary.kitchen.
@@ -49,7 +48,6 @@ $GENERATE 10-240 $.3		IN	PTR	dhcp-${0,3,d}-03.binary.kitchen.
 242.3				IN	PTR	spaghetti.binary.kitchen.
 ; MQTT
 1.4				IN	PTR	v2304.core.binary.kitchen.
-5.4				IN	PTR	sushi.mqtt.binary.kitchen.
 6.4				IN	PTR	pizza.mqtt.binary.kitchen.
 $GENERATE 10-240 $.4		IN	PTR	dhcp-${0,3,d}-04.binary.kitchen.
 ; Management RZ
diff --git a/roles/dns/templates/bind/binary.kitchen.zone.j2 b/roles/dns/templates/bind/binary.kitchen.zone.j2
index 6e3fba8..6bab7da 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. (
-					2017091801; serial
+					2018011101; serial
 					1d; refresh
 					2h; retry
 					4w; expire
@@ -50,7 +50,6 @@ lock				IN	A	172.23.2.12
 matrix				IN	A	172.23.2.13
 pizza				IN	A	172.23.2.33
 apfelkuchen			IN	A	172.23.2.34
-sushi				IN	A	172.23.2.35
 schweinshaxn			IN	A	172.23.2.36
 cannelloni			IN	A	172.23.2.43
 cashdesk			IN	A	172.23.2.44
@@ -63,7 +62,7 @@ klopi				IN	A	172.23.3.241
 spaghetti			IN	A	172.23.3.242
 ; MQTT
 v2304.core			IN	A	172.23.4.1
-sushi.mqtt			IN	A	172.23.4.5
+pizza.mqtt			IN	A	172.23.4.6
 $GENERATE 1-240 dhcp-${0,3,d}-04	IN	A	172.23.4.$
 ; Management RZ
 cernunnos			IN	A	172.23.8.23