diff --git a/charts/argo-cd/templates/argocd-application-controller/deployment.yaml b/charts/argo-cd/templates/argocd-application-controller/deployment.yaml
index 7c87bce8..91669151 100755
--- a/charts/argo-cd/templates/argocd-application-controller/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-application-controller/deployment.yaml
@@ -95,8 +95,8 @@ spec:
         volumeMounts:
         - mountPath: /app/config/controller/tls
           name: argocd-repo-server-tls
-{{- if .Values.controller.volumeMounts }}
-{{- toYaml .Values.controller.volumeMounts | nindent 10}}
+{{- with .Values.controller.volumeMounts }}
+  {{- toYaml . | nindent 8 }}
 {{- end }}
         resources:
 {{- toYaml .Values.controller.resources | nindent 10 }}
@@ -129,8 +129,8 @@ spec:
             path: ca.crt
           optional: true
           secretName: argocd-repo-server-tls
-{{- if .Values.controller.volumes }}
-{{- toYaml .Values.controller.volumes | nindent 8 }}
+{{- with .Values.controller.volumes }}
+  {{- toYaml . | nindent 6 }}
 {{- end }}
 {{- if .Values.controller.priorityClassName }}
       priorityClassName: {{ .Values.controller.priorityClassName }}