diff --git a/cluster/monitoring/influxdb.yaml b/cluster/monitoring/influxdb.yaml
index 811062d97..df1da0413 100644
--- a/cluster/monitoring/influxdb.yaml
+++ b/cluster/monitoring/influxdb.yaml
@@ -17,6 +17,9 @@ spec:
         namespace: flux-system
       interval: 5m
   values:
+    image:
+      repository: "influxdb"
+      tag: "2.0.4"
     service:
       type: LoadBalancer
       externalIPs:
@@ -32,29 +35,21 @@ spec:
       timeoutSeconds: 10
     startupProbe:
       enabled: true
-      failureThreshold: 6
-      periodSeconds: 5
+      failureThreshold: 10
+      periodSeconds: 10
     config:
-      http:
-        flux-enabled: true
       opentsdb:
         enabled: true
       graphite:
         enabled: true
-        database: "graphite"
-        #retention-policy: ""
+        database: graphite
+        retention-policy: ""
         bind-address: ":2003"
-        protocol: "tcp"
-        consistency-level: "one"
-      tls: true
-    initScripts:
-      enabled: true
-      scripts:
-        init.iql: |-
-          CREATE DATABASE "opnsense" WITH DURATION 90d;
-          CREATE DATABASE "rpi-os" WITH DURATION 90d;
-          CREATE DATABASE "graphite" WITH DURATION 90d;
-          CREATE DATABASE "home_assistant" WITH DURATION 90d;
+        protocol: tcp
+        consistency-lvel: one
+        templates:
+          - "*.app env.service.resource.measurement"
+          - "servers.* .host.resource.measurement.field*"
     resources:
       requests:
         memory: 2Gi
diff --git a/cluster/monitoring/kube-prometheus-stack.yaml b/cluster/monitoring/kube-prometheus-stack.yaml
index 5953ca628..aa61d034d 100644
--- a/cluster/monitoring/kube-prometheus-stack.yaml
+++ b/cluster/monitoring/kube-prometheus-stack.yaml
@@ -107,7 +107,9 @@ spec:
         - pr0ps-trackmap-panel
         - grafana-piechart-panel
         - vonage-status-panel
-        - https://github.com/panodata/grafana-map-panel/releases/download/0.9.0/grafana-map-panel-0.9.0.zip;grafana-worldmap-panel-ng
+        #- https://github.com/panodata/grafana-map-panel/releases/download/0.9.0/grafana-map-panel-0.9.0.zip;grafana-worldmap-panel-ng
+        - grafana-worldmap-panel
+        - grafana-clock-panel
       dashboardProviders:
         dashboardproviders.yaml:
           apiVersion: 1
@@ -133,30 +135,26 @@ spec:
           access: proxy
           url: http://thanos-query-http:10902/
           isDefault: true
-        - name: loki
-          type: loki
-          access: proxy
-          url: http://loki:3100/
         - name: influxdb-opnsense
           type: influxdb
-          acces: server
+          acces: proxy
           url: http://influxdb:8086/
           database: opnsense
           user: opnsense
         - name: influxdb-rpi-os
           type: influxdb
-          acces: server
+          acces: proxy
           url: http://influxdb:8086/
           database: rpi-os
           user: rpi-os
         - name: influxdb-graphite
           type: influxdb
           database: graphite
-          acces: server
+          acces: proxy
           url: http://influxdb:8086/
         - name: influxdb-home_assistant
           type: influxdb
-          acces: server
+          acces: proxy
           url: http://influxdb:8086/
           database: home_assistant
       grafana.ini: