diff --git a/charts/incubator/prometheus/Chart.yaml b/charts/incubator/prometheus/Chart.yaml
index 68a5a855281..5943d994ee8 100644
--- a/charts/incubator/prometheus/Chart.yaml
+++ b/charts/incubator/prometheus/Chart.yaml
@@ -20,7 +20,7 @@ sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
 type: application
-version: 0.0.9
+version: 0.0.10
 annotations:
   truecharts.org/catagories: |
     - metrics
diff --git a/charts/incubator/prometheus/templates/alertmanager/alertmanager.yaml b/charts/incubator/prometheus/templates/alertmanager/_alertmanager.tpl
similarity index 98%
rename from charts/incubator/prometheus/templates/alertmanager/alertmanager.yaml
rename to charts/incubator/prometheus/templates/alertmanager/_alertmanager.tpl
index bf31b0f6df8..c0a076034bb 100644
--- a/charts/incubator/prometheus/templates/alertmanager/alertmanager.yaml
+++ b/charts/incubator/prometheus/templates/alertmanager/_alertmanager.tpl
@@ -1,4 +1,6 @@
+{{- define "prometheus.alertmanager.alertmanager" -}}
 {{- if .Values.alertmanager.enabled }}
+---
 apiVersion: monitoring.coreos.com/v1
 kind: Alertmanager
 metadata:
@@ -17,7 +19,7 @@ spec:
   {{- else if and .Values.ingress.alertmanager.enabled .Values.ingress.alertmanager.hosts }}
   externalUrl: {{ if .Values.ingress.alertmanager.tls }}https{{else}}http{{ end }}://{{ (index .Values.ingress.alertmanager.hosts 0).name }}{{ .Values.alertmanager.routePrefix }}
   {{- else }}
-  externalUrl: http://{{ template "kube-prometheus.alertmanager.fullname" . }}.{{ .Release.Namespace }}:{{ .Values.alertmanager.service.port }}{{ .Values.alertmanager.routePrefix }}
+  externalUrl: http://{{ template "kube-prometheus.alertmanager.fullname" . }}.{{ .Release.Namespace }}:{{ .Values.service.alertmanager.ports.alertmanager.port }}{{ .Values.alertmanager.routePrefix }}
   {{- end }}
   portName: "{{ .Values.alertmanager.portName }}"
   paused: {{ .Values.alertmanager.paused }}
@@ -178,3 +180,4 @@ spec:
   alertmanagerConfigSelector: {{- include "common.tplvalues.render" (dict "value" .Values.alertmanager.configSelector "context" $) | nindent 4 }}
   {{- end }}
 {{- end }}
+{{- end }}
diff --git a/charts/incubator/prometheus/templates/common.yaml b/charts/incubator/prometheus/templates/common.yaml
index 929df3b38e5..67ed1165751 100644
--- a/charts/incubator/prometheus/templates/common.yaml
+++ b/charts/incubator/prometheus/templates/common.yaml
@@ -11,6 +11,8 @@
 {{- include "prometheus.prometheus.additionalscrapejobs" . }}
 {{- include "prometheus.prometheus.servicemonitor" . }}
 
+{{- include "prometheus.alertmanager.alertmanager" . }}
+
 
 {{/* Render the templates */}}
 {{ include "common.postSetup" . }}