diff --git a/custom_components/idrac_power/binary_sensor.py b/custom_components/idrac_power/binary_sensor.py
index 464b32f..bf8fe8d 100644
--- a/custom_components/idrac_power/binary_sensor.py
+++ b/custom_components/idrac_power/binary_sensor.py
@@ -38,7 +38,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry, async_add_e
         name=name,
         manufacturer=manufacturer,
         model=model,
-        sw_version=firmware_version
+        sw_version=firmware_version,
+        serial_number=serial
     )
 
     async_add_entities([
diff --git a/custom_components/idrac_power/button.py b/custom_components/idrac_power/button.py
index bf471e3..b4c8bb8 100644
--- a/custom_components/idrac_power/button.py
+++ b/custom_components/idrac_power/button.py
@@ -32,7 +32,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry, async_add_e
         name=name,
         manufacturer=manufacturer,
         model=model,
-        sw_version=firmware_version
+        sw_version=firmware_version,
+        serial_number=serial
     )
 
     async_add_entities([
diff --git a/custom_components/idrac_power/sensor.py b/custom_components/idrac_power/sensor.py
index 91f7138..b631095 100644
--- a/custom_components/idrac_power/sensor.py
+++ b/custom_components/idrac_power/sensor.py
@@ -64,7 +64,7 @@ async def refresh_sensors_task():
             await hass.async_add_executor_job(rest_client.update_power_usage)
             await asyncio.sleep(rest_client.interval)
 
-    hass.async_create_background_task(refresh_sensors_task(), "Update iDRAC task")
+    hass.async_create_background_task(refresh_sensors_task(), f"Update {name} iDRAC task")
 
 
 class IdracCurrentPowerSensor(SensorEntity):