diff --git a/packages/apps/tenant/templates/etcd.yaml b/packages/apps/tenant/templates/etcd.yaml
index 17b66683..1a8e4006 100644
--- a/packages/apps/tenant/templates/etcd.yaml
+++ b/packages/apps/tenant/templates/etcd.yaml
@@ -4,8 +4,6 @@ kind: HelmRelease
 metadata:
   name: etcd
   namespace: {{ include "tenant.name" . }}
-  annotations:
-    helm.sh/resource-policy: keep
   labels:
     cozystack.io/ui: "true"
     app.kubernetes.io/instance: {{ .Release.Name }}
@@ -19,7 +17,6 @@ spec:
         kind: HelmRepository
         name: cozystack-extra
         namespace: cozy-public
-      version: "*"
   interval: 1m0s
   timeout: 5m0s
 {{- end }}
diff --git a/packages/apps/tenant/templates/info.yaml b/packages/apps/tenant/templates/info.yaml
index 59aa920a..fc312262 100644
--- a/packages/apps/tenant/templates/info.yaml
+++ b/packages/apps/tenant/templates/info.yaml
@@ -6,8 +6,6 @@ kind: HelmRelease
 metadata:
   name: info
   namespace: {{ include "tenant.name" . }}
-  annotations:
-    helm.sh/resource-policy: keep
   labels:
     cozystack.io/ui: "true"
     app.kubernetes.io/instance: {{ .Release.Name }}
@@ -21,7 +19,6 @@ spec:
         kind: HelmRepository
         name: cozystack-extra
         namespace: cozy-public
-      version: "*"
   interval: 1m0s
   timeout: 5m0s
 {{- end }}
diff --git a/packages/apps/tenant/templates/ingress.yaml b/packages/apps/tenant/templates/ingress.yaml
index b93ae0fa..5d3cb05f 100644
--- a/packages/apps/tenant/templates/ingress.yaml
+++ b/packages/apps/tenant/templates/ingress.yaml
@@ -4,8 +4,6 @@ kind: HelmRelease
 metadata:
   name: ingress
   namespace: {{ include "tenant.name" . }}
-  annotations:
-    helm.sh/resource-policy: keep
   labels:
     cozystack.io/ui: "true"
     app.kubernetes.io/instance: {{ .Release.Name }}
diff --git a/packages/apps/tenant/templates/monitoring.yaml b/packages/apps/tenant/templates/monitoring.yaml
index e62cb507..1992a4ea 100644
--- a/packages/apps/tenant/templates/monitoring.yaml
+++ b/packages/apps/tenant/templates/monitoring.yaml
@@ -4,8 +4,6 @@ kind: HelmRelease
 metadata:
   name: monitoring
   namespace: {{ include "tenant.name" . }}
-  annotations:
-    helm.sh/resource-policy: keep
   labels:
     cozystack.io/ui: "true"
     app.kubernetes.io/instance: {{ .Release.Name }}
@@ -19,31 +17,6 @@ spec:
         kind: HelmRepository
         name: cozystack-extra
         namespace: cozy-public
-      version: "*"
   interval: 1m0s
   timeout: 5m0s
-  values:
-    metricsStorages:
-    - name: shortterm
-      retentionPeriod: "3d"
-      deduplicationInterval: "15s"
-      storage: 10Gi
-      vminsert:
-        resources: {}
-      vmselect:
-        resources: {}
-      vmstorage:
-        resources: {}
-    - name: longterm
-      retentionPeriod: "14d"
-      deduplicationInterval: "5m"
-      storage: 10Gi
-      vminsert:
-        resources: {}
-      vmselect:
-        resources: {}
-      vmstorage:
-        resources: {}
-    oncall:
-      enabled: false
 {{- end }}
diff --git a/packages/apps/tenant/templates/seaweedfs.yaml b/packages/apps/tenant/templates/seaweedfs.yaml
index 5741d930..aa579b3e 100644
--- a/packages/apps/tenant/templates/seaweedfs.yaml
+++ b/packages/apps/tenant/templates/seaweedfs.yaml
@@ -4,8 +4,6 @@ kind: HelmRelease
 metadata:
   name: seaweedfs
   namespace: {{ include "tenant.name" . }}
-  annotations:
-    helm.sh/resource-policy: keep
   labels:
     cozystack.io/ui: "true"
     app.kubernetes.io/instance: {{ .Release.Name }}
@@ -19,7 +17,6 @@ spec:
         kind: HelmRepository
         name: cozystack-extra
         namespace: cozy-public
-      version: "*"
   interval: 1m0s
   timeout: 5m0s
 {{- end }}