diff --git a/daemonset/kube-router-all-service-daemonset-advertise-routes.yaml b/daemonset/kube-router-all-service-daemonset-advertise-routes.yaml
index 9a71f16b..30d35cbd 100644
--- a/daemonset/kube-router-all-service-daemonset-advertise-routes.yaml
+++ b/daemonset/kube-router-all-service-daemonset-advertise-routes.yaml
@@ -4,18 +4,19 @@ metadata:
   name: kube-router
   namespace: kube-system
   labels:
-    app: kube-router
+    k8s-app: kube-router
 spec:
   template:
     metadata:
       labels:
-        name: kube-router
+        k8s-app: kube-router
+      annotations:
+        scheduler.alpha.kubernetes.io/critical-pod: ''
     spec:
-      hostNetwork: true
       containers:
       - name: kube-router
         image: cloudnativelabs/kube-router
-        args: 
+        args:
           - "--run-router=true"
           - "--run-firewall=true"
           - "--run-service-proxy=true"
@@ -39,6 +40,13 @@ spec:
             name: cni-conf-dir
           - mountPath: /var/lib/kube-router/kubeconfig
             name: kubeconfig
+      hostNetwork: true
+      tolerations:
+      - key: CriticalAddonsOnly
+        operator: Exists
+      - effect: NoSchedule
+        key: node-role.kubernetes.io/master
+        operator: Exists
       volumes:
         - name: lib-modules
           hostPath:
diff --git a/daemonset/kube-router-all-service-daemonset.yaml b/daemonset/kube-router-all-service-daemonset.yaml
index ad728f11..f7eb47ac 100644
--- a/daemonset/kube-router-all-service-daemonset.yaml
+++ b/daemonset/kube-router-all-service-daemonset.yaml
@@ -4,14 +4,15 @@ metadata:
   name: kube-router
   namespace: kube-system
   labels:
-    app: kube-router
+    k8s-app: kube-router
 spec:
   template:
     metadata:
       labels:
-        name: kube-router
+        k8s-app: kube-router
+      annotations:
+        scheduler.alpha.kubernetes.io/critical-pod: ''
     spec:
-      hostNetwork: true
       containers:
       - name: kube-router
         image: cloudnativelabs/kube-router
@@ -32,6 +33,13 @@ spec:
             name: cni-conf-dir
           - mountPath: /var/lib/kube-router/kubeconfig
             name: kubeconfig
+      hostNetwork: true
+      tolerations:
+      - key: CriticalAddonsOnly
+        operator: Exists
+      - effect: NoSchedule
+        key: node-role.kubernetes.io/master
+        operator: Exists
       volumes:
         - name: lib-modules
           hostPath:
diff --git a/daemonset/kube-router-firewall-daemonset.yaml b/daemonset/kube-router-firewall-daemonset.yaml
index 8ccc1072..bb3c11bf 100644
--- a/daemonset/kube-router-firewall-daemonset.yaml
+++ b/daemonset/kube-router-firewall-daemonset.yaml
@@ -4,14 +4,15 @@ metadata:
   name: kube-router
   namespace: kube-system
   labels:
-    app: kube-router
+    k8s-app: kube-router
 spec:
   template:
     metadata:
       labels:
-        name: kube-router
+        k8s-app: kube-router
+      annotations:
+        scheduler.alpha.kubernetes.io/critical-pod: ''
     spec:
-      hostNetwork: true
       containers:
       - name: kube-router
         image: cloudnativelabs/kube-router
@@ -32,6 +33,13 @@ spec:
             name: cni-conf-dir
           - mountPath: /var/lib/kube-router/kubeconfig
             name: kubeconfig
+      hostNetwork: true
+      tolerations:
+      - key: CriticalAddonsOnly
+        operator: Exists
+      - effect: NoSchedule
+        key: node-role.kubernetes.io/master
+        operator: Exists
       volumes:
         - name: lib-modules
           hostPath:
diff --git a/daemonset/kube-router-proxy--daemonset.yaml b/daemonset/kube-router-proxy-daemonset.yaml
similarity index 79%
rename from daemonset/kube-router-proxy--daemonset.yaml
rename to daemonset/kube-router-proxy-daemonset.yaml
index 19bb2519..7dd8a3cb 100644
--- a/daemonset/kube-router-proxy--daemonset.yaml
+++ b/daemonset/kube-router-proxy-daemonset.yaml
@@ -4,14 +4,15 @@ metadata:
   name: kube-router
   namespace: kube-system
   labels:
-    app: kube-router
+    k8s-app: kube-router
 spec:
   template:
     metadata:
       labels:
-        name: kube-router
+        k8s-app: kube-router
+      annotations:
+        scheduler.alpha.kubernetes.io/critical-pod: ''
     spec:
-      hostNetwork: true
       containers:
       - name: kube-router
         image: cloudnativelabs/kube-router
@@ -32,6 +33,13 @@ spec:
             name: cni-conf-dir
           - mountPath: /var/lib/kube-router/kubeconfig
             name: kubeconfig
+      hostNetwork: true
+      tolerations:
+      - key: CriticalAddonsOnly
+        operator: Exists
+      - effect: NoSchedule
+        key: node-role.kubernetes.io/master
+        operator: Exists
       volumes:
         - name: lib-modules
           hostPath: