diff --git a/files/dashboard-metrics-scraper-Deployment.yaml b/files/dashboard-metrics-scraper-Deployment.yaml
index f37529c..6943d06 100644
--- a/files/dashboard-metrics-scraper-Deployment.yaml
+++ b/files/dashboard-metrics-scraper-Deployment.yaml
@@ -21,7 +21,7 @@ spec:
     spec:
       containers:
         - name: dashboard-metrics-scraper
-          image: kubernetesui/metrics-scraper:v1.0.3
+          image: kubernetesui/metrics-scraper:v1.0.4
           ports:
             - containerPort: 8000
               protocol: TCP
@@ -42,7 +42,7 @@ spec:
             runAsGroup: 2001
       serviceAccountName: kubernetes-dashboard
       nodeSelector:
-        "beta.kubernetes.io/os": linux
+        "kubernetes.io/os": linux
       # Comment the following tolerations if Dashboard must not be deployed on master
       tolerations:
         - key: node-role.kubernetes.io/master
diff --git a/files/kubernetes-dashboard-Deployment.yaml b/files/kubernetes-dashboard-Deployment.yaml
index 01bb7f8..54b85f4 100644
--- a/files/kubernetes-dashboard-Deployment.yaml
+++ b/files/kubernetes-dashboard-Deployment.yaml
@@ -19,7 +19,7 @@ spec:
     spec:
       containers:
         - name: kubernetes-dashboard
-          image: kubernetesui/dashboard:v2.0.0-rc5
+          image: kubernetesui/dashboard:v2.0.0
           imagePullPolicy: Always
           ports:
             - containerPort: 8443
@@ -57,7 +57,7 @@ spec:
           emptyDir: {}
       serviceAccountName: kubernetes-dashboard
       nodeSelector:
-        "beta.kubernetes.io/os": linux
+        "kubernetes.io/os": linux
       # Comment the following tolerations if Dashboard must not be deployed on master
       tolerations:
         - key: node-role.kubernetes.io/master