diff --git a/k8s/home-assistant/home-assistant.secret.yaml b/k8s/home-assistant/home-assistant.secret.yaml
index fac001e..677d415 100644
Binary files a/k8s/home-assistant/home-assistant.secret.yaml and b/k8s/home-assistant/home-assistant.secret.yaml differ
diff --git a/k8s/monitoring/dashboards/grafana-dashboard-shelly-ws90.yaml b/k8s/monitoring/dashboards/grafana-dashboard-shelly-ws90.yaml
index 6669907..852f67b 100644
--- a/k8s/monitoring/dashboards/grafana-dashboard-shelly-ws90.yaml
+++ b/k8s/monitoring/dashboards/grafana-dashboard-shelly-ws90.yaml
@@ -29,7 +29,7 @@ data:
           "datasource": { "type": "prometheus", "uid": "prometheus" },
           "targets": [
             {
-              "expr": "homeassistant_sensor_linkquality_lqi{entity_id=\"sensor.shelly_ws90_linkquality\"}",
+              "expr": "homeassistant_sensor_unit_lqi{entity=\"sensor.shelly_ws90_linkquality\"}",
               "refId": "A"
             }
           ],
@@ -65,7 +65,7 @@ data:
           "datasource": { "type": "prometheus", "uid": "prometheus" },
           "targets": [
             {
-              "expr": "homeassistant_sensor_battery_percent{entity_id=\"sensor.shelly_ws90_battery\"}",
+              "expr": "homeassistant_sensor_battery_percent{entity=\"sensor.shelly_ws90_batterie\"}",
               "refId": "A"
             }
           ],
@@ -100,7 +100,7 @@ data:
           "datasource": { "type": "prometheus", "uid": "prometheus" },
           "targets": [
             {
-              "expr": "homeassistant_sensor_pressure_kpa{entity_id=\"sensor.shelly_ws90_pressure\"} * 10",
+              "expr": "homeassistant_sensor_atmospheric_pressure_hpa{entity=\"sensor.shelly_ws90_atmospharischer_druck\"}",
               "refId": "A"
             }
           ],
@@ -134,7 +134,7 @@ data:
           "datasource": { "type": "prometheus", "uid": "prometheus" },
           "targets": [
             {
-              "expr": "homeassistant_sensor_illuminance_lux_lx{entity_id=\"sensor.shelly_ws90_illuminance_lux\"}",
+              "expr": "homeassistant_sensor_illuminance_lx{entity=\"sensor.shelly_ws90_illuminance\"}",
               "refId": "A"
             }
           ],
@@ -168,7 +168,7 @@ data:
           "datasource": { "type": "prometheus", "uid": "prometheus" },
           "targets": [
             {
-              "expr": "homeassistant_sensor_temperature_celsius{entity_id=\"sensor.shelly_ws90_temperature\"}",
+              "expr": "homeassistant_sensor_temperature_celsius{entity=\"sensor.shelly_ws90_temperatur\"}",
               "refId": "A"
             }
           ],
@@ -204,7 +204,7 @@ data:
           "datasource": { "type": "prometheus", "uid": "prometheus" },
           "targets": [
             {
-              "expr": "homeassistant_sensor_humidity_percent{entity_id=\"sensor.shelly_ws90_humidity\"}",
+              "expr": "homeassistant_sensor_humidity_percent{entity=\"sensor.shelly_ws90_luftfeuchtigkeit\"}",
               "refId": "A"
             }
           ],
@@ -239,7 +239,7 @@ data:
           "datasource": { "type": "prometheus", "uid": "prometheus" },
           "targets": [
             {
-              "expr": "homeassistant_sensor_wind_speed_km_per_h{entity_id=~\"sensor.shelly_ws90_wind_speed.*\"} or on() vector(0)",
+              "expr": "homeassistant_sensor_wind_speed_km_per_h{entity=\"sensor.shelly_ws90_wind_speed\"} or on() vector(0)",
               "refId": "A"
             }
           ],
@@ -275,7 +275,7 @@ data:
           "datasource": { "type": "prometheus", "uid": "prometheus" },
           "targets": [
             {
-              "expr": "homeassistant_sensor_wind_direction{entity_id=~\"sensor.shelly_ws90_wind_direction.*\"} or on() vector(0)",
+              "expr": "homeassistant_sensor_wind_direction_u0xb0{entity=\"sensor.shelly_ws90_wind_direction\"} or on() vector(0)",
               "refId": "A"
             }
           ],
@@ -308,7 +308,7 @@ data:
           "datasource": { "type": "prometheus", "uid": "prometheus" },
           "targets": [
             {
-              "expr": "homeassistant_sensor_precipitation_intensity_mm_per_h{entity_id=~\"sensor.shelly_ws90_precipitation.*|sensor.shelly_ws90_rain.*\"} or on() vector(0)",
+              "expr": "homeassistant_sensor_precipitation_intensity_mm_per_h{entity=\"sensor.shelly_ws90_rain_rate\"} or on() vector(0)",
               "refId": "A"
             }
           ],
@@ -343,7 +343,7 @@ data:
           "datasource": { "type": "prometheus", "uid": "prometheus" },
           "targets": [
             {
-              "expr": "homeassistant_sensor_illuminance_lux_lx{entity_id=\"sensor.shelly_ws90_illuminance_lux\"}",
+              "expr": "homeassistant_sensor_illuminance_lx{entity=\"sensor.shelly_ws90_illuminance\"}",
               "refId": "A"
             }
           ],
@@ -378,12 +378,12 @@ data:
           "datasource": { "type": "prometheus", "uid": "prometheus" },
           "targets": [
             {
-              "expr": "homeassistant_sensor_temperature_celsius{entity_id=\"sensor.shelly_ws90_temperature\"}",
+              "expr": "homeassistant_sensor_temperature_celsius{entity=\"sensor.shelly_ws90_temperatur\"}",
               "legendFormat": "Temperature",
               "refId": "A"
             },
             {
-              "expr": "homeassistant_sensor_humidity_percent{entity_id=\"sensor.shelly_ws90_humidity\"}",
+              "expr": "homeassistant_sensor_humidity_percent{entity=\"sensor.shelly_ws90_luftfeuchtigkeit\"}",
               "legendFormat": "Humidity",
               "refId": "B"
             }
@@ -432,12 +432,12 @@ data:
           "datasource": { "type": "prometheus", "uid": "prometheus" },
           "targets": [
             {
-              "expr": "homeassistant_sensor_pressure_kpa{entity_id=\"sensor.shelly_ws90_pressure\"} * 10",
+              "expr": "homeassistant_sensor_atmospheric_pressure_hpa{entity=\"sensor.shelly_ws90_atmospharischer_druck\"}",
               "legendFormat": "Pressure",
               "refId": "A"
             },
             {
-              "expr": "homeassistant_sensor_precipitation_intensity_mm_per_h{entity_id=~\"sensor.shelly_ws90_precipitation.*|sensor.shelly_ws90_rain.*\"} or on() vector(0)",
+              "expr": "homeassistant_sensor_precipitation_intensity_mm_per_h{entity=\"sensor.shelly_ws90_rain_rate\"} or on() vector(0)",
               "legendFormat": "Rain Intensity",
               "refId": "B"
             }
diff --git a/k8s/monitoring/zigbee2mqtt.yaml b/k8s/monitoring/zigbee2mqtt.yaml
index 59ac3df..e805010 100644
--- a/k8s/monitoring/zigbee2mqtt.yaml
+++ b/k8s/monitoring/zigbee2mqtt.yaml
@@ -74,7 +74,7 @@ spec:
           mountPath: /tmp/config
       containers:
       - name: zigbee2mqtt
-        image: koenkk/zigbee2mqtt:1.40.1
+        image: koenkk/zigbee2mqtt:latest
         env:
         # Override MQTT credentials/settings using environment variables
         - name: ZIGBEE2MQTT_CONFIG_MQTT_SERVER
@@ -89,6 +89,8 @@ spec:
         # Override Zigbee Coordinator settings using environment variables
         - name: ZIGBEE2MQTT_CONFIG_SERIAL_PORT
           value: "tcp://192.168.10.10:7638"
+        - name: ZIGBEE2MQTT_CONFIG_SERIAL_ADAPTER
+          value: "zstack"
         ports:
         - name: http-frontend
           containerPort: 8080