diff --git a/cluster/apps/authentication/glauth/helm-release.yaml b/cluster/apps/authentication/glauth/helm-release.yaml
index adcc1e0a0..7c57cc003 100644
--- a/cluster/apps/authentication/glauth/helm-release.yaml
+++ b/cluster/apps/authentication/glauth/helm-release.yaml
@@ -58,7 +58,7 @@ spec:
       secret.reloader.stakater.com/reload: *app
     resources:
       requests:
-        cpu: 5m
-        memory: 10Mi
+        cpu: 15m
+        memory: 105Mi
       limits:
-        memory: 50Mi
+        memory: 105Mi
diff --git a/cluster/apps/development/gitea/helm-release.yaml b/cluster/apps/development/gitea/helm-release.yaml
index 15c69d55f..8529f012d 100644
--- a/cluster/apps/development/gitea/helm-release.yaml
+++ b/cluster/apps/development/gitea/helm-release.yaml
@@ -98,11 +98,7 @@ spec:
     postgresql:
       enabled: false
     memcached:
-      image:
-        repository: bitnami/memcached
-        tag: 1.6.17
-      service:
-        port: 11211
+      enabled: false
     persistence:
       enabled: true
       existingClaim: "gitea-config"
@@ -124,6 +120,13 @@ spec:
       tls:
         - hosts:
             - "gitea.${SECRET_CLUSTER_DOMAIN}"
+    resources:
+      requests:
+        cpu: 15m
+        memory: 226M
+      limits:
+        cpu: 500m
+        memory: 1Gi
   valuesFrom:
     - targetPath: gitea.admin.email
       kind: Secret
diff --git a/cluster/apps/downloaders/flood/helm-release.yaml b/cluster/apps/downloaders/flood/helm-release.yaml
index d33697762..131404cc5 100644
--- a/cluster/apps/downloaders/flood/helm-release.yaml
+++ b/cluster/apps/downloaders/flood/helm-release.yaml
@@ -64,6 +64,6 @@ spec:
     resources:
       requests:
         memory: 250Mi
-        cpu: 500m
+        cpu: 15m
       limits:
-        memory: 1500Mi
+        memory: 512Mi
diff --git a/cluster/apps/downloaders/pyload/helm-release.yaml b/cluster/apps/downloaders/pyload/helm-release.yaml
index e12e73c36..99caeeb6d 100644
--- a/cluster/apps/downloaders/pyload/helm-release.yaml
+++ b/cluster/apps/downloaders/pyload/helm-release.yaml
@@ -78,7 +78,7 @@ spec:
         mountPath: /mnt/storage/downloads
     resources:
       requests:
-        cpu: 100m
-        memory: 1Gi
+        cpu: 15m
+        memory: 105Mi
       limits:
-        memory: 5Gi
+        memory: 1Gi
diff --git a/cluster/apps/kube-tools/descheduler/helm-release.yaml b/cluster/apps/kube-tools/descheduler/helm-release.yaml
index c032ac242..d4f25a9bd 100644
--- a/cluster/apps/kube-tools/descheduler/helm-release.yaml
+++ b/cluster/apps/kube-tools/descheduler/helm-release.yaml
@@ -84,3 +84,10 @@ spec:
                     operator: In
                     values: [*app]
               topologyKey: kubernetes.io/hostname
+    resources:
+      requests:
+        cpu: 15m
+        memory: 105Mi
+      limits:
+        cpu: 100m
+        memory: 512Mi
diff --git a/cluster/apps/kube-tools/intel-gpu-exporter/helm-release.yaml b/cluster/apps/kube-tools/intel-gpu-exporter/helm-release.yaml
index 4763a9d4e..9c9af809e 100644
--- a/cluster/apps/kube-tools/intel-gpu-exporter/helm-release.yaml
+++ b/cluster/apps/kube-tools/intel-gpu-exporter/helm-release.yaml
@@ -49,8 +49,8 @@ spec:
     resources:
       requests:
         gpu.intel.com/i915: 1
-        cpu: 100m
-        memory: 100Mi
+        cpu: 15m
+        memory: 105Mi
       limits:
         gpu.intel.com/i915: 1
-        memory: 500Mi
+        memory: 105Mi
diff --git a/cluster/apps/kube-tools/intel-gpu-plugin/helm-release.yaml b/cluster/apps/kube-tools/intel-gpu-plugin/helm-release.yaml
index 9799bfac4..73c744527 100644
--- a/cluster/apps/kube-tools/intel-gpu-plugin/helm-release.yaml
+++ b/cluster/apps/kube-tools/intel-gpu-plugin/helm-release.yaml
@@ -73,3 +73,9 @@ spec:
                   operator: In
                   values:
                     - "true"
+    resources:
+      requests:
+        cpu: 15m
+        memory: 105Mi
+      limits:
+        memory: 105Mi
diff --git a/cluster/apps/kube-tools/kustomization.yaml b/cluster/apps/kube-tools/kustomization.yaml
index b274005cd..f5a47f861 100644
--- a/cluster/apps/kube-tools/kustomization.yaml
+++ b/cluster/apps/kube-tools/kustomization.yaml
@@ -2,7 +2,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  #- coredens-nodecache
+  # - coredens-nodecache
   - descheduler
   - goldilocks
   - intel-gpu-exporter
diff --git a/cluster/apps/media-automation/bazarr/helm-release.yaml b/cluster/apps/media-automation/bazarr/helm-release.yaml
index a0c739eb0..56f47063b 100644
--- a/cluster/apps/media-automation/bazarr/helm-release.yaml
+++ b/cluster/apps/media-automation/bazarr/helm-release.yaml
@@ -74,7 +74,7 @@ spec:
       secret.reloader.stakater.com/reload: *app
     resources:
       requests:
-        cpu: 100m
-        memory: 256Mi
+        cpu: 23m
+        memory: 204M
       limits:
         memory: 1Gi
diff --git a/cluster/apps/media-servers/jellyfin/helm-release.yaml b/cluster/apps/media-servers/jellyfin/helm-release.yaml
index ffb350440..cca3196e0 100644
--- a/cluster/apps/media-servers/jellyfin/helm-release.yaml
+++ b/cluster/apps/media-servers/jellyfin/helm-release.yaml
@@ -99,8 +99,8 @@ spec:
     resources:
       requests:
         gpu.intel.com/i915: 1
-        cpu: 1
-        memory: 4Gi
+        cpu: 50m
+        memory: 2Gi
       limits:
         gpu.intel.com/i915: 1
-        memory: 6Gi
+        memory: 3Gi
diff --git a/cluster/apps/media-servers/komga/helm-release.yaml b/cluster/apps/media-servers/komga/helm-release.yaml
index ed5b1006a..7df946dba 100644
--- a/cluster/apps/media-servers/komga/helm-release.yaml
+++ b/cluster/apps/media-servers/komga/helm-release.yaml
@@ -67,7 +67,7 @@ spec:
         mountPath: /mnt/storage/home/claude/comics
     resources:
       requests:
-        memory: 500Mi
-        cpu: 500m
+        memory: 4282M
+        cpu: 15m
       limits:
-        memory: 4Gi
+        memory: 4282M
diff --git a/cluster/apps/media-servers/lychee/helm-release.yaml b/cluster/apps/media-servers/lychee/helm-release.yaml
index 9fdfb52ab..5265e33a1 100644
--- a/cluster/apps/media-servers/lychee/helm-release.yaml
+++ b/cluster/apps/media-servers/lychee/helm-release.yaml
@@ -76,5 +76,5 @@ spec:
         existingClaim: lychee-files
     resources:
       requests:
-        cpu: 100m
+        cpu: 15m
         memory: 256Mi
diff --git a/cluster/apps/monitoring/grafana/dashboards/home-assistant.json b/cluster/apps/monitoring/grafana/dashboards/home-assistant.json
index dc94ac238..936e2ecd9 100644
--- a/cluster/apps/monitoring/grafana/dashboards/home-assistant.json
+++ b/cluster/apps/monitoring/grafana/dashboards/home-assistant.json
@@ -1,40 +1,12 @@
 {
-  "__inputs": [
-    {
-      "name": "DS_PROMETHEUS",
-      "label": "Prometheus",
-      "description": "",
-      "type": "datasource",
-      "pluginId": "prometheus",
-      "pluginName": "Prometheus"
-    }
-  ],
-  "__elements": [],
-  "__requires": [
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "8.3.4"
-    },
-    {
-      "type": "datasource",
-      "id": "prometheus",
-      "name": "Prometheus",
-      "version": "1.0.0"
-    },
-    {
-      "type": "panel",
-      "id": "timeseries",
-      "name": "Time series",
-      "version": ""
-    }
-  ],
   "annotations": {
     "list": [
       {
         "builtIn": 1,
-        "datasource": "-- Grafana --",
+        "datasource": {
+          "type": "datasource",
+          "uid": "grafana"
+        },
         "enable": true,
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
@@ -49,20 +21,26 @@
       }
     ]
   },
-  "editable": false,
+  "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": null,
+  "id": 1,
   "links": [],
   "liveNow": false,
   "panels": [
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "PBFA97CFB590B2093"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -127,10 +105,12 @@
             "min"
           ],
           "displayMode": "table",
-          "placement": "right"
+          "placement": "right",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.0.5",
@@ -140,11 +120,12 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "sum(hass_sensor_temperature_celsius{entity=\"sensor.temperature_living_room_temperature\"})",
+          "expr": "avg(hass_sensor_temperature_celsius{entity=\"sensor.temperature_living_room_temperature\"})",
           "instant": false,
           "interval": "",
-          "legendFormat": "Salon",
+          "legendFormat": "Living Room",
           "refId": "A"
         },
         {
@@ -152,11 +133,13 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
+          "editorMode": "code",
           "exemplar": true,
           "expr": "sum(hass_sensor_temperature_celsius{entity=~\"sensor.temperature_bedroom_temperature\"})",
           "hide": false,
           "interval": "",
-          "legendFormat": "Chambre 1",
+          "legendFormat": "Bedroom 1",
+          "range": true,
           "refId": "B"
         },
         {
@@ -164,11 +147,13 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
+          "editorMode": "code",
           "exemplar": true,
           "expr": "sum(hass_sensor_temperature_celsius{entity=~\"sensor.temperature_office_temperature\"})",
           "hide": false,
           "interval": "",
-          "legendFormat": "Bureau",
+          "legendFormat": "Office",
+          "range": true,
           "refId": "C"
         }
       ],
@@ -176,6 +161,10 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "PBFA97CFB590B2093"
+      },
       "description": "",
       "fieldConfig": {
         "defaults": {
@@ -183,6 +172,8 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -243,10 +234,12 @@
             "max"
           ],
           "displayMode": "table",
-          "placement": "right"
+          "placement": "right",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.0.5",
@@ -256,10 +249,12 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "sum(hass_sensor_power_w{entity=\"sensor.servers_plug_switch_electricity_power\"})",
+          "expr": "avg(hass_sensor_power_w{entity=\"sensor.servers_plug_switch_electricity_power\"})",
           "interval": "",
           "legendFormat": "Servers",
+          "range": true,
           "refId": "A"
         },
         {
@@ -267,11 +262,13 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "sum(hass_sensor_power_w{entity=\"sensor.bureau_plug_switch_electricity_power\"})",
+          "expr": "avg(hass_sensor_power_w{entity=\"sensor.bureau_plug_switch_electricity_power\"})",
           "hide": false,
           "interval": "",
           "legendFormat": "claude-fixe",
+          "range": true,
           "refId": "B"
         }
       ],
@@ -281,7 +278,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
+        "uid": "PBFA97CFB590B2093"
       },
       "fieldConfig": {
         "defaults": {
@@ -289,6 +286,8 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -349,35 +348,55 @@
             "max"
           ],
           "displayMode": "table",
-          "placement": "right"
+          "placement": "right",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.0.5",
       "targets": [
         {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "hass_sensor_power_w{entity=~\"sensor.power_plug_avr_power\"}",
+          "expr": "avg(hass_sensor_power_w{entity=~\"sensor.power_plug_avr_power\"})",
           "interval": "",
-          "legendFormat": "Ampli",
+          "legendFormat": "AVR",
+          "range": true,
           "refId": "A"
         },
         {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
+          "editorMode": "code",
           "exemplar": true,
           "expr": "hass_sensor_power_w{entity=~\"sensor.power_plug_projector_power\"}",
           "hide": false,
           "interval": "",
-          "legendFormat": "Vidéoprojecteur",
+          "legendFormat": "Projector",
+          "range": true,
           "refId": "B"
         },
         {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
+          "editorMode": "code",
           "exemplar": true,
           "expr": "hass_sensor_power_w{entity=~\"sensor.power_plug_subwoofer_power\"}",
           "hide": false,
           "interval": "",
-          "legendFormat": "Caisson de basses",
+          "legendFormat": "Subwoofer",
+          "range": true,
           "refId": "C"
         }
       ],
@@ -385,7 +404,7 @@
       "type": "timeseries"
     }
   ],
-  "schemaVersion": 34,
+  "schemaVersion": 37,
   "style": "dark",
   "tags": [
     "home-assistant"
diff --git a/cluster/apps/monitoring/grafana/dashboards/homelab-temperatures.json b/cluster/apps/monitoring/grafana/dashboards/homelab-temperatures.json
index efec37049..9c35ed040 100644
--- a/cluster/apps/monitoring/grafana/dashboards/homelab-temperatures.json
+++ b/cluster/apps/monitoring/grafana/dashboards/homelab-temperatures.json
@@ -1,40 +1,12 @@
 {
-  "__inputs": [
-    {
-      "name": "DS_PROMETHEUS",
-      "label": "Prometheus",
-      "description": "",
-      "type": "datasource",
-      "pluginId": "prometheus",
-      "pluginName": "Prometheus"
-    }
-  ],
-  "__elements": [],
-  "__requires": [
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "8.3.4"
-    },
-    {
-      "type": "datasource",
-      "id": "prometheus",
-      "name": "Prometheus",
-      "version": "1.0.0"
-    },
-    {
-      "type": "panel",
-      "id": "timeseries",
-      "name": "Time series",
-      "version": ""
-    }
-  ],
   "annotations": {
     "list": [
       {
         "builtIn": 1,
-        "datasource": "-- Grafana --",
+        "datasource": {
+          "t²ype": "datasource",
+          "uid": "grafana"
+        },
         "enable": true,
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
@@ -49,17 +21,17 @@
       }
     ]
   },
-  "editable": false,
+  "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": null,
+  "id": 2,
   "links": [],
   "liveNow": false,
   "panels": [
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
+        "uid": "PBFA97CFB590B2093"
       },
       "fieldConfig": {
         "defaults": {
@@ -67,6 +39,8 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -111,7 +85,32 @@
           },
           "unit": "celsius"
         },
-        "overrides": []
+        "overrides": [
+          {
+            "__systemRef": "hideSeriesFrom",
+            "matcher": {
+              "id": "byNames",
+              "options": {
+                "mode": "exclude",
+                "names": [
+                  "Value"
+                ],
+                "prefix": "All except:",
+                "readOnly": true
+              }
+            },
+            "properties": [
+              {
+                "id": "custom.hideFrom",
+                "value": {
+                  "legend": false,
+                  "tooltip": false,
+                  "viz": true
+                }
+              }
+            ]
+          }
+        ]
       },
       "gridPos": {
         "h": 9,
@@ -128,19 +127,27 @@
             "min"
           ],
           "displayMode": "table",
-          "placement": "right"
+          "placement": "right",
+          "showLegend": false
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.0.5",
       "targets": [
         {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "avg by (app) (node_cpu_temperature_celsius{app=\"opnsense\"})",
+          "expr": "avg(node_cpu_temperature_celsius{app=\"opnsense\"})",
           "interval": "",
-          "legendFormat": "{{app}}",
+          "legendFormat": "Temperature",
+          "range": true,
           "refId": "A"
         }
       ],
@@ -150,7 +157,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
+        "uid": "PBFA97CFB590B2093"
       },
       "description": "",
       "fieldConfig": {
@@ -159,6 +166,8 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -225,20 +234,28 @@
             "min"
           ],
           "displayMode": "table",
-          "placement": "right"
+          "placement": "right",
+          "showLegend": false
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.0.5",
       "targets": [
         {
-          "expr": "avg by (kubernetes_node) (\r\n  node_hwmon_temp_celsius{chip=\"platform_coretemp_0\"}\r\n )",
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
+          "editorMode": "code",
+          "expr": "avg (node_hwmon_temp_celsius{chip=\"platform_coretemp_0\"}) by (chip,kubernetes_node) * ignoring(chip_name) group_left(chip_name) avg (node_hwmon_chip_names) by (chip,chip_name,kubernetes_node)",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
-          "legendFormat": "{{kubernetes_node}}",
+          "legendFormat": "{{chip_name}}",
+          "range": true,
           "refId": "A"
         }
       ],
@@ -247,12 +264,15 @@
       "type": "timeseries"
     },
     {
+      "datasource": "Prometheus",
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -313,11 +333,13 @@
             "max",
             "min"
           ],
-          "displayMode": "hidden",
-          "placement": "right"
+          "displayMode": "list",
+          "placement": "right",
+          "showLegend": false
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.0.5",
@@ -327,10 +349,12 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "sum(hass_sensor_temperature_celsius{entity=~\"sensor.temperature_servers_temperature\"})",
+          "expr": "avg(hass_sensor_temperature_celsius{entity=~\"sensor.temperature_servers_temperature\"})",
           "interval": "",
           "legendFormat": "datacenter",
+          "range": true,
           "refId": "A"
         }
       ],
@@ -338,7 +362,7 @@
       "type": "timeseries"
     }
   ],
-  "schemaVersion": 34,
+  "schemaVersion": 37,
   "style": "dark",
   "tags": [
     "homelab"
diff --git a/cluster/apps/monitoring/grafana/helm-release.yaml b/cluster/apps/monitoring/grafana/helm-release.yaml
index bcb9d5914..d639d96e6 100644
--- a/cluster/apps/monitoring/grafana/helm-release.yaml
+++ b/cluster/apps/monitoring/grafana/helm-release.yaml
@@ -97,7 +97,7 @@ spec:
           - name: Prometheus
             type: prometheus
             access: proxy
-            url: http://thanos-query.monitoring.svc.cluster.local.:9090
+            url: http://prometheus-operated.monitoring.svc.cluster.local.:9090
             isDefault: true
           # - name: Loki
           #   type: loki
diff --git a/cluster/apps/monitoring/kube-prometheus-stack/clusterrolebinding.yaml b/cluster/apps/monitoring/kube-prometheus-stack/clusterrolebinding.yaml
deleted file mode 100644
index 3fd6cd66c..000000000
--- a/cluster/apps/monitoring/kube-prometheus-stack/clusterrolebinding.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: kube-prometheus-stack-prometheus-custom
-subjects:
-  - kind: ServiceAccount
-    name: kube-prometheus-stack-prometheus
-    namespace: monitoring
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: cluster-admin
diff --git a/cluster/apps/monitoring/kube-prometheus-stack/helm-release.yaml b/cluster/apps/monitoring/kube-prometheus-stack/helm-release.yaml
index 092008805..8e0516c27 100644
--- a/cluster/apps/monitoring/kube-prometheus-stack/helm-release.yaml
+++ b/cluster/apps/monitoring/kube-prometheus-stack/helm-release.yaml
@@ -28,6 +28,7 @@ spec:
     ###
     kubeApiServer:
       enabled: true
+
     kubeControllerManager:
       enabled: false
 
@@ -51,14 +52,18 @@ spec:
 
     kubeStateMetrics:
       enabled: true
-    kube-state-metrics:
-      fullnameOverride: kube-state-metrics
-      resources:
-        requests:
-          cpu: 15m
-          memory: 127M
-        limits:
-          memory: 153M
+      metricLabelsAllowlist:
+        - "persistentvolumeclaims=[*]"
+      prometheus:
+        monitor:
+          enabled: true
+          relabelings:
+            - action: replace
+              regex: (.*)
+              replacement: $1
+              sourceLabels:
+                - __meta_kubernetes_pod_node_name
+              targetLabel: kubernetes_node
 
     grafana:
       enabled: false
@@ -66,15 +71,23 @@ spec:
 
     nodeExporter:
       enabled: true
-      serviceMonitor:
-        relabelings:
-          - action: replace
-            regex: (.*)
-            replacement: $1
-            sourceLabels:
-              - __meta_kubernetes_pod_node_name
-            targetLabel: kubernetes_node
-
+    prometheus-node-exporter:
+      resources:
+        requests:
+          cpu: 23m
+          memory: 64M
+        limits:
+          memory: 64M
+      prometheus:
+        monitor:
+          enabled: true
+          relabelings:
+            - action: replace
+              regex: (.*)
+              replacement: $1
+              sourceLabels:
+                - __meta_kubernetes_pod_node_name
+              targetLabel: kubernetes_node
     ###
     ### Prometheus operator values
     ###
@@ -82,11 +95,11 @@ spec:
       prometheusConfigReloader:
         resources:
           requests:
-            cpu: 150m
+            cpu: 100m
             memory: 50Mi
           limits:
             cpu: 300m
-            memory: 50Mi
+            memory: 100Mi
 
     ###
     ### Prometheus instance values
@@ -103,39 +116,22 @@ spec:
           - hosts:
               - "prometheus.${SECRET_CLUSTER_DOMAIN}"
       prometheusSpec:
-        resources:
-          requests:
-            memory: 2000Mi
-            cpu: 400m
-          limits:
-            memory: 6000Mi
         replicas: 1
         replicaExternalLabelName: "replica"
-        podAntiAffinity: hard
-        ruleSelector: {}
-        ruleNamespaceSelector: {}
         ruleSelectorNilUsesHelmValues: false
-        serviceMonitorSelector: {}
-        serviceMonitorNamespaceSelector: {}
         serviceMonitorSelectorNilUsesHelmValues: false
-        podMonitorSelector: {}
-        podMonitorNamespaceSelector: {}
         podMonitorSelectorNilUsesHelmValues: false
         probeSelectorNilUsesHelmValues: false
-        retention: 14d
-        retentionSize: "45GB"
+        retention: 6h
         enableAdminAPI: true
         walCompression: true
         storageSpec:
           volumeClaimTemplate:
             spec:
-              storageClassName: rook-ceph-block
+              storageClassName: "rook-ceph-block"
               resources:
                 requests:
-                  storage: 50Gi
-        thanos:
-          image: quay.io/thanos/thanos:v0.28.0
-          version: v0.28.0
+                  storage: 20Gi
         additionalScrapeConfigs:
           - job_name: "opnsense"
             scrape_interval: 60s
@@ -158,22 +154,6 @@ spec:
               - targets: ["${LOCAL_LAN_TRUENAS_REMOTE}:9273"]
                 labels:
                   app: "truenas-remote"
-      thanosService:
-        enabled: true
-      thanosServiceMonitor:
-        enabled: true
-      thanosIngress:
-        enabled: true
-        pathType: Prefix
-        ingressClassName: "nginx"
-        annotations:
-          nginx.ingress.kubernetes.io/ssl-redirect: "true"
-          nginx.ingress.kubernetes.io/backend-protocol: "GRPC"
-        hosts:
-          - &host "thanos-sidecar.${SECRET_CLUSTER_DOMAIN}"
-        tls:
-          - hosts:
-              - *host
 
     alertmanager:
       config:
diff --git a/cluster/apps/monitoring/kube-prometheus-stack/kustomization.yaml b/cluster/apps/monitoring/kube-prometheus-stack/kustomization.yaml
index d0e567797..2fa2de20c 100644
--- a/cluster/apps/monitoring/kube-prometheus-stack/kustomization.yaml
+++ b/cluster/apps/monitoring/kube-prometheus-stack/kustomization.yaml
@@ -2,5 +2,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - clusterrolebinding.yaml
   - helm-release.yaml
diff --git a/cluster/apps/monitoring/kustomization.yaml b/cluster/apps/monitoring/kustomization.yaml
index 6e00df5e5..22ea84142 100644
--- a/cluster/apps/monitoring/kustomization.yaml
+++ b/cluster/apps/monitoring/kustomization.yaml
@@ -5,5 +5,5 @@ resources:
   - grafana
   - healthchecks
   - kube-prometheus-stack
-  - thanos
+  # - thanos
   - uptime-kuma
diff --git a/cluster/apps/networking/ingress-nginx/helm-release.yaml b/cluster/apps/networking/ingress-nginx/helm-release.yaml
index 856c5a046..2ab11bdd9 100644
--- a/cluster/apps/networking/ingress-nginx/helm-release.yaml
+++ b/cluster/apps/networking/ingress-nginx/helm-release.yaml
@@ -62,8 +62,10 @@ spec:
             any: true
       resources:
         requests:
-          memory: 250Mi
-          cpu: 50m
+          memory: 411Mi
+          cpu: 23m
+        limits:
+          memory: 1Gi
       affinity:
         podAntiAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
@@ -88,5 +90,7 @@ spec:
           value: "true"
       resources:
         requests:
-          memory: 250Mi
+          memory: 105Mi
           cpu: 25m
+        limits:
+          memory: 105Mi
diff --git a/cluster/apps/web-tools/wallabag/helm-release.yaml b/cluster/apps/web-tools/wallabag/helm-release.yaml
index 4284e6613..8e89615f2 100644
--- a/cluster/apps/web-tools/wallabag/helm-release.yaml
+++ b/cluster/apps/web-tools/wallabag/helm-release.yaml
@@ -69,4 +69,4 @@ spec:
         cpu: 100m
         memory: 250Mi
       limits:
-        memory: 100Gi
+        memory: 512Mi