diff --git a/custom_components/mikrotik_router/mikrotik_controller.py b/custom_components/mikrotik_router/mikrotik_controller.py
index 2c632f1..61f70cc 100644
--- a/custom_components/mikrotik_router/mikrotik_controller.py
+++ b/custom_components/mikrotik_router/mikrotik_controller.py
@@ -938,7 +938,14 @@ class MikrotikControllerData:
         self.data["health"] = parse_api(
             data=self.data["health"],
             source=self.api.path("/system/health"),
-            vals=[{"name": "temperature", "default": "unknown"}],
+            vals=[
+                {"name": "temperature", "default": "unknown"},
+                {"name": "cpu-temperature", "default": "unknown"},
+                {"name": "power-consumption", "default": "unknown"},
+                {"name": "board-temperature1", "default": "unknown"},
+                {"name": "fan1-speed", "default": "unknown"},
+                {"name": "fan2-speed", "default": "unknown"},
+            ],
         )
 
     # ---------------------------
diff --git a/custom_components/mikrotik_router/sensor.py b/custom_components/mikrotik_router/sensor.py
index 6b66455..0dea428 100644
--- a/custom_components/mikrotik_router/sensor.py
+++ b/custom_components/mikrotik_router/sensor.py
@@ -45,15 +45,6 @@ ATTR_PATH = "data_path"
 ATTR_ATTR = "data_attr"
 
 SENSOR_TYPES = {
-    "system_uptime": {
-        ATTR_DEVICE_CLASS: None,
-        ATTR_ICON: "mdi:clock-outline",
-        ATTR_LABEL: "Uptime",
-        ATTR_UNIT: "h",
-        ATTR_GROUP: "System",
-        ATTR_PATH: "resource",
-        ATTR_ATTR: "uptime",
-    },
     "system_temperature": {
         ATTR_DEVICE_CLASS: None,
         ATTR_ICON: "mdi:thermometer",
@@ -63,6 +54,60 @@ SENSOR_TYPES = {
         ATTR_PATH: "health",
         ATTR_ATTR: "temperature",
     },
+    "system_cpu-temperature": {
+        ATTR_DEVICE_CLASS: None,
+        ATTR_ICON: "mdi:thermometer",
+        ATTR_LABEL: "CPU temperature",
+        ATTR_UNIT: TEMP_CELSIUS,
+        ATTR_GROUP: "System",
+        ATTR_PATH: "health",
+        ATTR_ATTR: "cpu-temperature",
+    },
+    "system_board-temperature1": {
+        ATTR_DEVICE_CLASS: None,
+        ATTR_ICON: "mdi:thermometer",
+        ATTR_LABEL: "Board temperature",
+        ATTR_UNIT: TEMP_CELSIUS,
+        ATTR_GROUP: "System",
+        ATTR_PATH: "health",
+        ATTR_ATTR: "board-temperature1",
+    },
+    "system_power-consumption": {
+        ATTR_DEVICE_CLASS: None,
+        ATTR_ICON: "mdi:transmission-tower",
+        ATTR_LABEL: "Power consumption",
+        ATTR_UNIT: "W",
+        ATTR_GROUP: "System",
+        ATTR_PATH: "health",
+        ATTR_ATTR: "power-consumption",
+    },
+    "system_fan1-speed": {
+        ATTR_DEVICE_CLASS: None,
+        ATTR_ICON: "mdi:transmission-tower",
+        ATTR_LABEL: "Fan1 speed",
+        ATTR_UNIT: "RPM",
+        ATTR_GROUP: "System",
+        ATTR_PATH: "health",
+        ATTR_ATTR: "fan1-speed",
+    },
+    "system_fan2-speed": {
+        ATTR_DEVICE_CLASS: None,
+        ATTR_ICON: "mdi:transmission-tower",
+        ATTR_LABEL: "Fan2 speed",
+        ATTR_UNIT: "RPM",
+        ATTR_GROUP: "System",
+        ATTR_PATH: "health",
+        ATTR_ATTR: "fan2-speed",
+    },
+    "system_uptime": {
+        ATTR_DEVICE_CLASS: None,
+        ATTR_ICON: "mdi:clock-outline",
+        ATTR_LABEL: "Uptime",
+        ATTR_UNIT: "h",
+        ATTR_GROUP: "System",
+        ATTR_PATH: "resource",
+        ATTR_ATTR: "uptime",
+    },
     "system_cpu-load": {
         ATTR_DEVICE_CLASS: None,
         ATTR_ICON: "mdi:speedometer",