diff --git a/bitnami/thanos/Chart.yaml b/bitnami/thanos/Chart.yaml
index bdc6aa69c..99a7aad33 100644
--- a/bitnami/thanos/Chart.yaml
+++ b/bitnami/thanos/Chart.yaml
@@ -23,4 +23,4 @@ name: thanos
 sources:
   - https://github.com/bitnami/bitnami-docker-thanos
   - https://thanos.io
-version: 3.2.1
+version: 3.2.2
diff --git a/bitnami/thanos/templates/query-frontend/hpa.yaml b/bitnami/thanos/templates/query-frontend/hpa.yaml
index 86eab2fdb..1e1c98062 100644
--- a/bitnami/thanos/templates/query-frontend/hpa.yaml
+++ b/bitnami/thanos/templates/query-frontend/hpa.yaml
@@ -13,16 +13,16 @@ spec:
   minReplicas: {{ .Values.queryFrontend.autoscaling.minReplicas }}
   maxReplicas: {{ .Values.queryFrontend.autoscaling.maxReplicas }}
   metrics:
-    {{- if .Values.queryFrontend.autoscaling.targetCPU }}
-    - type: Resource
-      resource:
-        name: cpu
-        targetAverageUtilization: {{ .Values.queryFrontend.autoscaling.targetCPU }}
-    {{- end }}
     {{- if .Values.queryFrontend.autoscaling.targetMemory }}
     - type: Resource
       resource:
         name: memory
         targetAverageUtilization: {{ .Values.queryFrontend.autoscaling.targetMemory  }}
     {{- end }}
+    {{- if .Values.queryFrontend.autoscaling.targetCPU }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.queryFrontend.autoscaling.targetCPU }}
+    {{- end }}
 {{- end }}
diff --git a/bitnami/thanos/templates/query/hpa.yaml b/bitnami/thanos/templates/query/hpa.yaml
index 0db86e5cc..72b2e9713 100644
--- a/bitnami/thanos/templates/query/hpa.yaml
+++ b/bitnami/thanos/templates/query/hpa.yaml
@@ -14,16 +14,16 @@ spec:
   minReplicas: {{ $query.autoscaling.minReplicas }}
   maxReplicas: {{ $query.autoscaling.maxReplicas }}
   metrics:
-    {{- if $query.autoscaling.targetCPU }}
-    - type: Resource
-      resource:
-        name: cpu
-        targetAverageUtilization: {{ $query.autoscaling.targetCPU }}
-    {{- end }}
     {{- if $query.autoscaling.targetMemory }}
     - type: Resource
       resource:
         name: memory
         targetAverageUtilization: {{ $query.autoscaling.targetMemory  }}
     {{- end }}
+    {{- if $query.autoscaling.targetCPU }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ $query.autoscaling.targetCPU }}
+    {{- end }}
 {{- end }}    
diff --git a/bitnami/thanos/templates/storegateway/hpa.yaml b/bitnami/thanos/templates/storegateway/hpa.yaml
index 046f9f7bf..a88771012 100644
--- a/bitnami/thanos/templates/storegateway/hpa.yaml
+++ b/bitnami/thanos/templates/storegateway/hpa.yaml
@@ -13,16 +13,16 @@ spec:
   minReplicas: {{ .Values.storegateway.autoscaling.minReplicas }}
   maxReplicas: {{ .Values.storegateway.autoscaling.maxReplicas }}
   metrics:
-    {{- if .Values.storegateway.autoscaling.targetCPU }}
-    - type: Resource
-      resource:
-        name: cpu
-        targetAverageUtilization: {{ .Values.storegateway.autoscaling.targetCPU }}
-    {{- end }}
     {{- if .Values.storegateway.autoscaling.targetMemory }}
     - type: Resource
       resource:
         name: memory
         targetAverageUtilization: {{ .Values.storegateway.autoscaling.targetMemory  }}
     {{- end }}
+    {{- if .Values.storegateway.autoscaling.targetCPU }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.storegateway.autoscaling.targetCPU }}
+    {{- end }}
 {{- end }}