diff --git a/cluster/addons/fluentd-gcp/event-exporter.yaml b/cluster/addons/fluentd-gcp/event-exporter.yaml
index a1a2f5a3e2..600784b261 100644
--- a/cluster/addons/fluentd-gcp/event-exporter.yaml
+++ b/cluster/addons/fluentd-gcp/event-exporter.yaml
@@ -38,6 +38,10 @@ metadata:
     addonmanager.kubernetes.io/mode: Reconcile
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      k8s-app: event-exporter
+      version: v0.2.3
   template:
     metadata:
       labels:
diff --git a/cluster/addons/ip-masq-agent/ip-masq-agent.yaml b/cluster/addons/ip-masq-agent/ip-masq-agent.yaml
index 4f930d7a6b..2c3d81c380 100644
--- a/cluster/addons/ip-masq-agent/ip-masq-agent.yaml
+++ b/cluster/addons/ip-masq-agent/ip-masq-agent.yaml
@@ -19,8 +19,7 @@ metadata:
 spec:
   selector:
     matchLabels:
-      labels:
-        k8s-app: ip-masq-agent
+      k8s-app: ip-masq-agent
   template:
     metadata:
       labels:
diff --git a/cluster/addons/prometheus/node-exporter-ds.yml b/cluster/addons/prometheus/node-exporter-ds.yml
index 2cac475fdb..0635357e78 100644
--- a/cluster/addons/prometheus/node-exporter-ds.yml
+++ b/cluster/addons/prometheus/node-exporter-ds.yml
@@ -9,6 +9,10 @@ metadata:
     addonmanager.kubernetes.io/mode: Reconcile
     version: v0.15.2
 spec:
+  selector:
+    matchLabels:
+      k8s-app: node-exporter 
+      version: v0.15.2
   updateStrategy:
     type: OnDelete
   template: