diff --git a/charts/mail-relay/0.2.0/templates/configmap.yaml b/charts/mail-relay/0.2.0/templates/configmap.yaml
index 5c771b0..905badf 100644
--- a/charts/mail-relay/0.2.0/templates/configmap.yaml
+++ b/charts/mail-relay/0.2.0/templates/configmap.yaml
@@ -5,10 +5,8 @@ metadata:
   labels:
     {{- include "mail-relay.labels" . | nindent 4 }}
 data:
-  sasl_passwd: |
-    {{- toYaml .Values.config.sasl_passwd | nindent 4 }} 
-  transport: |
-    {{- toYaml .Values.config.transport | nindent 4 }} 
+  sasl_passwd: {{- toYaml .Values.config.sasl_passwd | nindent 4 }} 
+  transport: {{- toYaml .Values.config.transport | nindent 4 }} 
   update_transport.sh: |
     #!/bin/sh
     postmap /etc/postfix/transport
diff --git a/charts/mail-relay/0.2.0/templates/deployment.yaml b/charts/mail-relay/0.2.0/templates/deployment.yaml
index ca7e34f..7adf605 100644
--- a/charts/mail-relay/0.2.0/templates/deployment.yaml
+++ b/charts/mail-relay/0.2.0/templates/deployment.yaml
@@ -69,5 +69,5 @@ spec:
       volumes:
       - name: config-volume
         configMap:
-          name: config
+          name: {{ include "mail-relay.fullname" . }}