diff --git a/contrib/etc/ebusd/mqtt-hassio.cfg b/contrib/etc/ebusd/mqtt-hassio.cfg
index 3ad026c6..13b87278 100644
--- a/contrib/etc/ebusd/mqtt-hassio.cfg
+++ b/contrib/etc/ebusd/mqtt-hassio.cfg
@@ -157,8 +157,8 @@ type_map-datetime =
 type_switch-by = %name%field,%unit
 
 # field type switch variables names to use in addition to %type_switch in case of multiple keys (separated by comma).
-# HA integration: var names for topic/class/state values mapped from field type, name, message, and unit.
-type_switch-names = type_topic,type_class,type_state
+# HA integration: var names for topic/class/state/sub values mapped from field type, name, message, and unit.
+type_switch-names = type_topic,type_class,type_state,type_sub
 
 # field type switch for each field type and optionally direction (between dash before the field type) available as
 # %type_switch (as well as the variable names defined in "type_switch-names" if any).
@@ -197,10 +197,12 @@ type_switch-number =
 # HA integration: the mapping list for (potentially) writable binary switch entities by field type, name, message, and unit.
 type_switch-w-list =
     switch,, = onoff
+    switch,,,yesno = yesno
 
 # HA integration: the mapping list for rather binary sensor entities by field type, name, message, and unit.
 type_switch-list =
     binary_sensor,,measurement = onoff
+    binary_sensor,,measurement,yesno = yesno
     sensor,, =
 
 # HA integration: currently unused mapping lists for non-numeric/non-binary entities.
@@ -242,8 +244,8 @@ step_number ?= ,
   "step":%step
 
 # field type part suffix to use instead of the field type itself, see below.
-# HA integration: %type_part variable mapped from the mapped %type_topic
-type_part-by = %type_topic
+# HA integration: %type_part variable mapped from the mapped %type_topic and optional %type_sub
+type_part-by = %type_topic%type_sub
 
 # field type part mappings for each field type (or the "type_part-by" variable value) in the suffix (available as
 # %type_part).
@@ -260,11 +262,20 @@ type_part-switch = ,
   "payload_on":"on",
   "payload_off":"off"%state_class
 
+type_part-switchyesno = ,
+  "command_topic":"%topic/set",
+  "payload_on":"yes",
+  "payload_off":"no"%state_class
+
 # HA integration: %type_part variable for binary_sensor %type_topic
 type_part-binary_sensor = ,
   "payload_on":"on",
   "payload_off":"off"%state_class
 
+type_part-binary_sensoryesno = ,
+  "payload_on":"yes",
+  "payload_off":"no"%state_class
+
 # the field specific part (evaluated after the message specific part).
 # HA integration: set to the mapped %type_part from above
 field_payload = %type_part