diff --git a/helm/mail/templates/hpa.yaml b/helm/mail/templates/hpa.yaml
index 7729f9d..1d194e3 100644
--- a/helm/mail/templates/hpa.yaml
+++ b/helm/mail/templates/hpa.yaml
@@ -3,7 +3,7 @@
 {{- $fullName := include (print $chart ".fullname") . -}}
 {{- $labels := include (print $chart ".labels") . -}}
 {{- $kind := "StatefulSet" -}}
-apiVersion: autoscaling/v2beta1
+apiVersion: {{ .Values.autoscaling.apiVersion }}
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ $fullName | quote }}
diff --git a/helm/mail/values.yaml b/helm/mail/values.yaml
index 36988a5..3c9a9f9 100644
--- a/helm/mail/values.yaml
+++ b/helm/mail/values.yaml
@@ -39,7 +39,7 @@ metrics:
     annotations: {}
   port: 9154
   path: /metrics
-  image: 
+  image:
     repository: "boky/postfix-exporter"
     tag: "latest"
 
@@ -95,6 +95,7 @@ autoscaling:
   # targetMemoryUtilizationPercentage: 80
   labels: {}
   annotations: {}
+  apiVersion: "autoscaling/v2beta1"
 
 nodeSelector: {}
 tolerations: []
@@ -184,7 +185,7 @@ dns:
     # - 8.8.8.8
     # - 8.8.4.4
   searches: ""
-  # searches: 
+  # searches:
   # - "default.svc.cluster.local"
   # - "svc.cluster.local"
   # - "cluster.local"