diff --git a/charts/sogo/templates/configmap.yaml b/charts/sogo/templates/configmap.yaml
index dc1e1ef..1bcfcee 100644
--- a/charts/sogo/templates/configmap.yaml
+++ b/charts/sogo/templates/configmap.yaml
@@ -5,13 +5,13 @@ metadata:
   labels:
     {{- include "sogo.labels" . | nindent 4 }}
 data:
-  SOGO_SOGoIMAPServer: {{ .Values.deployment.config.SOGO_SOGoIMAPServer | quote }}
-  SOGO_SOGoSMTPServer: {{ .Values.deployment.config.SOGO_SOGoSMTPServer | quote }}
+  SOGO_SOGoIMAPServer: '{{ .Values.deployment.config.SOGO_SOGoIMAPServer | quote }}'
+  SOGO_SOGoSMTPServer: '{{ .Values.deployment.config.SOGO_SOGoSMTPServer | quote }}'
   SOGO_SOGoMailDomain: {{ .Values.deployment.config.SOGO_SOGoMailDomain | quote }}
   SOGO_SOGoMailingMechanism: {{ .Values.deployment.config.SOGO_SOGoMailingMechanism | quote  }}
   SOGO_SOGoSMTPAuthenticationType: {{ .Values.deployment.config.SOGO_SOGoSMTPAuthenticationType | quote  }}
   SOGO_SOGoForceExternalLoginWithEmail: {{ .Values.deployment.config.SOGO_SOGoForceExternalLoginWithEmail | quote }}
-  SOGO_NGImap4ConnectionStringSeparator: {{ .Values.deployment.config.SOGO_NGImap4ConnectionStringSeparator | quote  }}
+  SOGO_NGImap4ConnectionStringSeparator: '{{ .Values.deployment.config.SOGO_NGImap4ConnectionStringSeparator | quote  }}'
   SOGO_SOGoPasswordChangeEnabled: {{ .Values.deployment.config.SOGO_SOGoPasswordChangeEnabled | quote }}
   SOGO_SOGoForwardEnabled: {{ .Values.deployment.config.SOGO_SOGoForwardEnabled | quote }}
   SOGO_SOGoSieveScriptsEnabled: {{ .Values.deployment.config.SOGO_SOGoSieveScriptsEnabled | quote }}