diff --git a/charts/tooljet/templates/hpa.yaml b/charts/tooljet/templates/hpa.yaml
index e23528a..e8ae645 100644
--- a/charts/tooljet/templates/hpa.yaml
+++ b/charts/tooljet/templates/hpa.yaml
@@ -1,4 +1,5 @@
-apiVersion: autoscaling/v2beta1
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: tooljet
@@ -14,7 +15,10 @@ spec:
     resource:
       name: cpu
       targetAverageValue: {{ .Values.apps.tooljet.hpa.threshhold.cpu }}
+      targetType: AverageValue
   - type: Resource
     resource:
       name: memory
       targetAverageValue: {{ .Values.apps.tooljet.hpa.threshhold.ram }}
+      targetType: AverageValue      
+{{- end }}
\ No newline at end of file