diff --git a/roles/dhcpd/templates/dhcp/dhcpd.conf.j2 b/roles/dhcpd/templates/dhcp/dhcpd.conf.j2
index 3b8bf45..8442d81 100644
--- a/roles/dhcpd/templates/dhcp/dhcpd.conf.j2
+++ b/roles/dhcpd/templates/dhcp/dhcpd.conf.j2
@@ -173,7 +173,7 @@ host bowle {
 }
 
 host cannelloni {
-  hardware ethernet 00:10:f3:15:88:ac;
+  hardware ethernet b8:27:eb:18:5c:11;
   fixed-address cannelloni.binary.kitchen;
 }
 
@@ -182,11 +182,6 @@ host fusilli {
   fixed-address fusilli.binary.kitchen;
 }
 
-host garlic {
-  hardware ethernet b8:27:eb:56:2b:7c;
-  fixed-address garlic.binary.kitchen;
-}
-
 host habdisplay1 {
   hardware ethernet b8:27:eb:b6:62:be;
   fixed-address habdisplay1.mqtt.binary.kitchen;
@@ -208,7 +203,7 @@ host lock {
 }
 
 host maccaroni {
-  hardware ethernet b8:27:eb:18:5c:11;
+  hardware ethernet b8:27:eb:f5:9e:a1;
   fixed-address maccaroni.binary.kitchen;
 }
 
@@ -228,7 +223,7 @@ host mpcnc {
 }
 
 host noodlehub {
-  hardware ethernet b8:27:eb:eb:e5:88;
+  hardware ethernet b8:27:eb:56:2b:7c;
   fixed-address noodlehub.binary.kitchen;
 }
 
@@ -243,7 +238,7 @@ host pizza {
 }
 
 host spaghetti {
-  hardware ethernet b8:27:eb:e3:e9:f1;
+  hardware ethernet b8:27:eb:eb:e5:88;
   fixed-address spaghetti.binary.kitchen;
 }
 
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 19f31c9..6367f43 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
@@ -59,7 +59,6 @@ $GENERATE 10-230 $.3		IN	PTR	dhcp-${0,3,d}-03.binary.kitchen.
 240.3				IN	PTR	fusilli.binary.kitchen.
 241.3				IN	PTR	klopi.binary.kitchen.
 242.3				IN	PTR	mpcnc.binary.kitchen.
-243.3				IN	PTR	garlic.binary.kitchen.
 244.3				IN	PTR	mirror.binary.kitchen.
 245.3				IN	PTR	spaghetti.binary.kitchen.
 246.3				IN	PTR	maccaroni.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 7bca58b..77201ba 100644
--- a/roles/dns_intern/templates/bind/binary.kitchen.zone.j2
+++ b/roles/dns_intern/templates/bind/binary.kitchen.zone.j2
@@ -83,7 +83,6 @@ $GENERATE 10-230 dhcp-${0,3,d}-03	IN	A	172.23.3.$
 fusilli				IN	A	172.23.3.240
 klopi				IN	A	172.23.3.241
 mpcnc				IN	A	172.23.3.242
-garlic				IN	A	172.23.3.243
 mirror				IN	A	172.23.3.244
 spaghetti			IN	A	172.23.3.245
 maccaroni			IN	A	172.23.3.246