diff --git a/deployments/helm-chart/templates/controller-deployment.yaml b/deployments/helm-chart/templates/controller-deployment.yaml
index 857d9ac303..48b5375659 100644
--- a/deployments/helm-chart/templates/controller-deployment.yaml
+++ b/deployments/helm-chart/templates/controller-deployment.yaml
@@ -10,7 +10,9 @@ metadata:
   annotations: {{ toYaml .Values.controller.annotations | nindent 4 }}
 {{- end }}
 spec:
+  {{- if not .Values.controller.autoscaling.enabled }}
   replicas: {{ .Values.controller.replicaCount }}
+  {{- end }}
   selector:
     matchLabels:
       {{- include "nginx-ingress.selectorLabels" . | nindent 6 }}
diff --git a/deployments/helm-chart/templates/controller-hpa.yaml b/deployments/helm-chart/templates/controller-hpa.yaml
index 6bfe1d9d49..bc71463900 100644
--- a/deployments/helm-chart/templates/controller-hpa.yaml
+++ b/deployments/helm-chart/templates/controller-hpa.yaml
@@ -18,20 +18,20 @@ spec:
   minReplicas: {{ .Values.controller.autoscaling.minReplicas }}
   maxReplicas: {{ .Values.controller.autoscaling.maxReplicas }}
   metrics:
-    {{- if .Values.controller.autoscaling.targetCPUUtilizationPercentage }}
+    {{- if .Values.controller.autoscaling.targetMemoryUtilizationPercentage }}
     - type: Resource
       resource:
-        name: cpu
+        name: memory
         target:
           type: Utilization
-          averageUtilization: {{ .Values.controller.autoscaling.targetCPUUtilizationPercentage }}
+          averageUtilization: {{ .Values.controller.autoscaling.targetMemoryUtilizationPercentage }}
     {{- end }}
-    {{- if .Values.controller.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- if .Values.controller.autoscaling.targetCPUUtilizationPercentage }}
     - type: Resource
       resource:
-        name: memory
+        name: cpu
         target:
           type: Utilization
-          averageUtilization: {{ .Values.controller.autoscaling.targetMemoryUtilizationPercentage }}
+          averageUtilization: {{ .Values.controller.autoscaling.targetCPUUtilizationPercentage }}
     {{- end }}
 {{- end }}