diff --git a/charts/common/Chart.yaml b/charts/common/Chart.yaml
index 2d3b6408..06699ac6 100644
--- a/charts/common/Chart.yaml
+++ b/charts/common/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: common
 description: A generic helm chart for Kubernetes
 type: application
-version: 0.8.0
+version: 0.8.1
 maintainers:
   - name: Parity
     url: https://github.com/paritytech/helm-charts
diff --git a/charts/common/templates/hpa.yaml b/charts/common/templates/hpa.yaml
index b8d7a2a3..afa68d51 100644
--- a/charts/common/templates/hpa.yaml
+++ b/charts/common/templates/hpa.yaml
@@ -18,6 +18,9 @@ spec:
   minReplicas: {{ .Values.autoscaling.minReplicas }}
   maxReplicas: {{ .Values.autoscaling.maxReplicas }}
   metrics:
+    {{- if .Values.autoscaling.customMetrics }}
+    {{- toYaml .Values.autoscaling.customMetrics | nindent 8 }}
+    {{- else }}
     {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
     - type: Resource
       resource:
@@ -42,7 +45,5 @@ spec:
         targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
         {{- end }}
     {{- end }}
-    {{- if .Values.autoscaling.customMetrics }}
-    {{- toYaml .Values.autoscaling.customMetrics | nindent 8 }}
     {{- end }}
 {{- end }}