diff --git a/components/somfy/cover.py b/components/somfy/cover.py
index bb223e8..1c5e52d 100644
--- a/components/somfy/cover.py
+++ b/components/somfy/cover.py
@@ -13,9 +13,8 @@ CONF_TRANSMITTER = "transmitter"
 CONF_REMOTE_ID_BASE = "remote_id_base"
 CONF_REMOTE_ID_OFFSET = "remote_id_offset"
 
-CONFIG_SCHEMA = cover.COVER_SCHEMA.extend(
+CONFIG_SCHEMA = cover.cover_schema(SomfyRTSCover).extend(
     {
-        cv.GenerateID(): cv.declare_id(SomfyRTSCover),
         cv.Required(CONF_TRANSMITTER): cv.use_id(remote_transmitter.RemoteTransmitterComponent),
         cv.Required(CONF_REMOTE_ID_BASE): cv.uint32_t,
         cv.Required(CONF_REMOTE_ID_OFFSET): cv.uint32_t,
diff --git a/components/zehnder/climate.py b/components/zehnder/climate.py
index 1536bb5..cbcb9a3 100644
--- a/components/zehnder/climate.py
+++ b/components/zehnder/climate.py
@@ -11,9 +11,7 @@ CONF_TEMPERATURE_SENSOR_ID = "temperature_sensor_id"
 zehnder_ns = cg.esphome_ns.namespace("zehnder")
 ZehnderComponent = zehnder_ns.class_("ZehnderComponent", climate.Climate, cg.PollingComponent)
 
-CONFIG_SCHEMA = climate.CLIMATE_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_id(ZehnderComponent),
-
+CONFIG_SCHEMA = climate.climate_schema(ZehnderComponent).extend({
     cv.Required(CONF_TRANSMITTER_ID): cv.use_id(remote_transmitter.RemoteTransmitterComponent),
     cv.Optional(CONF_TEMPERATURE_SENSOR_ID): cv.use_id(sensor.Sensor),
 }).extend(cv.polling_component_schema("1min"))