diff --git a/contrib/etc/ebusd/mqtt-hassio.cfg b/contrib/etc/ebusd/mqtt-hassio.cfg
index ab000d8bb..77789771a 100644
--- a/contrib/etc/ebusd/mqtt-hassio.cfg
+++ b/contrib/etc/ebusd/mqtt-hassio.cfg
@@ -105,7 +105,7 @@ filter-seen = 5
 #filter-non-circuit =
 # include only messages having the specified name (partial match, alternatives and wildcard supported).
 # HA integration: filter to some useful names for monitoring the heating circuit
-filter-name = status|temp|humidity|yield|count|energy|power|runtime|hours|starts|mode|curve|^load$|^party$|sensor|timer
+filter-name = status|temp|humidity|yield|count|energy|power|runtime|hours|starts|mode|curve|^load$|^party$|sensor|timer|co2|air|flow|filter|inlet|exhaust|pressure|reset
 # exclude messages having the specified name (partial match, alternatives and wildcard supported).
 #filter-non-name =
 # include only messages having the specified level (partial match, alternatives and wildcard supported).
@@ -169,8 +169,7 @@ type_switch-names = type_topic,type_class,type_state,type_sub
 # matches at all, the variable(s) are set to the empty string.
 # HA integration: the mapping list for (potentially) writable number entities by field type, name, message, and unit.
 type_switch-w-number =
-    number,temperature, = temp|,°C$
-    number,temperature, = temp|,K$
+    number,temperature, = temp|,°C$|,K$
     number,, = integral|,°min$
     number,power_factor, = power*%%
     number,power, = power|,kW$|,W$
@@ -178,14 +177,15 @@ type_switch-w-number =
     number,current, = current,|,A$
     number,pressure, = bar$
     number,gas, = gas*/min$
+    number,volume, = m³$
+    number,volume_flow_rate, = m³/h$
     number,humidity, = humid*%%$
-    number,, = curve,
+    number,, =
 
 # HA integration: the mapping list for numeric sensor entities by field type, name, message, and unit.
 type_switch-number =
     sensor,,total_increasing = poweron|count,
-    sensor,temperature,measurement = temp|,°C$
-    sensor,temperature,measurement = temp|,K$
+    sensor,temperature,measurement = temp|,°C$|,K$
     sensor,power_factor,measurement = power*%%
     sensor,power,measurement = power|,kW$|,W$
     sensor,voltage,measurement = volt|,V$
@@ -193,10 +193,14 @@ type_switch-number =
     sensor,,measurement = integral|,°min$
     sensor,energy,total_increasing = energy|,Wh$
     sensor,yield,total_increasing = total*,Wh$
-    sensor,,total_increasing = hours|,h$
+    sensor,duration,total_increasing = hours|days|,h$
     sensor,,total_increasing = starts*,$
-    sensor,pressure,measurement = bar$
+    sensor,pressure,measurement = bar$|Pa$
     sensor,gas,measurement = gas*/min$
+    sensor,volume,total_increasing = total*,m³$
+    sensor,volume,measurement = m³$
+    sensor,volume_flow_rate,measurement = m³/h$
+    sensor,carbon_dioxide,measurement = CO2*,ppm$
     sensor,humidity,measurement = humid*%%$
     sensor,, =
 
@@ -379,6 +383,7 @@ def_global_running-payload = %global_prefix,
   "device_class":"running"%global_boolean_suffix
 def_global_version-topic =
 def_global_uptime-payload = %global_prefix,
+  "device_class":"duration",
   "state_class":"total_increasing",
   "unit_of_measurement":"s"
  }