diff --git a/charts/keygen/templates/job.yaml b/charts/keygen/templates/job.yaml
index cb56d375c..ee5e6b85f 100644
--- a/charts/keygen/templates/job.yaml
+++ b/charts/keygen/templates/job.yaml
@@ -110,11 +110,13 @@ spec:
                 name: {{ include "common.tplvalues.render" (dict "value" .Values.extraEnvVarsSecret "context" $) }}
             {{- end }}
           volumeMounts:
+            {{- if .Values.persistence.enabled }}
             - name: {{ .Values.persistence.volume_name }}
               mountPath: {{ .Values.persistence.mountDir }}
+            {{- end }}
       volumes:
       {{- if .Values.persistence.enabled }}
       - name: {{ .Values.persistence.volume_name }}
         persistentVolumeClaim:
           claimName: {{ .Values.persistence.existingClaim | default .Values.persistence.pvc_claim_name }}
-      {{ end }}
+      {{- end }}
diff --git a/charts/keymanager/templates/deployment.yaml b/charts/keymanager/templates/deployment.yaml
index 5c5be01f3..5b4a9f78e 100644
--- a/charts/keymanager/templates/deployment.yaml
+++ b/charts/keymanager/templates/deployment.yaml
@@ -155,4 +155,4 @@ spec:
       - name: {{ .Values.persistence.volume_name }}
         persistentVolumeClaim:
           claimName: {{ .Values.persistence.existingClaim | default .Values.persistence.pvc_claim_name  }}
-      {{ end }}
+      {{- end }}