diff --git a/CHANGELOG.md b/CHANGELOG.md
index a5522445e..6bb49351f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,9 @@
 
 Versions from 0.40 and up
 
-## Ongoing
+## v0.61.0
 
+- Final revisit of diagnostics category assignments as accepted in Core Plugwise, via PR [#965](https://github.com/plugwise/plugwise-beta/pull/965)
 - Revisit diagnostics category assignments based on [#810](https://github.com/plugwise/python-plugwise/issues/810) via PR [#952](https://github.com/plugwise/plugwise-beta/pull/952)
 - New feature: implement setting Adam zone profile via PR [#958](https://github.com/plugwise/plugwise-beta/pull/958)
 - Implement translation for added homeassistantError raise message via PR [#948](https://github.com/plugwise/plugwise-beta/pull/948)
diff --git a/custom_components/plugwise/binary_sensor.py b/custom_components/plugwise/binary_sensor.py
index d4170f246..fb7430118 100644
--- a/custom_components/plugwise/binary_sensor.py
+++ b/custom_components/plugwise/binary_sensor.py
@@ -71,6 +71,7 @@ class PlugwiseBinarySensorEntityDescription(BinarySensorEntityDescription):
     PlugwiseBinarySensorEntityDescription(
         key=DHW_STATE,
         translation_key=DHW_STATE,
+        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     PlugwiseBinarySensorEntityDescription(
         key=FLAME_STATE,
@@ -80,10 +81,12 @@ class PlugwiseBinarySensorEntityDescription(BinarySensorEntityDescription):
     PlugwiseBinarySensorEntityDescription(
         key=HEATING_STATE,
         translation_key=HEATING_STATE,
+        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     PlugwiseBinarySensorEntityDescription(
         key=COOLING_STATE,
         translation_key=COOLING_STATE,
+        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     PlugwiseBinarySensorEntityDescription(
         key=SECONDARY_BOILER_STATE,
@@ -93,6 +96,7 @@ class PlugwiseBinarySensorEntityDescription(BinarySensorEntityDescription):
     PlugwiseBinarySensorEntityDescription(
         key=PLUGWISE_NOTIFICATION,
         translation_key=PLUGWISE_NOTIFICATION,
+        entity_category=EntityCategory.DIAGNOSTIC,
     ),
 )
 
diff --git a/custom_components/plugwise/manifest.json b/custom_components/plugwise/manifest.json
index 80819e5ea..d396d880f 100644
--- a/custom_components/plugwise/manifest.json
+++ b/custom_components/plugwise/manifest.json
@@ -8,6 +8,6 @@
   "iot_class": "local_polling",
   "loggers": ["plugwise"],
   "requirements": ["plugwise==1.10.0"],
-  "version": "0.60.0",
+  "version": "0.61.0",
   "zeroconf": ["_plugwise._tcp.local."]
 }
diff --git a/custom_components/plugwise/sensor.py b/custom_components/plugwise/sensor.py
index f90b6e4b9..6e7fe6b45 100644
--- a/custom_components/plugwise/sensor.py
+++ b/custom_components/plugwise/sensor.py
@@ -127,6 +127,7 @@ class PlugwiseSensorEntityDescription(SensorEntityDescription):
         translation_key=INTENDED_BOILER_TEMP,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
+        entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     PlugwiseSensorEntityDescription(
@@ -142,6 +143,7 @@ class PlugwiseSensorEntityDescription(SensorEntityDescription):
         translation_key=OUTDOOR_TEMP,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
+        entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=1,
     ),
@@ -158,6 +160,7 @@ class PlugwiseSensorEntityDescription(SensorEntityDescription):
         translation_key=WATER_TEMP,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
+        entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     PlugwiseSensorEntityDescription(
@@ -393,12 +396,14 @@ class PlugwiseSensorEntityDescription(SensorEntityDescription):
         key="battery",
         native_unit_of_measurement=PERCENTAGE,
         device_class=SensorDeviceClass.BATTERY,
+        entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     PlugwiseSensorEntityDescription(
         key="illuminance",
         native_unit_of_measurement=LIGHT_LUX,
         device_class=SensorDeviceClass.ILLUMINANCE,
+        entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     PlugwiseSensorEntityDescription(
@@ -412,6 +417,7 @@ class PlugwiseSensorEntityDescription(SensorEntityDescription):
         key=VALVE_POS,
         translation_key=VALVE_POS,
         native_unit_of_measurement=PERCENTAGE,
+        entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     PlugwiseSensorEntityDescription(
@@ -433,6 +439,7 @@ class PlugwiseSensorEntityDescription(SensorEntityDescription):
         translation_key=DHW_TEMP,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
+        entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     PlugwiseSensorEntityDescription(
@@ -440,6 +447,7 @@ class PlugwiseSensorEntityDescription(SensorEntityDescription):
         translation_key=DHW_SETPOINT,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
+        entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.MEASUREMENT,
     ),
 )
diff --git a/pyproject.toml b/pyproject.toml
index e26df2d75..f348e8152 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "plugwise-beta"
-version = "0.60.0"
+version = "0.61.0"
 description = "Plugwise beta custom-component"
 readme = "README.md"
 requires-python = ">=3.13"