diff --git a/packages/apps/tenant/Chart.yaml b/packages/apps/tenant/Chart.yaml
index d98b9fa6..89a884a2 100644
--- a/packages/apps/tenant/Chart.yaml
+++ b/packages/apps/tenant/Chart.yaml
@@ -4,4 +4,4 @@ description: Separated tenant namespace
 icon: /logos/tenant.svg
 
 type: application
-version: 1.6.5
+version: 1.6.6
diff --git a/packages/apps/tenant/templates/monitoring.yaml b/packages/apps/tenant/templates/monitoring.yaml
index f0fef4a2..e62cb507 100644
--- a/packages/apps/tenant/templates/monitoring.yaml
+++ b/packages/apps/tenant/templates/monitoring.yaml
@@ -26,12 +26,24 @@ spec:
     metricsStorages:
     - name: shortterm
       retentionPeriod: "3d"
-      deduplicationInterval: "5m"
-      storage: 10Gi
-    - name: longterm
-      retentionPeriod: "14d"
       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/versions_map b/packages/apps/versions_map
index 26483c07..35700a8d 100644
--- a/packages/apps/versions_map
+++ b/packages/apps/versions_map
@@ -95,7 +95,8 @@ tenant 1.6.1 edbbb9be
 tenant 1.6.2 ccedc5fe
 tenant 1.6.3 2057bb96
 tenant 1.6.4 3c9e50a4
-tenant 1.6.5 HEAD
+tenant 1.6.5 f1e11451
+tenant 1.6.6 HEAD
 virtual-machine 0.1.4 f2015d6
 virtual-machine 0.1.5 7cd7de7
 virtual-machine 0.2.0 5ca8823
diff --git a/packages/extra/monitoring/Chart.yaml b/packages/extra/monitoring/Chart.yaml
index 02a70f33..a9b795e8 100644
--- a/packages/extra/monitoring/Chart.yaml
+++ b/packages/extra/monitoring/Chart.yaml
@@ -3,4 +3,4 @@ name: monitoring
 description: Monitoring and observability stack
 icon: /logos/monitoring.svg
 type: application
-version: 1.5.3
+version: 1.5.4
diff --git a/packages/extra/monitoring/templates/vm/vmcluster.yaml b/packages/extra/monitoring/templates/vm/vmcluster.yaml
index 4c8c9420..6b298437 100644
--- a/packages/extra/monitoring/templates/vm/vmcluster.yaml
+++ b/packages/extra/monitoring/templates/vm/vmcluster.yaml
@@ -6,22 +6,35 @@ metadata:
   name: {{ .name }}
 spec:
   replicationFactor: 2
-  retentionPeriod: "3"
+  retentionPeriod: {{ .retentionPeriod | quote }}
   vminsert:
-    replicaCount: 2
-    resources: {}
-  vmselect:
     replicaCount: 2
     resources:
+      {{- if empty .vminsert.resources }}
       limits:
         memory: 1000Mi
       requests:
         cpu: 100m
         memory: 500Mi
+      {{- else }}
+      {{- toYaml .vminsert.resources | nindent 6 }}
+      {{- end }}
+  vmselect:
+    replicaCount: 2
+    resources:
+      {{- if empty .vmselect.resources }}
+      limits:
+        memory: 1000Mi
+      requests:
+        cpu: 100m
+        memory: 500Mi
+      {{- else }}
+      {{- toYaml .vmselect.resources | nindent 6 }}
+      {{- end }}
     extraArgs:
       search.maxUniqueTimeseries: "600000"
       vmalert.proxyURL: http://vmalert-{{ .name }}.{{ $.Release.Namespace }}.svc:8080
-      dedup.minScrapeInterval: "15s"
+      dedup.minScrapeInterval: {{ .deduplicationInterval | quote}}
     cacheMountPath: /select-cache
     storage:
       volumeClaimTemplate:
@@ -35,11 +48,15 @@ spec:
   vmstorage:
     replicaCount: 2
     resources:
+      {{- if empty .vmstorage.resources }}
       limits:
-        memory: 1000Mi
+        memory: 2048Mi
       requests:
         cpu: 100m
         memory: 500Mi
+      {{- else }}
+      {{- toYaml .vmstorage.resources | nindent 6 }}
+      {{- end }}
     storage:
       volumeClaimTemplate:
         spec:
diff --git a/packages/extra/monitoring/values.yaml b/packages/extra/monitoring/values.yaml
index 4812844e..3633b622 100644
--- a/packages/extra/monitoring/values.yaml
+++ b/packages/extra/monitoring/values.yaml
@@ -5,17 +5,59 @@ host: ""
 
 ## @param metricsStorages [array] Configuration of metrics storage instances
 ##
+## Example:
+## metricsStorages:
+## - name: shortterm
+##   retentionPeriod: "3d"
+##   deduplicationInterval: "15s"
+##   storage: 10Gi
+##   storageClassName: ""
+##   vminsert:
+##     resources:
+##       limits:
+##         memory: 1024Mi
+##       requests:
+##         cpu: 200m
+##         memory: 512Mi
+##   vmselect:
+##     resources:
+##       limits:
+##         memory: 2048Mi
+##       requests:
+##         cpu: 300m
+##         memory: 1Gi
+##   vmstorage:
+##     resources:
+##       limits:
+##         memory: 4096Mi
+##       requests:
+##         cpu: 500m
+##         memory: 2Gi
+##
 metricsStorages:
 - name: shortterm
   retentionPeriod: "3d"
-  deduplicationInterval: "5m"
-  storage: 10Gi
-  storageClassName: ""
-- name: longterm
-  retentionPeriod: "14d"
   deduplicationInterval: "15s"
   storage: 10Gi
   storageClassName: ""
+  vminsert:
+    resources: {}
+  vmselect:
+    resources: {}
+  vmstorage:
+    resources: {}
+- name: longterm
+  retentionPeriod: "14d"
+  deduplicationInterval: "5m"
+  storage: 10Gi
+  storageClassName: ""
+  vminsert:
+    resources: {}
+  vmselect:
+    resources: {}
+  vmstorage:
+    resources: {}
+
 
 ## @param logsStorages [array] Configuration of logs storage instances
 ##
diff --git a/packages/extra/versions_map b/packages/extra/versions_map
index bbeb158f..18497060 100644
--- a/packages/extra/versions_map
+++ b/packages/extra/versions_map
@@ -17,7 +17,8 @@ monitoring 1.4.0 adaf603b
 monitoring 1.5.0 4b90bf5a
 monitoring 1.5.1 57e90b70
 monitoring 1.5.2 898374b5
-monitoring 1.5.3 HEAD
+monitoring 1.5.3 c1ca19dc
+monitoring 1.5.4 HEAD
 seaweedfs 0.1.0 5ca8823
 seaweedfs 0.2.0 9e33dc0
 seaweedfs 0.2.1 HEAD