diff --git a/pkg/chartutil/create.go b/pkg/chartutil/create.go
index 8a09a4bea..90e1b5122 100644
--- a/pkg/chartutil/create.go
+++ b/pkg/chartutil/create.go
@@ -289,22 +289,24 @@ spec:
     apiVersion: apps/v1
     kind: Deployment
     name: {{ template "<CHARTNAME>.fullname" . }}
-  minReplicas: {{ .Values.hpa.minReplicas }}
-  maxReplicas: {{ .Values.hpa.maxReplicas }}
+{{- with .Values.deployment.hpa }}
+  minReplicas: {{ .minReplicas }}
+  maxReplicas: {{ .maxReplicas }}
   metrics:
-  {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+  {{- if .targetCPUUtilizationPercentage }}
     - type: Resource
       resource:
         name: cpu
-        targetAverageUtilization: {{ .Values.hpa.targetCPUUtilizationPercentage }}
+        targetAverageUtilization: {{ .targetCPUUtilizationPercentage }}
   {{- end }}
-  {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+  {{- if .targetMemoryUtilizationPercentage }}
     - type: Resource
       resource:
         name: memory
-        targetAverageUtilization: {{ .Values.hpa.targetMemoryUtilizationPercentage }}
+        targetAverageUtilization: {{ .targetMemoryUtilizationPercentage }}
   {{- end }}
 {{- end }}
+{{- end }}
 `
 
 const defaultService = `apiVersion: v1