diff --git a/stable/grafana/Chart.yaml b/stable/grafana/Chart.yaml
index 2f29d86210..2ec2b83751 100644
--- a/stable/grafana/Chart.yaml
+++ b/stable/grafana/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: grafana
-version: 3.8.16
+version: 3.8.17
 appVersion: 6.3.5
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.
diff --git a/stable/grafana/README.md b/stable/grafana/README.md
index 46c33369b6..5298b46300 100644
--- a/stable/grafana/README.md
+++ b/stable/grafana/README.md
@@ -94,6 +94,7 @@ The command removes all the Kubernetes components associated with the chart and
 | `annotations`                             | Deployment annotations                        | `{}`                                                    |
 | `labels`                                  | Deployment labels                             | `{}`                                                    |
 | `podAnnotations`                          | Pod annotations                               | `{}`                                                    |
+| `podLabels`                               | Pod labels                                    | `{}`                                                    |
 | `podPortName`                             | Name of the grafana port on the pod           | `grafana`                                               |
 | `sidecar.image`                           | Sidecar image                                 | `kiwigrid/k8s-sidecar:0.1.20`                           |
 | `sidecar.imagePullPolicy`                 | Sidecar image pull policy                     | `IfNotPresent`                                          |
diff --git a/stable/grafana/templates/deployment.yaml b/stable/grafana/templates/deployment.yaml
index 3eb5761239..ce94d846e7 100644
--- a/stable/grafana/templates/deployment.yaml
+++ b/stable/grafana/templates/deployment.yaml
@@ -31,6 +31,9 @@ spec:
       labels:
         app: {{ template "grafana.name" . }}
         release: {{ .Release.Name }}
+{{- with .Values.podLabels }}
+{{ toYaml . | indent 8 }}
+{{- end }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
         checksum/dashboards-json-config: {{ include (print $.Template.BasePath "/dashboards-json-configmap.yaml") . | sha256sum }}
diff --git a/stable/grafana/values.yaml b/stable/grafana/values.yaml
index 8ce3f47e07..efe6453874 100644
--- a/stable/grafana/values.yaml
+++ b/stable/grafana/values.yaml
@@ -90,6 +90,9 @@ downloadDashboards:
 ## Pod Annotations
 # podAnnotations: {}
 
+## Pod Labels
+# podLabels: {}
+
 podPortName: grafana
 
 ## Deployment annotations