diff --git a/homeassistant/components/ebusd/const.py b/homeassistant/components/ebusd/const.py
index ce631297db6..9bc489f40f2 100644
--- a/homeassistant/components/ebusd/const.py
+++ b/homeassistant/components/ebusd/const.py
@@ -1,11 +1,11 @@
 """Constants for ebus component."""
 from homeassistant.components.sensor import SensorDeviceClass
 from homeassistant.const import (
-    ENERGY_KILO_WATT_HOUR,
     PERCENTAGE,
-    PRESSURE_BAR,
-    TEMP_CELSIUS,
-    TIME_SECONDS,
+    UnitOfEnergy,
+    UnitOfPressure,
+    UnitOfTemperature,
+    UnitOfTime,
 )
 
 DOMAIN = "ebusd"
@@ -17,21 +17,21 @@ SENSOR_TYPES = {
     "700": {
         "ActualFlowTemperatureDesired": [
             "Hc1ActualFlowTempDesired",
-            TEMP_CELSIUS,
+            UnitOfTemperature.CELSIUS,
             None,
             0,
             SensorDeviceClass.TEMPERATURE,
         ],
         "MaxFlowTemperatureDesired": [
             "Hc1MaxFlowTempDesired",
-            TEMP_CELSIUS,
+            UnitOfTemperature.CELSIUS,
             None,
             0,
             SensorDeviceClass.TEMPERATURE,
         ],
         "MinFlowTemperatureDesired": [
             "Hc1MinFlowTempDesired",
-            TEMP_CELSIUS,
+            UnitOfTemperature.CELSIUS,
             None,
             0,
             SensorDeviceClass.TEMPERATURE,
@@ -39,28 +39,28 @@ SENSOR_TYPES = {
         "PumpStatus": ["Hc1PumpStatus", None, "mdi:toggle-switch", 2, None],
         "HCSummerTemperatureLimit": [
             "Hc1SummerTempLimit",
-            TEMP_CELSIUS,
+            UnitOfTemperature.CELSIUS,
             "mdi:weather-sunny",
             0,
             SensorDeviceClass.TEMPERATURE,
         ],
         "HolidayTemperature": [
             "HolidayTemp",
-            TEMP_CELSIUS,
+            UnitOfTemperature.CELSIUS,
             None,
             0,
             SensorDeviceClass.TEMPERATURE,
         ],
         "HWTemperatureDesired": [
             "HwcTempDesired",
-            TEMP_CELSIUS,
+            UnitOfTemperature.CELSIUS,
             None,
             0,
             SensorDeviceClass.TEMPERATURE,
         ],
         "HWActualTemperature": [
             "HwcStorageTemp",
-            TEMP_CELSIUS,
+            UnitOfTemperature.CELSIUS,
             None,
             0,
             SensorDeviceClass.TEMPERATURE,
@@ -73,39 +73,45 @@ SENSOR_TYPES = {
         "HWTimerSaturday": ["hwcTimer.Saturday", None, "mdi:timer-outline", 1, None],
         "HWTimerSunday": ["hwcTimer.Sunday", None, "mdi:timer-outline", 1, None],
         "HWOperativeMode": ["HwcOpMode", None, "mdi:math-compass", 3, None],
-        "WaterPressure": ["WaterPressure", PRESSURE_BAR, "mdi:water-pump", 0, None],
+        "WaterPressure": [
+            "WaterPressure",
+            UnitOfPressure.BAR,
+            "mdi:water-pump",
+            0,
+            SensorDeviceClass.PRESSURE,
+        ],
         "Zone1RoomZoneMapping": ["z1RoomZoneMapping", None, "mdi:label", 0, None],
         "Zone1NightTemperature": [
             "z1NightTemp",
-            TEMP_CELSIUS,
+            UnitOfTemperature.CELSIUS,
             "mdi:weather-night",
             0,
             SensorDeviceClass.TEMPERATURE,
         ],
         "Zone1DayTemperature": [
             "z1DayTemp",
-            TEMP_CELSIUS,
+            UnitOfTemperature.CELSIUS,
             "mdi:weather-sunny",
             0,
             SensorDeviceClass.TEMPERATURE,
         ],
         "Zone1HolidayTemperature": [
             "z1HolidayTemp",
-            TEMP_CELSIUS,
+            UnitOfTemperature.CELSIUS,
             None,
             0,
             SensorDeviceClass.TEMPERATURE,
         ],
         "Zone1RoomTemperature": [
             "z1RoomTemp",
-            TEMP_CELSIUS,
+            UnitOfTemperature.CELSIUS,
             None,
             0,
             SensorDeviceClass.TEMPERATURE,
         ],
         "Zone1ActualRoomTemperatureDesired": [
             "z1ActualRoomTempDesired",
-            TEMP_CELSIUS,
+            UnitOfTemperature.CELSIUS,
             None,
             0,
             SensorDeviceClass.TEMPERATURE,
@@ -126,37 +132,37 @@ SENSOR_TYPES = {
         "Zone1OperativeMode": ["z1OpMode", None, "mdi:math-compass", 3, None],
         "ContinuosHeating": [
             "ContinuosHeating",
-            TEMP_CELSIUS,
+            UnitOfTemperature.CELSIUS,
             "mdi:weather-snowy",
             0,
             SensorDeviceClass.TEMPERATURE,
         ],
         "PowerEnergyConsumptionLastMonth": [
             "PrEnergySumHcLastMonth",
-            ENERGY_KILO_WATT_HOUR,
+            UnitOfEnergy.KILO_WATT_HOUR,
             "mdi:flash",
             0,
-            None,
+            SensorDeviceClass.ENERGY,
         ],
         "PowerEnergyConsumptionThisMonth": [
             "PrEnergySumHcThisMonth",
-            ENERGY_KILO_WATT_HOUR,
+            UnitOfEnergy.KILO_WATT_HOUR,
             "mdi:flash",
             0,
-            None,
+            SensorDeviceClass.ENERGY,
         ],
     },
     "ehp": {
         "HWTemperature": [
             "HwcTemp",
-            TEMP_CELSIUS,
+            UnitOfTemperature.CELSIUS,
             None,
             4,
             SensorDeviceClass.TEMPERATURE,
         ],
         "OutsideTemp": [
             "OutsideTemp",
-            TEMP_CELSIUS,
+            UnitOfTemperature.CELSIUS,
             None,
             4,
             SensorDeviceClass.TEMPERATURE,
@@ -165,57 +171,63 @@ SENSOR_TYPES = {
     "bai": {
         "HotWaterTemperature": [
             "HwcTemp",
-            TEMP_CELSIUS,
+            UnitOfTemperature.CELSIUS,
             None,
             4,
             SensorDeviceClass.TEMPERATURE,
         ],
         "StorageTemperature": [
             "StorageTemp",
-            TEMP_CELSIUS,
+            UnitOfTemperature.CELSIUS,
             None,
             4,
             SensorDeviceClass.TEMPERATURE,
         ],
         "DesiredStorageTemperature": [
             "StorageTempDesired",
-            TEMP_CELSIUS,
+            UnitOfTemperature.CELSIUS,
             None,
             0,
             SensorDeviceClass.TEMPERATURE,
         ],
         "OutdoorsTemperature": [
             "OutdoorstempSensor",
-            TEMP_CELSIUS,
+            UnitOfTemperature.CELSIUS,
             None,
             4,
             SensorDeviceClass.TEMPERATURE,
         ],
-        "WaterPressure": ["WaterPressure", PRESSURE_BAR, "mdi:pipe", 4, None],
+        "WaterPressure": [
+            "WaterPressure",
+            UnitOfPressure.BAR,
+            "mdi:pipe",
+            4,
+            SensorDeviceClass.PRESSURE,
+        ],
         "AverageIgnitionTime": [
             "averageIgnitiontime",
-            TIME_SECONDS,
+            UnitOfTime.SECONDS,
             "mdi:av-timer",
             0,
-            None,
+            SensorDeviceClass.DURATION,
         ],
         "MaximumIgnitionTime": [
             "maxIgnitiontime",
-            TIME_SECONDS,
+            UnitOfTime.SECONDS,
             "mdi:av-timer",
             0,
-            None,
+            SensorDeviceClass.DURATION,
         ],
         "MinimumIgnitionTime": [
             "minIgnitiontime",
-            TIME_SECONDS,
+            UnitOfTime.SECONDS,
             "mdi:av-timer",
             0,
-            None,
+            SensorDeviceClass.DURATION,
         ],
         "ReturnTemperature": [
             "ReturnTemp",
-            TEMP_CELSIUS,
+            UnitOfTemperature.CELSIUS,
             None,
             4,
             SensorDeviceClass.TEMPERATURE,
@@ -224,14 +236,14 @@ SENSOR_TYPES = {
         "HeatingSwitch": ["HeatingSwitch", None, "mdi:toggle-switch", 2, None],
         "DesiredFlowTemperature": [
             "FlowTempDesired",
-            TEMP_CELSIUS,
+            UnitOfTemperature.CELSIUS,
             None,
             0,
             SensorDeviceClass.TEMPERATURE,
         ],
         "FlowTemperature": [
             "FlowTemp",
-            TEMP_CELSIUS,
+            UnitOfTemperature.CELSIUS,
             None,
             4,
             SensorDeviceClass.TEMPERATURE,
@@ -239,25 +251,25 @@ SENSOR_TYPES = {
         "Flame": ["Flame", None, "mdi:toggle-switch", 2, None],
         "PowerEnergyConsumptionHeatingCircuit": [
             "PrEnergySumHc1",
-            ENERGY_KILO_WATT_HOUR,
+            UnitOfEnergy.KILO_WATT_HOUR,
             "mdi:flash",
             0,
-            None,
+            SensorDeviceClass.ENERGY,
         ],
         "PowerEnergyConsumptionHotWaterCircuit": [
             "PrEnergySumHwc1",
-            ENERGY_KILO_WATT_HOUR,
+            UnitOfEnergy.KILO_WATT_HOUR,
             "mdi:flash",
             0,
-            None,
+            SensorDeviceClass.ENERGY,
         ],
         "RoomThermostat": ["DCRoomthermostat", None, "mdi:toggle-switch", 2, None],
         "HeatingPartLoad": [
             "PartloadHcKW",
-            ENERGY_KILO_WATT_HOUR,
+            UnitOfEnergy.KILO_WATT_HOUR,
             "mdi:flash",
             0,
-            None,
+            SensorDeviceClass.ENERGY,
         ],
         "StateNumber": ["StateNumber", None, "mdi:fire", 3, None],
         "ModulationPercentage": [