diff --git a/homeassistant-observability/grafana-datasource-cm.yaml b/homeassistant-observability/grafana-datasource-cm.yaml
index d61d6dd..ca822a2 100644
--- a/homeassistant-observability/grafana-datasource-cm.yaml
+++ b/homeassistant-observability/grafana-datasource-cm.yaml
@@ -11,12 +11,13 @@ data:
         type: postgres
         access: proxy
         url: homeassistant-db.homeassistant-observability:5432
-        dbname: homeassistant
+        database: homeassistant
         user: homeassistant
         isDefault: true
         jsonData:
           sslmode: require
           postgresVersion: 1600
           tlsSkipVerify: false
+          timeInterval: "10s"
         secureJsonData:
           password: c7yTVTjPYm6yrJIL0S3GpuicxQEGtYd0Z3URuuHrwLceOVTvHF1SisbTap0Wcp9o
diff --git a/homeassistant-observability/tecalor-dashboard.json b/homeassistant-observability/tecalor-dashboard.json
index ed25a9d..23ed54c 100644
--- a/homeassistant-observability/tecalor-dashboard.json
+++ b/homeassistant-observability/tecalor-dashboard.json
@@ -105,7 +105,7 @@
           },
           "format": "time_series",
           "rawQuery": true,
-          "rawSql": "SELECT\n  s.last_changed AS time,\n  s.state::float AS value,\n  sm.entity_id AS metric\nFROM states s JOIN states_meta sm ON s.metadata_id = sm.metadata_id\nWHERE sm.entity_id IN ('sensor.thzctl_vorlaufisttemp', 'sensor.thzctl_ruecklaufisttemp')\n  AND $__timeFilter(last_changed)\nORDER BY s.last_changed",
+          "rawSql": "SELECT\n  s.last_changed AS time,\n  s.state::float AS value,\n  sm.entity_id AS metric\nFROM states s JOIN states_meta sm ON s.metadata_id = sm.metadata_id\nWHERE sm.entity_id IN ('sensor.thzctl_vorlaufisttemp', 'sensor.thzctl_ruecklaufisttemp')\n  AND $__timeFilter(s.last_changed)\nORDER BY s.last_changed",
           "refId": "A"
         }
       ],
@@ -182,7 +182,7 @@
           },
           "format": "time_series",
           "rawQuery": true,
-          "rawSql": "SELECT\n  s.last_changed AS time,\n  s.state::float AS value,\n  sm.entity_id AS metric\nFROM states s JOIN states_meta sm ON s.metadata_id = sm.metadata_id\nWHERE sm.entity_id IN ('sensor.tecalor_thz5_5_eco_heissgas_temp', 'sensor.tecalor_thz5_5_eco_olsumpftemperatur', 'sensor.tecalor_thz5_5_eco_invertertemperatur')\n  AND $__timeFilter(last_changed)\nORDER BY s.last_changed",
+          "rawSql": "SELECT\n  s.last_changed AS time,\n  s.state::float AS value,\n  sm.entity_id AS metric\nFROM states s JOIN states_meta sm ON s.metadata_id = sm.metadata_id\nWHERE sm.entity_id IN ('sensor.tecalor_thz5_5_eco_heissgas_temp', 'sensor.tecalor_thz5_5_eco_olsumpftemperatur', 'sensor.tecalor_thz5_5_eco_invertertemperatur')\n  AND $__timeFilter(s.last_changed)\nORDER BY s.last_changed",
           "refId": "A"
         }
       ],
@@ -275,7 +275,7 @@
           },
           "format": "time_series",
           "rawQuery": true,
-          "rawSql": "SELECT\n  s.last_changed AS time,\n  s.state::float AS value,\n  sm.entity_id AS metric\nFROM states s JOIN states_meta sm ON s.metadata_id = sm.metadata_id\nWHERE sm.entity_id IN ('sensor.tecalor_thz5_5_eco_druck_hochdruck', 'sensor.tecalor_thz5_5_eco_druck_niederdruck', 'sensor.tecalor_thz5_5_eco_druck_heizkreis')\n  AND $__timeFilter(last_changed)\nORDER BY s.last_changed",
+          "rawSql": "SELECT\n  s.last_changed AS time,\n  s.state::float AS value,\n  sm.entity_id AS metric\nFROM states s JOIN states_meta sm ON s.metadata_id = sm.metadata_id\nWHERE sm.entity_id IN ('sensor.tecalor_thz5_5_eco_druck_hochdruck', 'sensor.tecalor_thz5_5_eco_druck_niederdruck', 'sensor.tecalor_thz5_5_eco_druck_heizkreis')\n  AND $__timeFilter(s.last_changed)\nORDER BY s.last_changed",
           "refId": "A"
         }
       ],
@@ -352,7 +352,7 @@
           },
           "format": "time_series",
           "rawQuery": true,
-          "rawSql": "SELECT\n  s.last_changed AS time,\n  s.state::float AS value,\n  sm.entity_id AS metric\nFROM states s JOIN states_meta sm ON s.metadata_id = sm.metadata_id\nWHERE sm.entity_id IN ('sensor.tecalor_thz5_5_eco_verfluessiger_temp', 'sensor.tecalor_thz5_5_eco_speichersolltemp_tag')\n  AND $__timeFilter(last_changed)\nORDER BY s.last_changed",
+          "rawSql": "SELECT\n  s.last_changed AS time,\n  s.state::float AS value,\n  sm.entity_id AS metric\nFROM states s JOIN states_meta sm ON s.metadata_id = sm.metadata_id\nWHERE sm.entity_id IN ('sensor.tecalor_thz5_5_eco_verfluessiger_temp', 'sensor.tecalor_thz5_5_eco_speichersolltemp_tag')\n  AND $__timeFilter(s.last_changed)\nORDER BY s.last_changed",
           "refId": "A"
         }
       ],
@@ -429,7 +429,7 @@
           },
           "format": "time_series",
           "rawQuery": true,
-          "rawSql": "SELECT\n  s.last_changed AS time,\n  s.state::float AS value,\n  sm.entity_id AS metric\nFROM states s JOIN states_meta sm ON s.metadata_id = sm.metadata_id\nWHERE sm.entity_id IN ('sensor.tecalor_thz5_5_eco_laufzeit_verdichter_heizen', 'sensor.tecalor_thz5_5_eco_laufzeit_verdichter_ww')\n  AND $__timeFilter(last_changed)\nORDER BY s.last_changed",
+          "rawSql": "SELECT\n  s.last_changed AS time,\n  s.state::float AS value,\n  sm.entity_id AS metric\nFROM states s JOIN states_meta sm ON s.metadata_id = sm.metadata_id\nWHERE sm.entity_id IN ('sensor.tecalor_thz5_5_eco_laufzeit_verdichter_heizen', 'sensor.tecalor_thz5_5_eco_laufzeit_verdichter_ww')\n  AND $__timeFilter(s.last_changed)\nORDER BY s.last_changed",
           "refId": "A"
         }
       ],
@@ -518,7 +518,7 @@
           },
           "format": "time_series",
           "rawQuery": true,
-          "rawSql": "SELECT\n  s.last_changed AS time,\n  s.state::float AS value,\n  sm.entity_id AS metric\nFROM states s JOIN states_meta sm ON s.metadata_id = sm.metadata_id\nWHERE sm.entity_id IN ('sensor.tecalor_thz5_5_eco_el_energieaufnahme_ww_summe_mwh', 'sensor.tecalor_thz5_5_eco_el_energieaufnahme_heiz_summe_mwh')\n  AND $__timeFilter(last_changed)\nORDER BY s.last_changed",
+          "rawSql": "SELECT\n  s.last_changed AS time,\n  s.state::float AS value,\n  sm.entity_id AS metric\nFROM states s JOIN states_meta sm ON s.metadata_id = sm.metadata_id\nWHERE sm.entity_id IN ('sensor.tecalor_thz5_5_eco_el_energieaufnahme_ww_summe_mwh', 'sensor.tecalor_thz5_5_eco_el_energieaufnahme_heiz_summe_mwh')\n  AND $__timeFilter(s.last_changed)\nORDER BY s.last_changed",
           "refId": "A"
         }
       ],