diff --git a/chart/templates/default-transit-auth-method.yaml b/chart/templates/default-transit-auth-method.yaml
index 72946695b..1f34198fd 100644
--- a/chart/templates/default-transit-auth-method.yaml
+++ b/chart/templates/default-transit-auth-method.yaml
@@ -17,7 +17,9 @@ metadata:
   {{- include "vso.chart.labels" . | nindent 4 }}
 spec:
   vaultConnectionRef: {{ .Values.controller.manager.clientCache.storageEncryption.vaultConnectionRef }}
-  namespace: {{ .Values.controller.manager.clientCache.storageEncryption.namespace }}
+  {{- with .Values.controller.manager.clientCache.storageEncryption.namespace }}
+  namespace: {{ . | quote }}
+  {{- end }}
   method: {{ .Values.controller.manager.clientCache.storageEncryption.method }}
   mount: {{ .Values.controller.manager.clientCache.storageEncryption.mount }}
   {{- $kubeServiceAccount := .Values.controller.manager.clientCache.storageEncryption.kubernetes.serviceAccount | default (printf "%s-controller-manager" (include "vso.chart.fullname" .)) -}}
diff --git a/chart/templates/default-vault-auth-method.yaml b/chart/templates/default-vault-auth-method.yaml
index 2c2232976..fb435fd17 100644
--- a/chart/templates/default-vault-auth-method.yaml
+++ b/chart/templates/default-vault-auth-method.yaml
@@ -15,7 +15,9 @@ metadata:
     app.kubernetes.io/component: controller-manager
   {{- include "vso.chart.labels" . | nindent 4 }}
 spec:
-  namespace: {{ .Values.defaultAuthMethod.namespace }}
+  {{- with .Values.defaultAuthMethod.namespace }}
+  namespace: {{ . | quote }}
+  {{- end }}
   {{- if .Values.defaultAuthMethod.allowedNamespaces }}
   allowedNamespaces:
   {{- toYaml .Values.defaultAuthMethod.allowedNamespaces | nindent 4 }}