diff --git a/incubator/prometheus/templates/alertmanager-ingress.yaml b/incubator/prometheus/templates/alertmanager-ingress.yaml
index 1b1166d04e..b04b7649ea 100644
--- a/incubator/prometheus/templates/alertmanager-ingress.yaml
+++ b/incubator/prometheus/templates/alertmanager-ingress.yaml
@@ -1,4 +1,6 @@
-{{- if .Values.alertmanager.ingress.enabled }}
+{{- if .Values.alertmanager.ingress.enabled -}}
+{{- $releaseName := .Release.Name -}}
+{{- $servicePort := .Values.server.httpPort -}}
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
@@ -13,17 +15,17 @@ metadata:
   name: {{ template "alertmanager.fullname" . }}
 spec:
   rules:
-    - host: {{ .Values.alertmanager.ingress.hostName }}
+  {{- range .Values.alertmanager.ingress.hosts }}
+    - host: {{ .hostName }}
       http:
         paths:
           - path: /
             backend:
-              serviceName: {{ template "alertmanager.fullname" . }}
-              servicePort: {{ default 80 .Values.alertmanager.httpPort }}
+              serviceName: {{ printf "%s-%s" $releaseName "alerts" | trunc 24 }}
+              servicePort: {{ default 80 $servicePort }}
+  {{- end -}}
   {{- if .Values.alertmanager.ingress.tls }}
   tls:
-    - hosts:
-        - {{ .Values.alertmanager.ingress.hostName }}
-      secretName: {{ template "alertmanager.fullname" . }}
+{{ toYaml .Values.alertmanager.ingress.tls | indent 4 }}
   {{- end -}}
 {{- end -}}
diff --git a/incubator/prometheus/templates/server-ingress.yaml b/incubator/prometheus/templates/server-ingress.yaml
index 76550f9fff..7e663e575b 100644
--- a/incubator/prometheus/templates/server-ingress.yaml
+++ b/incubator/prometheus/templates/server-ingress.yaml
@@ -1,4 +1,6 @@
-{{- if .Values.server.ingress.enabled }}
+{{- if .Values.server.ingress.enabled -}}
+{{- $releaseName := .Release.Name -}}
+{{- $servicePort := .Values.server.httpPort -}}
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
@@ -13,17 +15,17 @@ metadata:
   name: {{ template "server.fullname" . }}
 spec:
   rules:
-    - host: {{ .Values.server.ingress.hostName }}
+  {{- range .Values.server.ingress.hosts }}
+    - host: {{ .hostName }}
       http:
         paths:
           - path: /
             backend:
-              serviceName: {{ template "server.fullname" . }}
-              servicePort: {{ default 80 .Values.server.httpPort }}
+              serviceName: {{ printf "%s-%s" $releaseName "server" | trunc 24 }}
+              servicePort: {{ default 80 $servicePort }}
+  {{- end -}}
   {{- if .Values.server.ingress.tls }}
   tls:
-    - hosts:
-        - {{ .Values.server.ingress.hostName }}
-      secretName: {{ template "server.fullname" . }}
+{{ toYaml .Values.server.ingress.tls | indent 4 }}
   {{- end -}}
 {{- end -}}
diff --git a/incubator/prometheus/templates/server-pvc.yaml b/incubator/prometheus/templates/server-pvc.yaml
index 1228fa17d0..aaca253728 100644
--- a/incubator/prometheus/templates/server-pvc.yaml
+++ b/incubator/prometheus/templates/server-pvc.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.server.persistentVolume.enabled }}
+{{- if .Values.server.persistentVolume.enabled -}}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
@@ -17,4 +17,4 @@ spec:
   resources:
     requests:
       storage: {{ .Values.server.persistentVolume.size | quote }}
-{{- end }}
+{{- end -}}
diff --git a/incubator/prometheus/values.yaml b/incubator/prometheus/values.yaml
index ce98608cf4..f26d0d2288 100644
--- a/incubator/prometheus/values.yaml
+++ b/incubator/prometheus/values.yaml
@@ -3,12 +3,16 @@ alertmanager:
   # httpPortName: http
   image: prom/alertmanager:v0.4.2
   ingress:
-    annotations:
-      kubernetes.io/ingress.class: nginx
-      kubernetes.io/tls-acme: 'true'
-    enabled: true
-    hostName: alertmanager.domain.com
-    tls: true
+    # annotations:
+    #   kubernetes.io/ingress.class: nginx
+    #   kubernetes.io/tls-acme: 'true'
+    enabled: false
+    # hosts:
+    #   - hostName: alertmanager.domain.com
+    # tls:
+    #   - secretName: prometheus-alerts-tls
+    #     hosts:
+    #       - alertmanager.domain.com
   ## Configure resource requests and limits
   ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
   ##
@@ -30,8 +34,8 @@ configmap_reload_image: jimmidyson/configmap-reload:v0.1
 # imagePullPolicy:
 
 server:
-  annotations:
-    iam.amazonaws.com/role: prometheus
+  # annotations:
+  #   iam.amazonaws.com/role: prometheus
   extra_args:
     - --storage.local.max-chunks-to-persist=524288
     - --storage.local.memory-chunks=1048576
@@ -41,20 +45,24 @@ server:
   # httpPortName: http
   image: prom/prometheus:v1.2.1
   ingress:
-    annotations:
-      kubernetes.io/ingress.class: nginx
-      kubernetes.io/tls-acme: 'true'
-    enabled: true
-    hostName: prometheus.domain.com
-    tls: true
+    # annotations:
+    #   kubernetes.io/ingress.class: nginx
+    #   kubernetes.io/tls-acme: 'true'
+    enabled: false
+    # hosts:
+    #   - hostName: prometheus.domain.com
+    # tls:
+    #   - secretName: prometheus-server-tls
+    #     hosts:
+    #       - prometheus.domain.com
   # Write data to a persistent volume
   persistentVolume:
-    accessModes:
-      - ReadWriteOnce
-    annotations:
-      volume.beta.kubernetes.io/storage-class: standard
-    enabled: true
-    size: 8Gi
+    # accessModes:
+    #   - ReadWriteOnce
+    # annotations:
+    #   volume.beta.kubernetes.io/storage-class: standard
+    enabled: false
+    # size: 8Gi
   ## Configure resource requests and limits
   ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
   ##