diff --git a/charts/sogo/templates/configmap.yaml b/charts/sogo/templates/configmap.yaml
index 8bff805..961a7a1 100644
--- a/charts/sogo/templates/configmap.yaml
+++ b/charts/sogo/templates/configmap.yaml
@@ -10,12 +10,12 @@ data:
   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  }}
+  SOGO_SOGoForceExternalLoginWithEmail: {{ .Values.deployment.config.SOGO_SOGoForceExternalLoginWithEmail | quote }}
   SOGO_NGImap4ConnectionStringSeparator: {{ .Values.deployment.config.SOGO_NGImap4ConnectionStringSeparator | quote  }}
-  SOGO_SOGoPasswordChangeEnabled: {{ .Values.deployment.config.SOGO_SOGoPasswordChangeEnabled  }}
-  SOGO_SOGoForwardEnabled: {{ .Values.deployment.config.SOGO_SOGoForwardEnabled }}
-  SOGO_SOGoSieveScriptsEnabled: {{ .Values.deployment.config.SOGO_SOGoSieveScriptsEnabled }}
+  SOGO_SOGoPasswordChangeEnabled: {{ .Values.deployment.config.SOGO_SOGoPasswordChangeEnabled | quote }}
+  SOGO_SOGoForwardEnabled: {{ .Values.deployment.config.SOGO_SOGoForwardEnabled | quote }}
+  SOGO_SOGoSieveScriptsEnabled: {{ .Values.deployment.config.SOGO_SOGoSieveScriptsEnabled | quote }}
   SOGO_SOGoTimeZone: {{ .Values.deployment.config.SOGO_SOGoTimeZone | quote }}
-  SOGO_WorkersCount: {{ .Values.deployment.config.SOGO_WorkersCount }}
+  SOGO_WorkersCount: {{ .Values.deployment.config.SOGO_WorkersCount | quote }}
   SOGO_SOGoCalendarDefaultRoles: |
     {{ .Values.deployment.config.SOGO_SOGoCalendarDefaultRoles }}