diff --git a/homeassistant/components/roborock/select.py b/homeassistant/components/roborock/select.py
index 2d76aac33d3..5cf71bb12f4 100644
--- a/homeassistant/components/roborock/select.py
+++ b/homeassistant/components/roborock/select.py
@@ -7,6 +7,7 @@ from roborock.roborock_typing import RoborockCommand
 
 from homeassistant.components.select import SelectEntity, SelectEntityDescription
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util import slugify
@@ -43,6 +44,7 @@ SELECT_DESCRIPTIONS: list[RoborockSelectDescription] = [
         translation_key="mop_intensity",
         api_command=RoborockCommand.SET_WATER_BOX_CUSTOM_MODE,
         value_fn=lambda data: data.water_box_mode.name,
+        entity_category=EntityCategory.CONFIG,
         options_lambda=lambda data: data.water_box_mode.keys()
         if data.water_box_mode
         else None,
@@ -53,6 +55,7 @@ SELECT_DESCRIPTIONS: list[RoborockSelectDescription] = [
         translation_key="mop_mode",
         api_command=RoborockCommand.SET_MOP_MODE,
         value_fn=lambda data: data.mop_mode.name,
+        entity_category=EntityCategory.CONFIG,
         options_lambda=lambda data: data.mop_mode.keys() if data.mop_mode else None,
         parameter_lambda=lambda key, status: [status.mop_mode.as_dict().get(key)],
     ),
diff --git a/homeassistant/components/roborock/sensor.py b/homeassistant/components/roborock/sensor.py
index 8d58ae96c45..fc2fa6a6e40 100644
--- a/homeassistant/components/roborock/sensor.py
+++ b/homeassistant/components/roborock/sensor.py
@@ -91,6 +91,7 @@ SENSOR_DESCRIPTIONS = [
         translation_key="cleaning_time",
         device_class=SensorDeviceClass.DURATION,
         value_fn=lambda data: data.status.clean_time,
+        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     RoborockSensorDescription(
         native_unit_of_measurement=UnitOfTime.SECONDS,
@@ -99,6 +100,7 @@ SENSOR_DESCRIPTIONS = [
         icon="mdi:history",
         device_class=SensorDeviceClass.DURATION,
         value_fn=lambda data: data.clean_summary.clean_time,
+        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     RoborockSensorDescription(
         key="status",
@@ -114,6 +116,7 @@ SENSOR_DESCRIPTIONS = [
         icon="mdi:texture-box",
         translation_key="cleaning_area",
         value_fn=lambda data: data.status.square_meter_clean_area,
+        entity_category=EntityCategory.DIAGNOSTIC,
         native_unit_of_measurement=AREA_SQUARE_METERS,
     ),
     RoborockSensorDescription(
@@ -121,6 +124,7 @@ SENSOR_DESCRIPTIONS = [
         icon="mdi:texture-box",
         translation_key="total_cleaning_area",
         value_fn=lambda data: data.clean_summary.square_meter_clean_area,
+        entity_category=EntityCategory.DIAGNOSTIC,
         native_unit_of_measurement=AREA_SQUARE_METERS,
     ),
     RoborockSensorDescription(