diff --git a/addons/kubernetes-dashboard/v1.5.0.yaml b/addons/kubernetes-dashboard/v1.5.0.yaml
index 1b2ef5b18d..a069e6bad2 100644
--- a/addons/kubernetes-dashboard/v1.5.0.yaml
+++ b/addons/kubernetes-dashboard/v1.5.0.yaml
@@ -1,61 +1,42 @@
-# Copyright 2015 Google Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Configuration to deploy release version of the Dashboard UI.
-#
-# Example usage: kubectl create -f <this_file>
-
 kind: Deployment
 apiVersion: extensions/v1beta1
 metadata:
-  labels:
-    app: kubernetes-dashboard
   name: kubernetes-dashboard
   namespace: kube-system
+  labels:
+    k8s-addon: kubernetes-dashboard.addons.k8s.io
+    k8s-app: kubernetes-dashboard
+    version: v1.5.0
+    kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: kubernetes-dashboard
+      k8s-app: kubernetes-dashboard
   template:
     metadata:
       labels:
-        app: kubernetes-dashboard
-      # Comment the following annotation if Dashboard must not be deployed on master
+        k8s-addon: kubernetes-dashboard.addons.k8s.io
+        k8s-app: kubernetes-dashboard
+        version: v1.5.0
+        kubernetes.io/cluster-service: "true"
       annotations:
-        scheduler.alpha.kubernetes.io/tolerations: |
-          [
-            {
-              "key": "dedicated",
-              "operator": "Equal",
-              "value": "master",
-              "effect": "NoSchedule"
-            }
-          ]
+        scheduler.alpha.kubernetes.io/critical-pod: ''
+        scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
     spec:
       containers:
       - name: kubernetes-dashboard
         image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.5.0
-        imagePullPolicy: Always
+        resources:
+          # keep request = limit to keep this container in guaranteed class
+          limits:
+            cpu: 100m
+            memory: 50Mi
+          requests:
+            cpu: 100m
+            memory: 50Mi
         ports:
         - containerPort: 9090
-          protocol: TCP
-        args:
-          # Uncomment the following line to manually specify Kubernetes API server Host
-          # If not specified, Dashboard will attempt to auto discover the API server and connect
-          # to it. Uncomment only if the default does not work.
-          # - --apiserver-host=http://my-address:port
         livenessProbe:
           httpGet:
             path: /
@@ -63,17 +44,19 @@ spec:
           initialDelaySeconds: 30
           timeoutSeconds: 30
 ---
-kind: Service
+
 apiVersion: v1
+kind: Service
 metadata:
-  labels:
-    app: kubernetes-dashboard
   name: kubernetes-dashboard
   namespace: kube-system
+  labels:
+    k8s-addon: kubernetes-dashboard.addons.k8s.io
+    k8s-app: kubernetes-dashboard
+    kubernetes.io/cluster-service: "true"
 spec:
-  type: NodePort
+  selector:
+    k8s-app: kubernetes-dashboard
   ports:
   - port: 80
-    targetPort: 9090
-  selector:
-    app: kubernetes-dashboard
\ No newline at end of file
+    targetPort: 9090
\ No newline at end of file