diff --git a/configuration.yaml b/configuration.yaml
index 25088249..6b551897 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -243,6 +243,15 @@ template:
           {% set total = fm.get('total', {}) if fm else {} %}
           {{ total.get('usedLength', 0) | float | round(2) }}
 
+      # OCTOPRINT HEIGHT WIDGET: clean rounded state + total attribute for companion widget
+      - name: "OctoPrint Height Progress Clean"
+        unique_id: octoprint_height_progress_clean
+        unit_of_measurement: "mm"
+        device_class: distance
+        state: "{{ states('sensor.octoprint_height_progress') | float(0) | round(1) }}"
+        attributes:
+          total: "{{ (state_attr('sensor.octoprint_height_progress', 'total') | float(0)) | round(1) }}"
+
 # Legacy and Integration Sensor Section
 sensor:
   - platform: torque
diff --git a/zigbee2mqtt/state.json b/zigbee2mqtt/state.json
index c1ad9104..613596df 100644
--- a/zigbee2mqtt/state.json
+++ b/zigbee2mqtt/state.json
@@ -27,7 +27,7 @@
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
         "countdown_to_turn_on": 0,
-        "power": 2.1,
+        "power": 2.2,
         "current": 0.1,
         "energy": 38.66,
         "power_factor": 0.18,
@@ -45,10 +45,10 @@
         "state": "ON",
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
-        "voltage": 121.3,
+        "voltage": 121.2,
         "countdown_to_turn_on": 0,
         "energy": 75.35,
-        "power_factor": 0.2,
+        "power_factor": 0.3,
         "ac_frequency": 60,
         "update": {
             "state": "idle",
@@ -74,12 +74,12 @@
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
         "countdown_to_turn_on": 0,
-        "voltage": 120.2,
+        "voltage": 120.3,
         "state": "ON",
         "ac_frequency": 60,
-        "energy": 153.51,
-        "power": 96.7,
-        "current": 0.88,
+        "energy": 153.53,
+        "power": 101.9,
+        "current": 0.93,
         "power_factor": 0.95,
         "update": {
             "state": "idle",
@@ -96,12 +96,12 @@
         "countdown_to_turn_off": 0,
         "countdown_to_turn_on": 0,
         "voltage": 121.2,
-        "energy": 74.14,
+        "energy": 74.15,
         "state": "ON",
-        "power": 49.9,
-        "current": 0.59,
+        "power": 49.1,
+        "current": 0.48,
         "ac_frequency": 60,
-        "power_factor": 0.78,
+        "power_factor": 0.87,
         "update": {
             "state": "idle",
             "installed_version": 268513381,
@@ -119,7 +119,7 @@
         "energy": 10.48,
         "current": 0.02,
         "power": 0.1,
-        "power_factor": 0.13,
+        "power_factor": 0.11,
         "linkquality": 109,
         "update": {
             "state": "idle",
@@ -224,7 +224,7 @@
     },
     "0xb40e060fffe717c5": {
         "battery": 100,
-        "occupancy": false,
+        "occupancy": true,
         "tamper": false,
         "battery_low": false,
         "linkquality": 80,