diff --git a/k8s/monitoring/kustomization.yaml b/k8s/monitoring/kustomization.yaml
index f1f8d25..2a35b67 100644
--- a/k8s/monitoring/kustomization.yaml
+++ b/k8s/monitoring/kustomization.yaml
@@ -9,9 +9,6 @@ resources:
   - thanos.yaml
   - alerts-longhorn.yaml
   - matrix-alertmanager-receiver.yaml
-images:
-  - name: quay.io/thanos/thanos
-    newTag: v0.36.1
 secretGenerator:
   - name: additional-scrape-configs
     options:
diff --git a/k8s/monitoring/thanos.yaml b/k8s/monitoring/thanos.yaml
index 28d0b35..b08c5ba 100644
--- a/k8s/monitoring/thanos.yaml
+++ b/k8s/monitoring/thanos.yaml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
       - name: thanos-querier
-        image: quay.io/thanos/thanos:latest
+        image: quay.io/thanos/thanos:v0.36.1
         args:
           - query
           - --http-address
@@ -120,7 +120,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: status.hostIP
-        image: quay.io/thanos/thanos:latest
+        image: quay.io/thanos/thanos:v0.36.1
         livenessProbe:
           failureThreshold: 8
           httpGet:
diff --git a/k8s/operators/kube-prometheus/prometheus-patch.yaml b/k8s/operators/kube-prometheus/prometheus-patch.yaml
index a1c831d..6345a73 100644
--- a/k8s/operators/kube-prometheus/prometheus-patch.yaml
+++ b/k8s/operators/kube-prometheus/prometheus-patch.yaml
@@ -1,30 +1,3 @@
-- op: add
-  path: /spec/storage
-  value:
-    volumeClaimTemplate:
-      spec:
-        resources:
-          requests:
-            storage: 40Gi
-- op: add
-  path: /spec/additionalScrapeConfigs
-  value:
-    key: scrape-configs.yaml
-    name: additional-scrape-configs
-    optional: true
-- op: add
-  path: /spec/secrets
-  value: [scrape-secrets]
-- op: add
-  path: /spec/externalUrl
-  value: https://prometheus.k8s.home.finn.io
-- op: add
-  path: /spec/thanos
-  value:
-    image: quay.io/thanos/thanos:v0.36.0
-    objectStorageConfig:
-      key: thanos.yaml
-      name: thanos-objstore
 - op: add
   path: /spec/storage
   value:
@@ -33,3 +6,25 @@
         resources:
           requests:
             storage: 50Gi
+- op: add
+  path: /spec/additionalScrapeConfigs
+  value:
+    key: scrape-configs.yaml
+    name: additional-scrape-configs
+    optional: true
+- op: add
+  path: /spec/externalUrl
+  value: https://prometheus.k8s.home.finn.io
+- op: add
+  path: /spec/retention
+  value: 72h
+- op: add
+  path: /spec/secrets
+  value: [scrape-secrets]
+- op: add
+  path: /spec/thanos
+  value:
+    image: quay.io/thanos/thanos:v0.36.1
+    objectStorageConfig:
+      key: thanos.yaml
+      name: thanos-objstore