diff --git a/stable/metrics-server/Chart.yaml b/stable/metrics-server/Chart.yaml
index a4816df2e7..571d5ad5d4 100755
--- a/stable/metrics-server/Chart.yaml
+++ b/stable/metrics-server/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 0.3.1
 description: Metrics Server is a cluster-wide aggregator of resource usage data.
 name: metrics-server
-version: 2.4.0
+version: 2.5.0
 keywords:
 - metrics-server
 home: https://github.com/kubernetes-incubator/metrics-server
diff --git a/stable/metrics-server/README.md b/stable/metrics-server/README.md
index 0471a3deec..8fb270f0e5 100644
--- a/stable/metrics-server/README.md
+++ b/stable/metrics-server/README.md
@@ -1,6 +1,6 @@
 # metrics-server
 
-Metrics Server is a cluster-wide aggregator of resource usage data.
+[Metrics Server](https://github.com/kubernetes-incubator/metrics-server) is a cluster-wide aggregator of resource usage data.
 
 ## Configuration
 
@@ -23,3 +23,5 @@ Parameter | Description | Default
 `replicas` | Number of replicas | `1`
 `extraVolumeMounts` | Ability to provide volume mounts to the pod | `[]`
 `extraVolumes` | Ability to provide volumes to the pod | `[]`
+`podAnnotations` | annotations to be added to pods | `{}`
+`priorityClassName` | priorityClassName to be added to pods | `""`
diff --git a/stable/metrics-server/templates/metrics-server-deployment.yaml b/stable/metrics-server/templates/metrics-server-deployment.yaml
index 62159c5407..10f7a832ba 100644
--- a/stable/metrics-server/templates/metrics-server-deployment.yaml
+++ b/stable/metrics-server/templates/metrics-server-deployment.yaml
@@ -18,11 +18,20 @@ spec:
       labels:
         app: {{ template "metrics-server.name" . }}
         release: {{ .Release.Name }}
+      {{- with .Values.podAnnotations }}
+      annotations:
+      {{- range $key, $value := . }}
+        {{ $key }}: {{ $value | quote }}
+      {{- end }}
+      {{- end }}
     spec:
+{{- if .Values.priorityClassName }}
+      priorityClassName: "{{ .Values.priorityClassName }}"
+{{- end }}
       serviceAccountName: {{ template "metrics-server.serviceAccountName" . }}
-{{ if .Values.hostNetwork.enabled }}
+{{- if .Values.hostNetwork.enabled }}
       hostNetwork: true
-{{ end }}
+{{- end }}
       containers:
         - name: metrics-server
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
@@ -35,7 +44,7 @@ spec:
 {{- if .Values.extraVolumeMounts }}
           volumeMounts:
 {{ toYaml .Values.extraVolumeMounts | indent 12}}
-  {{- end }}
+{{- end }}
         {{- with .Values.resources }}
           resources:
 {{ toYaml . | indent 12 }}
@@ -52,7 +61,7 @@ spec:
       tolerations:
 {{ toYaml . | indent 8 }}
     {{- end }}
-  {{- if .Values.extraVolumes }}
+{{- if .Values.extraVolumes }}
       volumes:
-  {{ toYaml .Values.extraVolumes | indent 8}}
-  {{- end }}
+{{ toYaml .Values.extraVolumes | indent 8}}
+{{- end }}
diff --git a/stable/metrics-server/values.yaml b/stable/metrics-server/values.yaml
index 5fc42aec92..4b8912c97a 100644
--- a/stable/metrics-server/values.yaml
+++ b/stable/metrics-server/values.yaml
@@ -46,6 +46,11 @@ affinity: {}
 
 replicas: 1
 
+podAnnotations: {}
+#  scheduler.alpha.kubernetes.io/critical-pod: ''
+
+# priorityClassName: system-node-critical
+
 extraVolumeMounts: []
 #  - name: secrets
 #    mountPath: /etc/kubernetes/secrets