diff --git a/charts/kube-master/charts/etcd/templates/vpa.yaml b/charts/kube-master/charts/etcd/templates/vpa.yaml
index 1915df5f5e..2a2d7cdc7b 100644
--- a/charts/kube-master/charts/etcd/templates/vpa.yaml
+++ b/charts/kube-master/charts/etcd/templates/vpa.yaml
@@ -20,14 +20,20 @@ spec:
 {{- if .Values.resources.limits }}
         maxAllowed:
           {{- toYaml .Values.resources.limits | nindent 12 }}
+{{- else if .Values.vpa.maxAllowed }}
+        maxAllowed:
+          {{- toYaml .Values.vpa.maxAllowed | nindent 12 }}
 {{- end }}
-{{- if and .Values.backup.enabled .Values.resources}}
+{{- if and .Values.backup.enabled .Values.backup.resources}}
       - containerName: backup
         controlledResources: ["cpu", "memory"]
         minAllowed:
           {{- toYaml .Values.backup.resources.requests | nindent 12 }}
 {{- if .Values.resources.limits }}
         maxAllowed:
-          {{- toYaml .Values.resources.limits| nindent 12 }}
+          {{- toYaml .Values.backup.resources.limits| nindent 12 }}
+{{- else if .Values.backup.vpa.maxAllowed }}
+        maxAllowed:
+          {{- toYaml .Values.backup.vpa.maxAllowed | nindent 12 }}
 {{- end }}
 {{- end }}
diff --git a/charts/kube-master/templates/api-vpa.yaml b/charts/kube-master/templates/api-vpa.yaml
index f778f24841..48b1e8f16b 100644
--- a/charts/kube-master/templates/api-vpa.yaml
+++ b/charts/kube-master/templates/api-vpa.yaml
@@ -20,4 +20,7 @@ spec:
 {{- if .Values.api.resources.limits }}
         maxAllowed:
           {{- toYaml .Values.api.resources.limits | nindent 12 }}
+{{- else if .Values.api.vpa.maxAllowed }}
+        maxAllowed:
+          {{- toYaml .Values.api.vpa.maxAllowed | nindent 12 }}
 {{- end }}