diff --git a/charts/keep/Chart.yaml b/charts/keep/Chart.yaml
index 3a23322..2cb495b 100644
--- a/charts/keep/Chart.yaml
+++ b/charts/keep/Chart.yaml
@@ -1,10 +1,10 @@
 apiVersion: v2
 name: keep
-version: 0.1.47
+version: 0.1.51
 description: Keep Helm Chart
 type: application
 icon: https://platform.keephq.dev/_next/image?url=%2Fkeep.png&w=48&q=75
-appVersion: 0.31.7
+appVersion: 0.32.2
 deprecated: false
 annotations:
   app: keep
diff --git a/charts/keep/README.md b/charts/keep/README.md
index 4105720..47bc607 100644
--- a/charts/keep/README.md
+++ b/charts/keep/README.md
@@ -1,6 +1,6 @@
 # keep
 
-![Version: 0.1.45](https://img.shields.io/badge/Version-0.1.45-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.30.7](https://img.shields.io/badge/AppVersion-0.30.7-informational?style=flat-square)
+![Version: 0.1.50](https://img.shields.io/badge/Version-0.1.50-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.32.1](https://img.shields.io/badge/AppVersion-0.32.1-informational?style=flat-square)
 
 Keep Helm Chart
 
@@ -21,6 +21,7 @@ Keep Helm Chart
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
+| additionalLabels | object | `{}` |  |
 | backend.affinity | object | `{}` |  |
 | backend.autoscaling.enabled | bool | `false` |  |
 | backend.autoscaling.maxReplicas | int | `3` |  |
diff --git a/charts/keep/templates/_helpers.tpl b/charts/keep/templates/_helpers.tpl
index 6fa0edb..fa2b4f7 100644
--- a/charts/keep/templates/_helpers.tpl
+++ b/charts/keep/templates/_helpers.tpl
@@ -40,6 +40,10 @@ helm.sh/chart: {{ include "keep.chart" . }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/part-of: keep
+{{- if .Values.additionalLabels }}
+{{ toYaml .Values.additionalLabels }}
+{{- end }}
 {{- end }}
 
 {{/*
@@ -186,4 +190,4 @@ Helper function for KEEP_API_URL that handles both relative and absolute URLs
 {{- else -}}
     {{- include "keep.fullUrl" . -}}{{- $apiUrlClient -}}
 {{- end -}}
-{{- end -}}
\ No newline at end of file
+{{- end -}}
diff --git a/charts/keep/templates/backend-hpa.yaml b/charts/keep/templates/backend-hpa.yaml
index 4e3b8da..51ac053 100644
--- a/charts/keep/templates/backend-hpa.yaml
+++ b/charts/keep/templates/backend-hpa.yaml
@@ -5,6 +5,7 @@ metadata:
   name: {{ include "keep.fullname" . }}-backend
   labels:
     {{- include "keep.labels" . | nindent 4 }}
+    app.kubernetes.io/component: backend
 spec:
   scaleTargetRef:
     apiVersion: apps/v1
diff --git a/charts/keep/templates/backend-route.yaml b/charts/keep/templates/backend-route.yaml
index 682f8e8..1d5ceb5 100644
--- a/charts/keep/templates/backend-route.yaml
+++ b/charts/keep/templates/backend-route.yaml
@@ -4,16 +4,18 @@ apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
   name: {{ $fullName }}
-  labels: {{- include "keep.labels" . | nindent 4 }}
+  labels:
+    {{- include "keep.labels" . | nindent 4 }}
+    app.kubernetes.io/component: backend
 spec:
   host: {{ .Values.backend.route.host }}
   to:
     kind: Service
     name: {{ $fullName }}-backend
     weight: 100
-  port: 
+  port:
     targetPort: {{ .Values.backend.service.port }}
   wildcardPolicy: {{ .Values.backend.route.wildcardPolicy }}
-  tls: 
-  {{ toYaml .Values.backend.route.tls | indent 4 }} 
+  tls:
+  {{ toYaml .Values.backend.route.tls | indent 4 }}
 {{- end}}
diff --git a/charts/keep/templates/backend-service.yaml b/charts/keep/templates/backend-service.yaml
index 7c7cac3..40380b0 100644
--- a/charts/keep/templates/backend-service.yaml
+++ b/charts/keep/templates/backend-service.yaml
@@ -5,7 +5,8 @@ metadata:
   name: {{ include "keep.fullname" . }}-backend
   labels:
     {{- include "keep.labels" . | nindent 4 }}
-    keep-component: backend-service
+    app.kubernetes.io/component: backend
+    keep-component: backend
   annotations:
     {{- if .Values.isGKE }}
     cloud.google.com/backend-config: '{"default": "{{ include "keep.fullname" . }}-backend-backendconfig"}'
diff --git a/charts/keep/templates/backend.yaml b/charts/keep/templates/backend.yaml
index 189d067..ee4194d 100644
--- a/charts/keep/templates/backend.yaml
+++ b/charts/keep/templates/backend.yaml
@@ -5,6 +5,7 @@ metadata:
   name: {{ include "keep.fullname" . }}-backend
   labels:
     {{- include "keep.labels" . | nindent 4 }}
+    app.kubernetes.io/component: backend
     keep-component: backend
 spec:
   {{- if not .Values.backend.autoscaling.enabled }}
@@ -27,7 +28,8 @@ spec:
         {{- end }}
       {{- end }}
       labels:
-        {{- include "keep.selectorLabels" . | nindent 8 }}
+        {{- include "keep.labels" . | nindent 8 }}
+        app.kubernetes.io/component: backend
         keep-component: backend
     spec:
       {{- with .Values.backend.imagePullSecrets }}
diff --git a/charts/keep/templates/db-pv.yaml b/charts/keep/templates/db-pv.yaml
index 151d704..bc51200 100644
--- a/charts/keep/templates/db-pv.yaml
+++ b/charts/keep/templates/db-pv.yaml
@@ -2,6 +2,9 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
+  labels:
+    {{- include "keep.labels" . | nindent 4 }}
+    app.kubernetes.io/component: database
   name: {{ include "keep.fullname" . }}-pv
 spec:
   capacity:
diff --git a/charts/keep/templates/db-pvc.yaml b/charts/keep/templates/db-pvc.yaml
index dc567ca..8e20f7f 100644
--- a/charts/keep/templates/db-pvc.yaml
+++ b/charts/keep/templates/db-pvc.yaml
@@ -10,6 +10,9 @@ metadata:
     {{- if .Values.database.pvc.retain }}
     helm.sh/resource-policy: keep
     {{- end }}
+  labels:
+    {{- include "keep.labels" . | nindent 4 }}
+    app.kubernetes.io/component: database
 spec:
   {{- if $existingPvc }}
   # Use existing PVC spec
@@ -25,4 +28,4 @@ spec:
     requests:
       storage: {{ .Values.database.pvc.size }}
   {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/charts/keep/templates/db-service.yaml b/charts/keep/templates/db-service.yaml
index bad6d8f..564e048 100644
--- a/charts/keep/templates/db-service.yaml
+++ b/charts/keep/templates/db-service.yaml
@@ -5,7 +5,8 @@ metadata:
   name: {{ include "keep.name" . }}-database
   labels:
     {{- include "keep.labels" . | nindent 4 }}
-    keep-component: database-service
+    app.kubernetes.io/component: database
+    keep-component: database
 spec:
   type: {{ .Values.database.service.type }}
   ports:
diff --git a/charts/keep/templates/db.yaml b/charts/keep/templates/db.yaml
index 2c7748a..31d2ae6 100644
--- a/charts/keep/templates/db.yaml
+++ b/charts/keep/templates/db.yaml
@@ -5,6 +5,7 @@ metadata:
   name: {{ include "keep.fullname" . }}-database
   labels:
     {{- include "keep.labels" . | nindent 4 }}
+    app.kubernetes.io/component: database
     keep-component: database
 spec:
   {{- if not .Values.database.autoscaling.enabled }}
@@ -21,7 +22,8 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "keep.selectorLabels" . | nindent 8 }}
+        {{- include "keep.labels" . | nindent 8 }}
+        app.kubernetes.io/component: database
         keep-component: database
     spec:
       {{- with .Values.database.imagePullSecrets }}
diff --git a/charts/keep/templates/delete-secret-job.yaml b/charts/keep/templates/delete-secret-job.yaml
index 9de20b7..a6340a0 100644
--- a/charts/keep/templates/delete-secret-job.yaml
+++ b/charts/keep/templates/delete-secret-job.yaml
@@ -5,6 +5,9 @@ metadata:
   annotations:
     "helm.sh/hook": pre-delete
     "helm.sh/hook-delete-policy": hook-succeeded,hook-failed
+  labels:
+    {{- include "keep.labels" . | nindent 4 }}
+    app.kubernetes.io/component: secrets
 spec:
   template:
     spec:
diff --git a/charts/keep/templates/frontend-hpa.yaml b/charts/keep/templates/frontend-hpa.yaml
index 52cdb06..9abc611 100644
--- a/charts/keep/templates/frontend-hpa.yaml
+++ b/charts/keep/templates/frontend-hpa.yaml
@@ -5,6 +5,7 @@ metadata:
   name: {{ include "keep.fullname" . }}-frontend
   labels:
     {{- include "keep.labels" . | nindent 4 }}
+    app.kubernetes.io/component: frontend
 spec:
   scaleTargetRef:
     apiVersion: apps/v1
diff --git a/charts/keep/templates/frontend-route.yaml b/charts/keep/templates/frontend-route.yaml
index 23e986e..a384dba 100644
--- a/charts/keep/templates/frontend-route.yaml
+++ b/charts/keep/templates/frontend-route.yaml
@@ -4,16 +4,18 @@ apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
   name: {{ $fullName }}
-  labels: {{- include "keep.labels" . | nindent 4 }}
+  labels:
+    {{- include "keep.labels" . | nindent 4 }}
+    app.kubernetes.io/component: frontend
 spec:
   host: {{ .Values.frontend.route.host }}
   to:
     kind: Service
     name: {{ $fullName }}-frontend
     weight: 100
-  port: 
+  port:
     targetPort: {{ .Values.frontend.service.port }}
   wildcardPolicy: {{ .Values.frontend.route.wildcardPolicy }}
-  tls: 
-  {{ toYaml .Values.frontend.route.tls | indent 4 }} 
+  tls:
+  {{ toYaml .Values.frontend.route.tls | indent 4 }}
 {{- end}}
diff --git a/charts/keep/templates/frontend-service.yaml b/charts/keep/templates/frontend-service.yaml
index 7908ac0..a545e9e 100644
--- a/charts/keep/templates/frontend-service.yaml
+++ b/charts/keep/templates/frontend-service.yaml
@@ -5,7 +5,8 @@ metadata:
   name: {{ include "keep.fullname" . }}-frontend
   labels:
     {{- include "keep.labels" . | nindent 4 }}
-    keep-component: frontend-service
+    app.kubernetes.io/component: frontend
+    keep-component: frontend
   annotations:
     {{- if .Values.isGKE }}
     cloud.google.com/backend-config: '{"default": "{{ include "keep.fullname" . }}-frontend-backendconfig"}'
diff --git a/charts/keep/templates/frontend.yaml b/charts/keep/templates/frontend.yaml
index ce97ccc..7037c8b 100644
--- a/charts/keep/templates/frontend.yaml
+++ b/charts/keep/templates/frontend.yaml
@@ -5,6 +5,7 @@ metadata:
   name: {{ include "keep.fullname" . }}-frontend
   labels:
     {{- include "keep.labels" . | nindent 4 }}
+    app.kubernetes.io/component: frontend
     keep-component: frontend
 spec:
   {{- if not .Values.frontend.autoscaling.enabled }}
@@ -21,7 +22,8 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "keep.selectorLabels" . | nindent 8 }}
+        {{- include "keep.labels" . | nindent 8 }}
+        app.kubernetes.io/component: frontend
         keep-component: frontend
     spec:
       {{- with .Values.frontend.imagePullSecrets }}
@@ -51,10 +53,10 @@ spec:
             - name: NEXTAUTH_URL
               value: {{ include "keep.nextAuthUrl" . | quote }}
             {{- range .Values.frontend.env }}
-            {{- if and 
-                  (ne .name "PUSHER_HOST") 
-                  (ne .name "API_URL_CLIENT") 
-                  (ne .name "API_URL") 
+            {{- if and
+                  (ne .name "PUSHER_HOST")
+                  (ne .name "API_URL_CLIENT")
+                  (ne .name "API_URL")
                   (ne .name "NEXTAUTH_URL") }}
             - name: {{ .name }}
               value: {{ .value | quote }}
@@ -87,4 +89,4 @@ spec:
       volumes:
         - name: state-volume
           emptyDir: {}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/charts/keep/templates/ingress-haproxy.yaml b/charts/keep/templates/ingress-haproxy.yaml
index 172b3d9..097b7a0 100644
--- a/charts/keep/templates/ingress-haproxy.yaml
+++ b/charts/keep/templates/ingress-haproxy.yaml
@@ -6,6 +6,7 @@ metadata:
   name: {{ $fullName }}-ingress
   labels:
     {{- include "keep.labels" . | nindent 4 }}
+    app.kubernetes.io/component: networking
   annotations:
     kubernetes.io/ingress.class: "haproxy"
     # HAProxy timeout configurations
@@ -14,7 +15,7 @@ metadata:
     haproxy-ingress.github.io/timeout-connect: "3600s"
     haproxy-ingress.github.io/timeout-tunnel: "3600s"
     haproxy-ingress.github.io/ssl-redirect: "false"
-    
+
     # Backend configurations for path rewrites + # WebSocket support
     haproxy-ingress.github.io/config-backend: |
       acl path_v2 path_beg {{ .Values.global.ingress.backendPrefix }}/
@@ -98,4 +99,4 @@ spec:
               port:
                 number: {{ $.Values.frontend.service.port }}
     {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/charts/keep/templates/ingress-nginx.yaml b/charts/keep/templates/ingress-nginx.yaml
index 4f340d0..889b72d 100644
--- a/charts/keep/templates/ingress-nginx.yaml
+++ b/charts/keep/templates/ingress-nginx.yaml
@@ -6,6 +6,7 @@ metadata:
   name: {{ $fullName }}-ingress
   labels:
     {{- include "keep.labels" . | nindent 4 }}
+    app.kubernetes.io/component: networking
   annotations:
     {{- if or (eq .Values.global.ingress.className "nginx") (eq .Values.global.ingress.classType "nginx") }}
     kubernetes.io/ingress.class: "nginx"
@@ -115,4 +116,4 @@ spec:
               port:
                 number: {{ $.Values.frontend.service.port }}
     {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/charts/keep/templates/ingress-traefik-middleware.yaml b/charts/keep/templates/ingress-traefik-middleware.yaml
index 5681bc2..72a9c66 100644
--- a/charts/keep/templates/ingress-traefik-middleware.yaml
+++ b/charts/keep/templates/ingress-traefik-middleware.yaml
@@ -6,9 +6,10 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "keep.labels" . | nindent 4 }}
+    app.kubernetes.io/component: networking
 spec:
   stripPrefix:
     prefixes:
       - {{ .Values.global.ingress.backendPrefix }}
       - {{ .Values.global.ingress.websocketPrefix }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/charts/keep/templates/ingress-traefik.yaml b/charts/keep/templates/ingress-traefik.yaml
index ebd6735..55bd031 100644
--- a/charts/keep/templates/ingress-traefik.yaml
+++ b/charts/keep/templates/ingress-traefik.yaml
@@ -6,6 +6,7 @@ metadata:
   name: {{ $fullName }}-ingress
   labels:
     {{- include "keep.labels" . | nindent 4 }}
+    app.kubernetes.io/component: networking
   annotations:
     traefik.ingress.kubernetes.io/router.middlewares: {{ .Release.Namespace }}-strip-prefix@kubernetescrd
     traefik.ingress.kubernetes.io/router.entrypoints: web
@@ -13,7 +14,7 @@ metadata:
     traefik.ingress.kubernetes.io/timeouts.connect: "3600s"
     traefik.ingress.kubernetes.io/timeouts.read: "3600s"
     traefik.ingress.kubernetes.io/timeouts.write: "3600s"
-    
+
     # WebSocket configuration
     traefik.ingress.kubernetes.io/websockets.enabled: "true"
     {{- with .Values.global.ingress.annotations }}
@@ -93,4 +94,4 @@ spec:
               port:
                 number: {{ $.Values.frontend.service.port }}
     {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/charts/keep/templates/role-binding-secret-manager.yaml b/charts/keep/templates/role-binding-secret-manager.yaml
index 313e975..92a4a7a 100644
--- a/charts/keep/templates/role-binding-secret-manager.yaml
+++ b/charts/keep/templates/role-binding-secret-manager.yaml
@@ -3,6 +3,9 @@ kind: RoleBinding
 metadata:
   name: secret-manager-rolebinding
   namespace: {{ include "keep.namespace" . }}
+  labels:
+    {{- include "keep.labels" . | nindent 4 }}
+    app.kubernetes.io/component: secrets
 subjects:
   - kind: ServiceAccount
     name: {{ include "keep.serviceAccountName" . }}
diff --git a/charts/keep/templates/role-secret-manager.yaml b/charts/keep/templates/role-secret-manager.yaml
index 917ae57..978f6fa 100644
--- a/charts/keep/templates/role-secret-manager.yaml
+++ b/charts/keep/templates/role-secret-manager.yaml
@@ -3,6 +3,9 @@ kind: Role
 metadata:
   name: secret-manager-role
   namespace: {{ include "keep.namespace" . }}
+  labels:
+    {{- include "keep.labels" . | nindent 4 }}
+    app.kubernetes.io/component: secrets
 rules:
   - apiGroups: [""]
     resources: ["secrets"]
diff --git a/charts/keep/templates/serviceaccount.yaml b/charts/keep/templates/serviceaccount.yaml
index 2289734..f7c3d34 100644
--- a/charts/keep/templates/serviceaccount.yaml
+++ b/charts/keep/templates/serviceaccount.yaml
@@ -5,6 +5,7 @@ metadata:
   name: {{ include "keep.serviceAccountName" . }}
   labels:
     {{- include "keep.labels" . | nindent 4 }}
+    app.kubernetes.io/component: rbac
   {{- with .Values.serviceAccount.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
diff --git a/charts/keep/templates/websocket-hpa.yaml b/charts/keep/templates/websocket-hpa.yaml
index 2cef476..3f6ffeb 100644
--- a/charts/keep/templates/websocket-hpa.yaml
+++ b/charts/keep/templates/websocket-hpa.yaml
@@ -5,6 +5,7 @@ metadata:
   name: {{ include "keep.fullname" . }}-websocket
   labels:
     {{- include "keep.labels" . | nindent 4 }}
+    app.kubernetes.io/component: websocket
 spec:
   scaleTargetRef:
     apiVersion: apps/v1
diff --git a/charts/keep/templates/websocket-route.yaml b/charts/keep/templates/websocket-route.yaml
index f010132..b7d6b2f 100644
--- a/charts/keep/templates/websocket-route.yaml
+++ b/charts/keep/templates/websocket-route.yaml
@@ -6,15 +6,16 @@ metadata:
   name: {{ $fullName }}-websocket
   labels:
     {{- include "keep.labels" . | nindent 4 }}
+    app.kubernetes.io/component: websocket
 spec:
   host: {{ .Values.websocket.route.host }}
   to:
     kind: Service
     name: {{ $fullName }}-websocket
     weight: 100
-  port: 
+  port:
     targetPort: {{ .Values.websocket.service.port }}
   wildcardPolicy: {{ .Values.websocket.route.wildcardPolicy }}
-  tls: 
-    {{ toYaml .Values.websocket.route.tls | indent 4 }} 
+  tls:
+    {{ toYaml .Values.websocket.route.tls | indent 4 }}
 {{- end }}
diff --git a/charts/keep/templates/websocket-server-service.yaml b/charts/keep/templates/websocket-server-service.yaml
index d8734f7..1671fc3 100644
--- a/charts/keep/templates/websocket-server-service.yaml
+++ b/charts/keep/templates/websocket-server-service.yaml
@@ -5,6 +5,7 @@ metadata:
   name: {{ include "keep.fullname" . }}-websocket
   labels:
     {{- include "keep.labels" . | nindent 4 }}
+    app.kubernetes.io/component: websocket
     keep-component: websocket-service
 spec:
   type: {{ .Values.websocket.service.type }}
diff --git a/charts/keep/templates/websocket-server.yaml b/charts/keep/templates/websocket-server.yaml
index 825d3e0..b019655 100644
--- a/charts/keep/templates/websocket-server.yaml
+++ b/charts/keep/templates/websocket-server.yaml
@@ -5,6 +5,7 @@ metadata:
   name: {{ include "keep.fullname" . }}-websocket
   labels:
     {{- include "keep.labels" . | nindent 4 }}
+    app.kubernetes.io/component: websocket
     keep-component: websocket
 spec:
   {{- if not .Values.websocket.autoscaling.enabled }}
@@ -21,7 +22,8 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "keep.selectorLabels" . | nindent 8 }}
+        {{- include "keep.labels" . | nindent 8 }}
+        app.kubernetes.io/component: websocket
         keep-component: websocket
     spec:
       {{- with .Values.websocket.imagePullSecrets }}
diff --git a/charts/keep/values.yaml b/charts/keep/values.yaml
index eacf4e0..d8f2a1e 100644
--- a/charts/keep/values.yaml
+++ b/charts/keep/values.yaml
@@ -39,6 +39,11 @@ global:
     #       - keep.example.com
     #    secretName: keep-tls
 
+# Additional labels that should be applied to all resources
+additionalLabels:
+  {}
+  # app: keep
+
 backend:
   # if true, the backend will be enabled
   enabled: true
@@ -81,7 +86,10 @@ backend:
     pullPolicy: Always
   extraInitContainers: []
   imagePullSecrets: []
-  podAnnotations: {}
+  podAnnotations:
+    "prometheus.io/scrape": "true"
+    "prometheus.io/path": "/metrics/processing"
+    "prometheus.io/port": "8080"
   podSecurityContext: {}
   securityContext: {}
   service: