diff --git a/charts/default/Chart.yaml b/charts/default/Chart.yaml
index 625a2f1..d7b4375 100644
--- a/charts/default/Chart.yaml
+++ b/charts/default/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 3.1.0
+version: 3.2.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/default/templates/hpa.yaml b/charts/default/templates/hpa.yaml
index cebef5d..2ef6d27 100644
--- a/charts/default/templates/hpa.yaml
+++ b/charts/default/templates/hpa.yaml
@@ -10,8 +10,9 @@ spec:
     apiVersion: apps/v1
     kind: Deployment
     name: {{ include "default.fullname" . }}
-  minReplicas: {{ .Values.autoscaling.minReplicas }}
-  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  minReplicas: {{ default 1 .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ default 2 .Values.autoscaling.maxReplicas }}
+  {{- if or .Values.autoscaling.targetCPUUtilizationPercentage .Values.autoscaling.targetMemoryUtilizationPercentage }}
   metrics:
     {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
     - type: Resource
@@ -29,4 +30,5 @@ spec:
           type: Utilization
           averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
     {{- end }}
+  {{- end }}
 {{- end }}