diff --git a/.storage/lovelace.dashboard_temp b/.storage/lovelace.dashboard_temp
index f005f553..e5062c45 100644
--- a/.storage/lovelace.dashboard_temp
+++ b/.storage/lovelace.dashboard_temp
@@ -167,13 +167,6 @@
                   "hours_to_show": 24,
                   "detail": 1
                 },
-                {
-                  "graph": "line",
-                  "type": "sensor",
-                  "entity": "sensor.octoprint_certificate_expiry",
-                  "hours_to_show": 24,
-                  "detail": 1
-                },
                 {
                   "graph": "line",
                   "type": "sensor",
@@ -195,6 +188,13 @@
                   "hours_to_show": 24,
                   "detail": 1
                 },
+                {
+                  "graph": "line",
+                  "type": "sensor",
+                  "entity": "sensor.octoprint_certificate_expiry",
+                  "hours_to_show": 24,
+                  "detail": 1
+                },
                 {
                   "graph": "line",
                   "type": "sensor",
diff --git a/zigbee2mqtt/state.json b/zigbee2mqtt/state.json
index 3e7aa838..e6a331e8 100644
--- a/zigbee2mqtt/state.json
+++ b/zigbee2mqtt/state.json
@@ -4,7 +4,7 @@
         "state": "ON",
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
-        "voltage": 121.8,
+        "voltage": 122.2,
         "countdown_to_turn_on": 0,
         "ac_frequency": 60,
         "power_factor": 0.14,
@@ -45,10 +45,10 @@
         "state": "ON",
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
-        "voltage": 121.3,
+        "voltage": 121.7,
         "countdown_to_turn_on": 0,
-        "energy": 56.2,
-        "power_factor": 0.2,
+        "energy": 56.21,
+        "power_factor": 0.88,
         "ac_frequency": 60,
         "update": {
             "state": "idle",
@@ -58,8 +58,8 @@
             "latest_release_notes": null
         },
         "linkquality": 134,
-        "power": 84.2,
-        "current": 0.01,
+        "power": 84.7,
+        "current": 0.8,
         "power_on_behavior": "on"
     },
     "0xb40e060fffe031e3": {
@@ -74,10 +74,10 @@
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
         "countdown_to_turn_on": 0,
-        "voltage": 120.8,
+        "voltage": 119.3,
         "state": "ON",
         "ac_frequency": 60,
-        "energy": 115.61,
+        "energy": 115.63,
         "power": 0.8,
         "current": 0.02,
         "power_factor": 0.38,
@@ -95,11 +95,11 @@
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
         "countdown_to_turn_on": 0,
-        "voltage": 121.1,
-        "energy": 52.06,
+        "voltage": 121.5,
+        "energy": 52.07,
         "state": "ON",
-        "power": 53.4,
-        "current": 0.56,
+        "power": 71.4,
+        "current": 0.67,
         "ac_frequency": 60,
         "power_factor": 0.77,
         "update": {
@@ -114,12 +114,12 @@
     },
     "0xffffb40e060895b3": {
         "state": "ON",
-        "voltage": 121.7,
+        "voltage": 122.2,
         "ac_frequency": 60,
         "energy": 7.22,
         "current": 0.02,
         "power": 1.1,
-        "power_factor": 0.13,
+        "power_factor": 0.11,
         "linkquality": 123,
         "update": {
             "state": "idle",
@@ -136,7 +136,7 @@
     "0xffffb40e0608864e": {
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
-        "voltage": 122,
+        "voltage": 122.5,
         "energy": 17.64,
         "countdown_to_turn_on": 0,
         "state": "ON",
@@ -178,7 +178,7 @@
         "energy": 3.12,
         "power_on_behavior": "on",
         "linkquality": 87,
-        "current": 0.09,
+        "current": 0.03,
         "ac_frequency": 60,
         "update": {
             "state": "idle",
@@ -187,12 +187,12 @@
             "latest_source": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images/ThirdReality/SmartPlug_Zigbee_PROD_OTA_V101_1.01.01.ota",
             "latest_release_notes": null
         },
-        "power_factor": 0.06,
-        "power": 0
+        "power_factor": 0.07,
+        "power": 0.1
     },
     "0xa4c1380d0679ffff": {
         "battery": 100,
-        "temperature": 27.8,
+        "temperature": 27.9,
         "temperature_units": "celsius",
         "temperature_calibration": 0,
         "update": {