diff --git a/agent-install/k8s/auto-upgrade-cronjob-template.yml b/agent-install/k8s/auto-upgrade-cronjob-template.yml
index 4451d27f2..2a94674f1 100644
--- a/agent-install/k8s/auto-upgrade-cronjob-template.yml
+++ b/agent-install/k8s/auto-upgrade-cronjob-template.yml
@@ -2,6 +2,10 @@ apiVersion: __KubernetesApi__
 kind: CronJob
 metadata:
   name: auto-upgrade-cronjob
+  labels:
+    app: agent
+    openhorizon.org/component: agent
+    type: auto-upgrade-cronjob
 spec:
   schedule: '*/1 * * * *'
   concurrencyPolicy: Forbid
@@ -11,6 +15,11 @@ spec:
     spec:
       backoffLimit: 0
       template:
+        metadata:
+          labels:
+            app: agent
+            openhorizon.org/component: agent
+            type: auto-upgrade-cronjob
         spec:
           affinity:
             podAffinity:
diff --git a/agent-install/k8s/deployment-template.yml b/agent-install/k8s/deployment-template.yml
index a597e11a4..928fee4b5 100644
--- a/agent-install/k8s/deployment-template.yml
+++ b/agent-install/k8s/deployment-template.yml
@@ -3,15 +3,20 @@ kind: Deployment
 metadata:
   name: agent
   namespace: __AgentNameSpace__
+  labels:
+    app: agent
+    openhorizon.org/component: agent
 spec:
   replicas: 1
   selector:
     matchLabels:
       app: agent
+      openhorizon.org/component: agent
   template:
     metadata:
       labels:
         app: agent
+        openhorizon.org/component: agent
     spec:
       affinity:
         podAffinity: