diff --git a/incubator/vault/Chart.yaml b/incubator/vault/Chart.yaml
index 564324ab19..661a594dac 100644
--- a/incubator/vault/Chart.yaml
+++ b/incubator/vault/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: A Helm chart for Vault, a tool for managing secrets
 name: vault
-version: 0.18.6
+version: 0.18.7
 appVersion: 1.0.1
 home: https://www.vaultproject.io/
 icon: https://www.vaultproject.io/assets/images/mega-nav/logo-vault-0f83e3d2.svg
diff --git a/incubator/vault/templates/deployment.yaml b/incubator/vault/templates/deployment.yaml
index 073d4b8d8c..9c3aef86f2 100644
--- a/incubator/vault/templates/deployment.yaml
+++ b/incubator/vault/templates/deployment.yaml
@@ -34,7 +34,7 @@ spec:
     spec:
       {{- if .Values.vault.extraInitContainers }}
       initContainers:
-{{ tpl .Values.vault.extraInitContainers . | indent 6 }}
+{{ tpl (toYaml .Values.vault.extraInitContainers) . | indent 6 }}
       {{- end }}
       containers:
       - name: {{ .Chart.Name }}
@@ -47,7 +47,7 @@ spec:
         {{- end }}
         {{- if .Values.lifecycle }}
         lifecycle:
-{{ tpl .Values.lifecycle . | indent 10 }}
+{{ tpl (toYaml .Values.lifecycle) . | indent 10 }}
         {{- end }}
         ports:
         - containerPort: {{ .Values.service.port }}
@@ -101,7 +101,7 @@ spec:
 {{ toYaml .Values.vault.extraVolumeMounts | indent 8 }}
         {{- end }}
 {{- if .Values.vault.extraContainers }}
-{{ toYaml .Values.vault.extraContainers | indent 6}}
+{{ tpl (toYaml .Values.vault.extraContainers) . | indent 6}}
 {{- end }}
         resources:
 {{ toYaml .Values.resources | indent 10 }}
@@ -167,7 +167,7 @@ spec:
       {{- end }}
       {{- if .Values.affinity }}
       affinity:
-{{ tpl .Values.affinity . | indent 8 }}
+{{ tpl (toYaml .Values.affinity) . | indent 8 }}
       {{- end }}
       {{- if .Values.nodeSelector }}
       nodeSelector:
diff --git a/incubator/vault/values.yaml b/incubator/vault/values.yaml
index 858be14985..d36db4ac65 100644
--- a/incubator/vault/values.yaml
+++ b/incubator/vault/values.yaml
@@ -96,7 +96,7 @@ nodeSelector: {}
 
 ## Affinity
 ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
-affinity: |
+affinity:
   podAntiAffinity:
     preferredDuringSchedulingIgnoredDuringExecution:
     - weight: 100
@@ -104,8 +104,8 @@ affinity: |
         topologyKey: kubernetes.io/hostname
         labelSelector:
           matchLabels:
-            app: {{ template "vault.name" . }}
-            release: {{ .Release.Name }}
+            app: '{{ template "vault.name" . }}'
+            release: '{{ .Release.Name }}'
 
 ## Tolerations
 ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
@@ -130,7 +130,7 @@ podLabels: {}
 ## if automation saves your unseal keys to a k8s secret on deploy
 ## writing a script to do this would be trivial and solves the
 ## issues of scaling up if deployed in HA.
-# lifecycle: |
+# lifecycle:
 #   postStart:
 #     exec:
 #       command: ["./unseal -s my-unseal-keys"]
@@ -150,11 +150,12 @@ vault:
   # information.
   dev: true
   # Configure additional environment variables for the Vault containers
-  extraEnv: {}
+  extraEnv: []
   #   - name: VAULT_API_ADDR
   #     value: "https://vault.internal.domain.name:8200"
-  extraContainers: {}
+  extraContainers: []
   ## Additional containers to be added to the Vault pod
+  # extraContainers:
   # - name: vault-sidecar
   #   image: vault-sidecar:latest
   #   volumeMounts:
@@ -165,16 +166,17 @@ vault:
   # the volumeMount name. The two other fields required are the name of the
   # Kubernetes secret (created outside of this chart), and the mountPath
   # at which it should be mounted in the Vault container.
-  extraVolumes: {}
+  extraVolumes: []
   #   - name: vault-tls
   #     secret:
   #       secretName: vault-tls-secret
-  extraVolumeMounts: {}
+  extraVolumeMounts: []
   #   - name: vault-tls
   #     mountPath: /vault/tls
   #     readOnly: true
-  extraInitContainers: {}
+  extraInitContainers: []
   ## Init containers to be added
+  # extraInitContainers:
   # - name: do-something
   #   image: busybox
   #   command: ['do', 'something']