diff --git a/stable/grafana/Chart.yaml b/stable/grafana/Chart.yaml
index 38b0946d89..6594abaf9d 100755
--- a/stable/grafana/Chart.yaml
+++ b/stable/grafana/Chart.yaml
@@ -1,5 +1,5 @@
 name: grafana
-version: 0.6
+version: 0.6.1
 description: The leading tool for querying and visualizing time series and metrics.
 home: https://grafana.net
 icon: https://raw.githubusercontent.com/grafana/grafana/master/public/img/logo_transparent_400x.png
diff --git a/stable/grafana/README.md b/stable/grafana/README.md
index 71ee464e2d..2d52bb3afd 100644
--- a/stable/grafana/README.md
+++ b/stable/grafana/README.md
@@ -49,6 +49,7 @@ The command removes all the Kubernetes components associated with the chart and
 | `server.service.loadBalancerSourceRanges` | List of IP CIDRs allowed access     | null                                              |
 | `server.service.nodePort`                 | For service type "NodePort"         | null                                              |
 | `server.service.externalIPs`              | External IP addresses               | null                                              |
+| `server.service.clusterIP`                | Custom clusterIP to use for service | null                                         |
 | `server.service.type`                     | ClusterIP, NodePort, or LoadBalancer| ClusterIP                                         |
 | `server.setDatasource.enabled`            | Creates grafana datasource with job | false                                             |
 | `server.extraEnv`                          | Extra environment variables to set in the server container | {} |
diff --git a/stable/grafana/templates/svc.yaml b/stable/grafana/templates/svc.yaml
index 0fd36ebac8..c70312df85 100644
--- a/stable/grafana/templates/svc.yaml
+++ b/stable/grafana/templates/svc.yaml
@@ -18,7 +18,7 @@ spec:
       port: {{ .Values.server.service.httpPort }}
       protocol: TCP
       targetPort: 3000
-{{- if contains "NodePort" .Values.server.service.type }}
+{{- if eq "NodePort" .Values.server.service.type }}
   {{- if .Values.server.service.nodePort }}
       nodePort:  {{ .Values.server.service.nodePort }}
   {{- end }}
@@ -27,11 +27,16 @@ spec:
   externalIPs:
 {{ toYaml .Values.server.service.externalIPs | indent 4 }}
 {{- end }}
+{{- if eq "ClusterIP" .Values.server.service.type }}
+  {{- if .Values.server.service.clusterIP }}
+  clusterIP:  {{ .Values.server.service.clusterIP }}
+  {{- end }}
+{{- end }}  
   selector:
     app: {{ template "grafana.fullname" . }}
     component: "{{ .Values.server.name }}"
   type: "{{ .Values.server.service.type }}"
-{{- if contains "LoadBalancer" .Values.server.service.type }}
+{{- if eq "LoadBalancer" .Values.server.service.type }}
   {{- if .Values.server.service.loadBalancerIP }}
   loadBalancerIP: {{ .Values.server.service.loadBalancerIP }}
   {{- end -}}
diff --git a/stable/grafana/values.yaml b/stable/grafana/values.yaml
index 5feb969d47..e9000668a7 100644
--- a/stable/grafana/values.yaml
+++ b/stable/grafana/values.yaml
@@ -133,6 +133,9 @@ server:
     ##
     httpPort: 80
 
+    ## ClusterIP to use for service
+    ## clusterIP: None
+
     ## Load balancer IP address
     ## Is not required, but allows for static address with
     ## serviceType LoadBalancer.
@@ -161,6 +164,7 @@ server:
     # externalIPs:
     # - 192.168.0.1
 
+
   ## Grafana local config path
   ## Default '/etc/grafana'
   ##