diff --git a/prometheus-alertmanager/templates/bin/_alertmanager.sh.tpl b/prometheus-alertmanager/templates/bin/_alertmanager.sh.tpl
index 26f6a9183..f45b4842a 100644
--- a/prometheus-alertmanager/templates/bin/_alertmanager.sh.tpl
+++ b/prometheus-alertmanager/templates/bin/_alertmanager.sh.tpl
@@ -21,7 +21,7 @@ COMMAND="${@:-start}"
 
 function start () {
   exec /bin/alertmanager \
-    -config.file=/etc/config/alertmanager.yml \
+    -config.file=/etc/alertmanager/config.yml \
     -storage.path={{ .Values.conf.command_flags.storage.path }} \
     -mesh.listen-address={{ .Values.conf.command_flags.mesh.listen_address }} \
     $(generate_peers)
diff --git a/prometheus-alertmanager/templates/configmap-etc.yaml b/prometheus-alertmanager/templates/configmap-etc.yaml
index 00517a079..b1d04dbf1 100644
--- a/prometheus-alertmanager/templates/configmap-etc.yaml
+++ b/prometheus-alertmanager/templates/configmap-etc.yaml
@@ -22,8 +22,10 @@ kind: ConfigMap
 metadata:
   name: alertmanager-etc
 data:
-  alertmanager.yml: |
+  config.yml: |
 {{ toYaml .Values.conf.alertmanager | indent 4 }}
   alert-templates.tmpl: |
-{{ toYaml .Values.conf.alert_templates | indent 4 }}
+{{- if .Values.conf.alert_templates }}
+{{ .Values.conf.alert_templates | indent 4 }}
+{{- end }}
 {{- end }}
diff --git a/prometheus-alertmanager/templates/statefulset.yaml b/prometheus-alertmanager/templates/statefulset.yaml
index c1779b02c..403f54ce2 100644
--- a/prometheus-alertmanager/templates/statefulset.yaml
+++ b/prometheus-alertmanager/templates/statefulset.yaml
@@ -101,8 +101,8 @@ spec:
               subPath: alert-templates.tmpl
               readOnly: true
             - name: alertmanager-etc
-              mountPath: /etc/config/alertmanager.yml
-              subPath: alertmanager.yml
+              mountPath: /etc/alertmanager/config.yml
+              subPath: config.yml
               readOnly: true
             - name: alertmanager-bin
               mountPath: /tmp/alertmanager.sh
diff --git a/prometheus-alertmanager/values.yaml b/prometheus-alertmanager/values.yaml
index d9268a3b5..6988e4118 100644
--- a/prometheus-alertmanager/values.yaml
+++ b/prometheus-alertmanager/values.yaml
@@ -297,4 +297,4 @@ conf:
             room_id: 85
             message_format: html
             notify: true
-  alertmanager_templates: null
+  alert_templates: null