diff --git a/roles/firewall/templates/firewall.j2 b/roles/firewall/templates/firewall.j2
index 1df301a..710e3dc 100644
--- a/roles/firewall/templates/firewall.j2
+++ b/roles/firewall/templates/firewall.j2
@@ -524,17 +524,6 @@ config rule
 	option target 'ACCEPT'
 	option family 'ipv4'
 
-config rule
-	option name 'Allow-FORWARD-Home-Assistant-Kodi'
-	option src 'dmz'
-	option src_ip '{{ lookup('dig', 'ha.mateu.be') }}'
-	list proto 'tcp'
-	option dest 'lan'
-	option dest_ip '{{ lookup('dig', 'libreelec.mateu.be') }}'
-	option dest_port '8080'
-	option target 'ACCEPT'
-	option family 'ipv4'
-
 config rule
 	option name 'Allow-FORWARD-Home-Assistant-RM4Pro'
 	option src 'dmz'
@@ -544,6 +533,15 @@ config rule
 	option target 'ACCEPT'
 	option family 'ipv4'
 
+config rule
+	option name 'Allow-FORWARD-esp32cc-Home-Assistant'
+	option src 'dmz'
+	option src_ip '{{ lookup('dig', 'ha.mateu.be') }}'
+	option dest 'iot'
+	option dest_ip '{{ lookup('dig', 'esp32cc.mateu.be') }}'
+	option target 'ACCEPT'
+	option family 'ipv4'
+
 ### IoT Rules
 ## General Rules
 # ICMP
diff --git a/roles/nsd/templates/zones/mateu.be.zone.j2 b/roles/nsd/templates/zones/mateu.be.zone.j2
index 3b3d6ba..26181c6 100644
--- a/roles/nsd/templates/zones/mateu.be.zone.j2
+++ b/roles/nsd/templates/zones/mateu.be.zone.j2
@@ -30,6 +30,7 @@ baybay-ponay		IN AAAA 2a01:e0a:9bd:2810:9e6b:ff:fe13:ef88
 ciol		IN A 109.190.68.133
 derdriu		IN A 10.233.212.77
 enbarr.dmz		IN AAAA 2a01:e0a:9bd:2811::50
+esp32cc		IN A 10.233.211.201
 evse		IN A 10.233.211.198
 fc		IN A 10.233.211.194
 frederica.dmz		IN A {{ global_public_ip_address }}