diff --git a/http-add-on/templates/interceptor/deployment.yaml b/http-add-on/templates/interceptor/deployment.yaml
index c9b68736..becbb69a 100644
--- a/http-add-on/templates/interceptor/deployment.yaml
+++ b/http-add-on/templates/interceptor/deployment.yaml
@@ -3,6 +3,7 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/component: interceptor
+    app.kubernetes.io/name: http-add-on
     {{- include "keda-http-add-on.labels" . | indent 4 }}
   name: {{ .Chart.Name }}-interceptor
   namespace: {{ .Release.Namespace }}
@@ -10,11 +11,13 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/component: interceptor
+      app.kubernetes.io/name: http-add-on
       {{- include "keda-http-add-on.matchLabels" . | indent 6 }}
   template:
     metadata:
       labels:
         app.kubernetes.io/component: interceptor
+        app.kubernetes.io/name: http-add-on
         {{- include "keda-http-add-on.labels" . | indent 8 }}
     spec:
       imagePullSecrets: 
diff --git a/http-add-on/templates/interceptor/poddisruptionbudget.yaml b/http-add-on/templates/interceptor/poddisruptionbudget.yaml
index 43436c58..0164413e 100644
--- a/http-add-on/templates/interceptor/poddisruptionbudget.yaml
+++ b/http-add-on/templates/interceptor/poddisruptionbudget.yaml
@@ -4,6 +4,7 @@ kind: PodDisruptionBudget
 metadata:
   labels:
     app.kubernetes.io/component: interceptor
+    app.kubernetes.io/name: http-add-on
     {{- include "keda-http-add-on.labels" . | indent 4 }}
   name: {{ .Chart.Name }}-interceptor
   namespace: {{ .Release.Namespace }}
@@ -11,6 +12,7 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/component: interceptor
+      app.kubernetes.io/name: http-add-on
       {{- include "keda-http-add-on.matchLabels" . | indent 6 }}
   {{- if .Values.interceptor.pdb.minAvailable }}
   minAvailable: {{ .Values.interceptor.pdb.minAvailable }}
diff --git a/http-add-on/templates/interceptor/rbac.yml b/http-add-on/templates/interceptor/rbac.yml
index 85866a00..4855680c 100644
--- a/http-add-on/templates/interceptor/rbac.yml
+++ b/http-add-on/templates/interceptor/rbac.yml
@@ -2,6 +2,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
+    app.kubernetes.io/component: interceptor
+    app.kubernetes.io/name: http-add-on
     {{- include "keda-http-add-on.labels" . | indent 4 }}
   name: {{ .Chart.Name }}-interceptor
 rules:
@@ -38,7 +40,8 @@ metadata:
     keda.sh/addon: {{ .Chart.Name }}
     app: {{ .Chart.Name }}
     name: {{ .Chart.Name }}-interceptor
-    app.kubernetes.io/name: {{ .Chart.Name }}-interceptor
+    app.kubernetes.io/component: interceptor
+    app.kubernetes.io/name: http-add-on
     {{- include "keda-http-add-on.labels" . | indent 4 }}
   name: {{ .Chart.Name }}-interceptor
 roleRef:
diff --git a/http-add-on/templates/interceptor/scaledobject.yaml b/http-add-on/templates/interceptor/scaledobject.yaml
index a8c420ac..90a26666 100644
--- a/http-add-on/templates/interceptor/scaledobject.yaml
+++ b/http-add-on/templates/interceptor/scaledobject.yaml
@@ -4,7 +4,9 @@ kind: ScaledObject
 metadata:
   name: "{{ .Chart.Name }}-interceptor"
   namespace: {{ .Release.Namespace }}
-  labels:    
+  labels:
+    app.kubernetes.io/component: interceptor
+    app.kubernetes.io/name: http-add-on    
     {{- include "keda-http-add-on.labels" . | indent 4 }}
 spec:
   minReplicaCount: {{ .Values.interceptor.replicas.min }}
diff --git a/http-add-on/templates/interceptor/service-admin.yaml b/http-add-on/templates/interceptor/service-admin.yaml
index 0e33fcc6..46ae9cdd 100644
--- a/http-add-on/templates/interceptor/service-admin.yaml
+++ b/http-add-on/templates/interceptor/service-admin.yaml
@@ -2,7 +2,8 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:    
-    app.kubernetes.io/component: interceptor-admin
+    app.kubernetes.io/component: interceptor
+    app.kubernetes.io/name: http-add-on
     {{- include "keda-http-add-on.labels" . | indent 4 }}
   name: "{{ .Chart.Name }}-{{ .Values.interceptor.admin.service }}"
   namespace: {{ .Release.Namespace }}
@@ -13,4 +14,5 @@ spec:
     targetPort: admin
   selector:
     app.kubernetes.io/component: interceptor
+    app.kubernetes.io/name: http-add-on
     {{- include "keda-http-add-on.matchLabels" . | indent 4 }}
diff --git a/http-add-on/templates/interceptor/service-proxy.yaml b/http-add-on/templates/interceptor/service-proxy.yaml
index 45c68a3a..8e8a9d81 100644
--- a/http-add-on/templates/interceptor/service-proxy.yaml
+++ b/http-add-on/templates/interceptor/service-proxy.yaml
@@ -2,7 +2,8 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app.kubernetes.io/component: interceptor-proxy
+    app.kubernetes.io/component: interceptor
+    app.kubernetes.io/name: http-add-on
     {{- include "keda-http-add-on.labels" . | indent 4 }}
   name: "{{ .Chart.Name }}-{{ .Values.interceptor.proxy.service }}"
   namespace: {{ .Release.Namespace }}
@@ -18,4 +19,5 @@ spec:
   {{- end }}
   selector:
     app.kubernetes.io/component: interceptor
+    app.kubernetes.io/name: http-add-on
     {{- include "keda-http-add-on.matchLabels" . | indent 4 }}
diff --git a/http-add-on/templates/interceptor/serviceaccount.yaml b/http-add-on/templates/interceptor/serviceaccount.yaml
index 5a059875..e50315ec 100644
--- a/http-add-on/templates/interceptor/serviceaccount.yaml
+++ b/http-add-on/templates/interceptor/serviceaccount.yaml
@@ -3,6 +3,7 @@ kind: ServiceAccount
 metadata:
   labels:
     app.kubernetes.io/component: interceptor
+    app.kubernetes.io/name: http-add-on
     {{- include "keda-http-add-on.labels" . | indent 4 }}
   name: {{ .Chart.Name }}-interceptor
   namespace: {{ .Release.Namespace }}
diff --git a/http-add-on/templates/operator/deployment.yaml b/http-add-on/templates/operator/deployment.yaml
index e7aa3dcc..9dfece46 100644
--- a/http-add-on/templates/operator/deployment.yaml
+++ b/http-add-on/templates/operator/deployment.yaml
@@ -4,6 +4,7 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/component: operator
+    app.kubernetes.io/name: http-add-on
     {{- include "keda-http-add-on.labels" . | indent 4 }}
   name: {{ .Chart.Name }}-controller-manager
   namespace: {{ .Release.Namespace }}
@@ -12,11 +13,13 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/component: operator
+      app.kubernetes.io/name: http-add-on
       {{- include "keda-http-add-on.matchLabels" . | indent 6 }}
   template:
     metadata:
       labels:
         app.kubernetes.io/component: operator
+        app.kubernetes.io/name: http-add-on
         {{- include "keda-http-add-on.labels" . | indent 8 }}
     spec:
       imagePullSecrets: 
diff --git a/http-add-on/templates/operator/rbac.yml b/http-add-on/templates/operator/rbac.yml
index b5a738dd..715e6d57 100644
--- a/http-add-on/templates/operator/rbac.yml
+++ b/http-add-on/templates/operator/rbac.yml
@@ -3,6 +3,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   labels:
+    app.kubernetes.io/component: operator
+    app.kubernetes.io/name: http-add-on
     {{- include "keda-http-add-on.labels" . | indent 4 }}
   name: {{ .Chart.Name }}-role
   namespace: {{ .Release.Namespace }}
@@ -35,7 +37,8 @@ metadata:
     keda.sh/addon: {{ .Chart.Name }}
     app: {{ .Chart.Name }}
     name: {{ .Chart.Name }}-role
-    app.kubernetes.io/name: {{ .Chart.Name }}-role
+    app.kubernetes.io/component: operator
+    app.kubernetes.io/name: http-add-on
     {{- include "keda-http-add-on.labels" . | indent 4 }}
   name: {{ .Chart.Name }}-role
 rules:
@@ -86,7 +89,8 @@ metadata:
     keda.sh/addon: {{ .Chart.Name }}
     app: {{ .Chart.Name }}
     name: {{ .Chart.Name }}-proxy-role
-    app.kubernetes.io/name: {{ .Chart.Name }}-proxy-role
+    app.kubernetes.io/component: operator
+    app.kubernetes.io/name: http-add-on
     {{- include "keda-http-add-on.labels" . | indent 4 }}
   name: {{ .Chart.Name }}-proxy-role
 rules:
@@ -107,7 +111,8 @@ metadata:
     keda.sh/addon: {{ .Chart.Name }}
     app: {{ .Chart.Name }}
     name: {{ .Chart.Name }}-metrics-reader
-    app.kubernetes.io/name: {{ .Chart.Name }}-metrics-reader
+    app.kubernetes.io/component: operator
+    app.kubernetes.io/name: http-add-on
     {{- include "keda-http-add-on.labels" . | indent 4 }}
   name: {{ .Chart.Name }}-metrics-reader
 rules:
@@ -124,7 +129,8 @@ metadata:
     keda.sh/addon: {{ .Chart.Name }}
     app: {{ .Chart.Name }}
     name: {{ .Chart.Name }}-role-binding
-    app.kubernetes.io/name: {{ .Chart.Name }}-role-binding
+    app.kubernetes.io/component: operator
+    app.kubernetes.io/name: http-add-on
     {{- include "keda-http-add-on.labels" . | indent 4 }}
   name: {{ .Chart.Name }}-role-rolebinding
   namespace: {{ .Release.Namespace }}
@@ -145,7 +151,8 @@ metadata:
     keda.sh/addon: {{ .Chart.Name }}
     app: {{ .Chart.Name }}
     name: {{ .Chart.Name }}-rolebinding
-    app.kubernetes.io/name: {{ .Chart.Name }}-rolebinding
+    app.kubernetes.io/component: operator
+    app.kubernetes.io/name: http-add-on
     {{- include "keda-http-add-on.labels" . | indent 4 }}
   name: {{ .Chart.Name }}-rolebinding
 roleRef:
@@ -165,7 +172,8 @@ metadata:
     keda.sh/addon: {{ .Chart.Name }}
     app: {{ .Chart.Name }}
     name: {{ .Chart.Name }}-rolebinding
-    app.kubernetes.io/name: {{ .Chart.Name }}-rolebinding
+    app.kubernetes.io/component: operator
+    app.kubernetes.io/name: http-add-on
     {{- include "keda-http-add-on.labels" . | indent 4 }}
   name: {{ .Chart.Name }}-proxy-rolebinding
 roleRef:
diff --git a/http-add-on/templates/operator/service.yaml b/http-add-on/templates/operator/service.yaml
index 7d9ec340..34263fbb 100644
--- a/http-add-on/templates/operator/service.yaml
+++ b/http-add-on/templates/operator/service.yaml
@@ -4,6 +4,7 @@ kind: Service
 metadata:
   labels:
     app.kubernetes.io/component: operator
+    app.kubernetes.io/name: http-add-on
     {{- include "keda-http-add-on.labels" . | indent 4 }}
   name: {{ .Chart.Name }}-controller-manager-metrics-service
   namespace: {{ .Release.Namespace }}
@@ -14,5 +15,6 @@ spec:
     targetPort: metrics
   selector:
     app.kubernetes.io/component: operator
+    app.kubernetes.io/name: http-add-on
     {{- include "keda-http-add-on.matchLabels" . | indent 4 }}
 {{- end }}
diff --git a/http-add-on/templates/operator/serviceaccount.yaml b/http-add-on/templates/operator/serviceaccount.yaml
index 4282bd95..4de37229 100644
--- a/http-add-on/templates/operator/serviceaccount.yaml
+++ b/http-add-on/templates/operator/serviceaccount.yaml
@@ -4,6 +4,7 @@ kind: ServiceAccount
 metadata:
   labels:
     app.kubernetes.io/component: operator
+    app.kubernetes.io/name: http-add-on
     {{- include "keda-http-add-on.labels" . | indent 4 }}
   name: {{ .Chart.Name }}
   namespace: {{ .Release.Namespace }}
diff --git a/http-add-on/templates/rbac-aggregateclusterroles.yaml b/http-add-on/templates/rbac-aggregateclusterroles.yaml
index d366e8a3..9453d126 100644
--- a/http-add-on/templates/rbac-aggregateclusterroles.yaml
+++ b/http-add-on/templates/rbac-aggregateclusterroles.yaml
@@ -5,6 +5,7 @@ kind: ClusterRole
 metadata:
   name: {{ .Chart.Name }}-edit
   labels:
+    app.kubernetes.io/name: http-add-on
     {{- include "keda-http-add-on.labels" . | indent 4 }}
     rbac.authorization.k8s.io/aggregate-to-admin: "true"
     rbac.authorization.k8s.io/aggregate-to-edit: "true"
@@ -27,6 +28,7 @@ kind: ClusterRole
 metadata:
   name: {{ .Chart.Name }}-view
   labels:
+    app.kubernetes.io/name: http-add-on
     rbac.authorization.k8s.io/aggregate-to-admin: "true"
     rbac.authorization.k8s.io/aggregate-to-edit: "true"
     rbac.authorization.k8s.io/aggregate-to-view: "true"
diff --git a/http-add-on/templates/scaler/deployment.yaml b/http-add-on/templates/scaler/deployment.yaml
index 827b969f..6bded056 100644
--- a/http-add-on/templates/scaler/deployment.yaml
+++ b/http-add-on/templates/scaler/deployment.yaml
@@ -3,6 +3,7 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/component: scaler
+    app.kubernetes.io/name: http-add-on
     {{- include "keda-http-add-on.labels" . | indent 4 }}
   name: {{ .Chart.Name }}-external-scaler
   namespace: {{ .Release.Namespace }}
@@ -11,11 +12,13 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/component: scaler
+      app.kubernetes.io/name: http-add-on
       {{- include "keda-http-add-on.matchLabels" . | indent 6 }}
   template:
     metadata:
       labels:
         app.kubernetes.io/component: scaler
+        app.kubernetes.io/name: http-add-on
         {{- include "keda-http-add-on.labels" . | indent 8 }}
     spec:
       imagePullSecrets: 
diff --git a/http-add-on/templates/scaler/rbac.yml b/http-add-on/templates/scaler/rbac.yml
index 077f9dfa..eeeedadf 100644
--- a/http-add-on/templates/scaler/rbac.yml
+++ b/http-add-on/templates/scaler/rbac.yml
@@ -2,6 +2,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
+    app.kubernetes.io/component: scaler
+    app.kubernetes.io/name: http-add-on
     {{- include "keda-http-add-on.labels" . | indent 4 }}
   name: {{ .Chart.Name }}-external-scaler
 rules:
@@ -30,7 +32,8 @@ metadata:
     keda.sh/addon: {{ .Chart.Name }}
     app: {{ .Chart.Name }}
     name: {{ .Chart.Name }}-external-scaler
-    app.kubernetes.io/name: {{ .Chart.Name }}-external-scaler
+    app.kubernetes.io/component: scaler
+    app.kubernetes.io/name: http-add-on
     {{- include "keda-http-add-on.labels" . | indent 4 }}
   name: {{ .Chart.Name }}-external-scaler
 roleRef:
diff --git a/http-add-on/templates/scaler/service.yaml b/http-add-on/templates/scaler/service.yaml
index 98e3a205..40213b0d 100644
--- a/http-add-on/templates/scaler/service.yaml
+++ b/http-add-on/templates/scaler/service.yaml
@@ -3,6 +3,7 @@ kind: Service
 metadata:
   labels:
     app.kubernetes.io/component: scaler
+    app.kubernetes.io/name: http-add-on
     {{- include "keda-http-add-on.labels" . | indent 4 }}
   name: "{{ .Chart.Name }}-{{ .Values.scaler.service }}"
   namespace: {{ .Release.Namespace }}
@@ -13,4 +14,5 @@ spec:
     targetPort: grpc
   selector:
     app.kubernetes.io/component: scaler
+    app.kubernetes.io/name: http-add-on
     {{- include "keda-http-add-on.matchLabels" . | indent 4 }}
diff --git a/http-add-on/templates/scaler/serviceaccount.yaml b/http-add-on/templates/scaler/serviceaccount.yaml
index 9389d0a6..63427648 100644
--- a/http-add-on/templates/scaler/serviceaccount.yaml
+++ b/http-add-on/templates/scaler/serviceaccount.yaml
@@ -3,6 +3,7 @@ kind: ServiceAccount
 metadata:
   labels:
     app.kubernetes.io/component: scaler
+    app.kubernetes.io/name: http-add-on
     {{- include "keda-http-add-on.labels" . | indent 4 }}
   name: {{ .Chart.Name }}-external-scaler
   namespace: {{ .Release.Namespace }}