diff --git a/protokube/templates/etcd/manifest.template b/protokube/templates/etcd/manifest.template
index a22491984e..6299ad0cc3 100644
--- a/protokube/templates/etcd/manifest.template
+++ b/protokube/templates/etcd/manifest.template
@@ -4,6 +4,8 @@ kind: Pod
 metadata:
   name: {{ .PodName }}
   namespace: kube-system
+  labels:
+    k8s-app: {{ .PodName }}
 spec:
   hostNetwork: true
   containers:
diff --git a/upup/models/nodeup/_kubernetes_master/etcd/_not_protokube/etc/kubernetes/manifests/etcd-events.manifest b/upup/models/nodeup/_kubernetes_master/etcd/_not_protokube/etc/kubernetes/manifests/etcd-events.manifest
index a9677f6c02..be5bb0c486 100644
--- a/upup/models/nodeup/_kubernetes_master/etcd/_not_protokube/etc/kubernetes/manifests/etcd-events.manifest
+++ b/upup/models/nodeup/_kubernetes_master/etcd/_not_protokube/etc/kubernetes/manifests/etcd-events.manifest
@@ -3,7 +3,10 @@
 "kind": "Pod",
 "metadata": {
   "name":"etcd-server-events",
-  "namespace": "kube-system"
+  "namespace": "kube-system",
+  "labels": {
+    "k8s-app" : "etcd-server-events"
+  }
 },
 "spec":{
 "hostNetwork": true,
@@ -62,4 +65,4 @@
         "path": "/var/log/etcd-events.log"}
   }
 ]
-}}
\ No newline at end of file
+}}
diff --git a/upup/models/nodeup/_kubernetes_master/etcd/_not_protokube/etc/kubernetes/manifests/etcd.manifest b/upup/models/nodeup/_kubernetes_master/etcd/_not_protokube/etc/kubernetes/manifests/etcd.manifest
index 541acc9eaa..91519208e8 100644
--- a/upup/models/nodeup/_kubernetes_master/etcd/_not_protokube/etc/kubernetes/manifests/etcd.manifest
+++ b/upup/models/nodeup/_kubernetes_master/etcd/_not_protokube/etc/kubernetes/manifests/etcd.manifest
@@ -3,7 +3,10 @@
 "kind": "Pod",
 "metadata": {
   "name":"etcd-server",
-  "namespace": "kube-system"
+  "namespace": "kube-system",
+  "labels": {
+    "k8s-app" : "etcd-server"
+  }
 },
 "spec":{
 "hostNetwork": true,
@@ -62,4 +65,4 @@
         "path": "/var/log/etcd.log"}
   }
 ]
-}}
\ No newline at end of file
+}}
diff --git a/upup/models/nodeup/_kubernetes_master/kube-apiserver/files/etc/kubernetes/manifests/kube-apiserver.manifest.template b/upup/models/nodeup/_kubernetes_master/kube-apiserver/files/etc/kubernetes/manifests/kube-apiserver.manifest.template
index 6217d49c1f..ba3c462211 100644
--- a/upup/models/nodeup/_kubernetes_master/kube-apiserver/files/etc/kubernetes/manifests/kube-apiserver.manifest.template
+++ b/upup/models/nodeup/_kubernetes_master/kube-apiserver/files/etc/kubernetes/manifests/kube-apiserver.manifest.template
@@ -8,6 +8,8 @@ metadata:
     dns.alpha.kubernetes.io/internal: {{ .MasterInternalName }}
   name: kube-apiserver
   namespace: kube-system
+  labels:
+    k8s-app: kube-apiserver
 spec:
   hostNetwork: true
   containers:
diff --git a/upup/models/nodeup/_kubernetes_master/kube-controller-manager/files/etc/kubernetes/manifests/kube-controller-manager.template b/upup/models/nodeup/_kubernetes_master/kube-controller-manager/files/etc/kubernetes/manifests/kube-controller-manager.template
index 3179d101bf..43c167cb6a 100644
--- a/upup/models/nodeup/_kubernetes_master/kube-controller-manager/files/etc/kubernetes/manifests/kube-controller-manager.template
+++ b/upup/models/nodeup/_kubernetes_master/kube-controller-manager/files/etc/kubernetes/manifests/kube-controller-manager.template
@@ -3,7 +3,10 @@
 "kind": "Pod",
 "metadata": {
   "name":"kube-controller-manager",
-  "namespace": "kube-system"
+  "namespace": "kube-system",
+  "labels": {
+    "k8s-app" : "kube-controller-manager"
+  }
 },
 "spec":{
 "hostNetwork": true,
@@ -88,4 +91,4 @@
         "path": "/etc/pki/ca-trust"}
   }
 ]
-}}
\ No newline at end of file
+}}
diff --git a/upup/models/nodeup/_kubernetes_master/kube-scheduler/files/etc/kubernetes/manifests/kube-scheduler.template b/upup/models/nodeup/_kubernetes_master/kube-scheduler/files/etc/kubernetes/manifests/kube-scheduler.template
index b7234cfd6b..f945af4c6c 100644
--- a/upup/models/nodeup/_kubernetes_master/kube-scheduler/files/etc/kubernetes/manifests/kube-scheduler.template
+++ b/upup/models/nodeup/_kubernetes_master/kube-scheduler/files/etc/kubernetes/manifests/kube-scheduler.template
@@ -3,7 +3,10 @@
 "kind": "Pod",
 "metadata": {
   "name":"kube-scheduler",
-  "namespace": "kube-system"
+  "namespace": "kube-system",
+  "labels": {
+    "k8s-app" : "kube-scheduler"
+  }
 },
 "spec":{
 "hostNetwork": true,
@@ -45,4 +48,4 @@
         "path": "/var/log/kube-scheduler.log"}
   }
 ]
-}}
\ No newline at end of file
+}}
diff --git a/vendor/k8s.io/kubernetes/cluster/saltbase/salt/etcd/etcd.manifest b/vendor/k8s.io/kubernetes/cluster/saltbase/salt/etcd/etcd.manifest
index ced139e64c..a367811f1b 100644
--- a/vendor/k8s.io/kubernetes/cluster/saltbase/salt/etcd/etcd.manifest
+++ b/vendor/k8s.io/kubernetes/cluster/saltbase/salt/etcd/etcd.manifest
@@ -32,7 +32,10 @@
 "kind": "Pod",
 "metadata": {
   "name":"etcd-server{{ suffix }}",
-  "namespace": "kube-system"
+  "namespace": "kube-system",
+  "labels": {
+    "k8s-app" : "etcd-server{{ suffix }}"
+  }
 },
 "spec":{
 "hostNetwork": true,