diff --git a/intern/docker_esphome/templates/includes/common.inc.yaml b/intern/docker_esphome/templates/includes/common.inc.yaml
index 3a5ebba75e5b49eb7700f9eb044a799255a1788a..f822182019c0f0d3615eeafd5ced5ae4e316f824 100644
--- a/intern/docker_esphome/templates/includes/common.inc.yaml
+++ b/intern/docker_esphome/templates/includes/common.inc.yaml
@@ -32,4 +32,6 @@ api:
 mqtt:
   broker: 192.168.0.201
   discovery: true 
+  discovery_unique_id_generator: mac
+  discovery_object_id_generator: device_name 
   topic_prefix: "ESPHome/{{ devicename }}"
diff --git a/intern/docker_esphome/templates/includes/common_info.inc.yaml b/intern/docker_esphome/templates/includes/common_info.inc.yaml
index fe012260ad1f4fe9cf5d225f1d3bbf67194e7953..84894e1226d7eb78e62a386c0c2707a3de70f0b7 100644
--- a/intern/docker_esphome/templates/includes/common_info.inc.yaml
+++ b/intern/docker_esphome/templates/includes/common_info.inc.yaml
@@ -34,4 +34,6 @@ api:
 mqtt:
   broker: 192.168.0.201
   discovery: true 
+  discovery_unique_id_generator: mac
+  discovery_object_id_generator: device_name 
   topic_prefix: "ESPHome/{{ devicename }}"