From 7aa717c0509a731c060c58a1b5877e1d9899406f Mon Sep 17 00:00:00 2001
From: Sven-Erik Schmidt <sschmidt@b1-systems.de>
Date: Tue, 14 Oct 2025 16:54:36 +0200
Subject: [PATCH] fix(helmfile): Streamline annotations

---
 .../values-coco-enterprise.yaml.gotmpl        |  5 +-
 helmfile/apps/collabora/values.yaml.gotmpl    |  5 +-
 helmfile/apps/cryptpad/values.yaml.gotmpl     |  5 +-
 .../apps/element/values-element.yaml.gotmpl   |  5 +-
 .../values-matrix-neoboard-widget.yaml.gotmpl |  5 +-
 ...values-matrix-neochoice-widget.yaml.gotmpl |  5 +-
 ...atrix-neodatefix-bot-bootstrap.yaml.gotmpl | 11 ++-
 .../values-matrix-neodatefix-bot.yaml.gotmpl  |  5 +-
 ...alues-matrix-neodatefix-widget.yaml.gotmpl |  5 +-
 ...verification-service-bootstrap.yaml.gotmpl |  5 +-
 ...trix-user-verification-service.yaml.gotmpl |  5 +-
 .../element/values-synapse-admin.yaml.gotmpl  |  5 ++
 .../values-synapse-adminbot-pipe.yaml.gotmpl  |  2 +
 .../values-synapse-adminbot-web.yaml.gotmpl   |  2 +
 .../values-synapse-auditbot-pipe.yaml.gotmpl  |  2 +
 .../values-synapse-groupsync.yaml.gotmpl      |  2 +
 .../element/values-synapse-web.yaml.gotmpl    |  5 +-
 .../apps/element/values-synapse.yaml.gotmpl   |  5 +-
 .../element/values-well-known.yaml.gotmpl     |  5 +-
 helmfile/apps/jitsi/values-jitsi.yaml.gotmpl  | 42 ++++++----
 .../values-nextcloud-management.yaml.gotmpl   |  2 +-
 .../values-nextcloud-notifypush.yaml.gotmpl   |  6 +-
 .../nextcloud/values-nextcloud.yaml.gotmpl    | 12 ++-
 helmfile/apps/notes/values.yaml.gotmpl        | 25 ++++--
 .../nubus/values-intercom-service.yaml.gotmpl |  5 +-
 .../nubus/values-nginx-s3-gateway.yaml.gotmpl |  5 +-
 helmfile/apps/nubus/values-nubus.yaml.gotmpl  | 82 +++++++++++++------
 .../open-xchange/values-dovecot.yaml.gotmpl   |  5 +-
 .../values-openxchange-bootstrap.yaml.gotmpl  |  1 +
 ...ues-openxchange-contact-picker.yaml.gotmpl |  1 +
 .../values-openxchange.yaml.gotmpl            | 54 +++++++++---
 .../values-oxconnector.yaml.gotmpl            |  5 +-
 .../open-xchange/values-postfix.yaml.gotmpl   |  5 +-
 .../values.yaml.gotmpl                        |  5 +-
 .../values.yaml.gotmpl                        |  5 +-
 .../values-opendesk-static-files.yaml.gotmpl  |  5 +-
 .../values-otterize.yaml.gotmpl               | 16 +++-
 helmfile/apps/openproject/values.yaml.gotmpl  |  5 +-
 .../values-cassandra.yaml.gotmpl              |  6 +-
 .../values-clamav-distributed.yaml.gotmpl     | 20 ++++-
 .../values-clamav-simple.yaml.gotmpl          |  5 +-
 .../values-dkimpy.yaml.gotmpl                 |  5 +-
 .../values-mariadb.yaml.gotmpl                |  1 +
 .../values-memcached.yaml.gotmpl              |  6 +-
 .../values-minio.yaml.gotmpl                  | 10 ++-
 .../values-postfix.yaml.gotmpl                |  7 +-
 .../values-postgresql.yaml.gotmpl             |  1 +
 .../values-redis.yaml.gotmpl                  |  5 +-
 .../default/annotations.yaml.gotmpl           |  5 ++
 49 files changed, 338 insertions(+), 108 deletions(-)

diff --git a/helmfile/apps/collabora/values-coco-enterprise.yaml.gotmpl b/helmfile/apps/collabora/values-coco-enterprise.yaml.gotmpl
index 30f07cbf..c28115bd 100644
--- a/helmfile/apps/collabora/values-coco-enterprise.yaml.gotmpl
+++ b/helmfile/apps/collabora/values-coco-enterprise.yaml.gotmpl
@@ -47,7 +47,10 @@ ingress:
         - "{{ .Values.global.hosts.collabora }}.{{ .Values.global.domain }}"
 
 podAnnotations:
-  {{ .Values.annotations.coco.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "collabora-controller"
+  {{- with .Values.annotations.coco.pod }}
+  {{ . | toYaml | nindent 2 }}
+  {{- end }}
 
 securityContext:
   allowPrivilegeEscalation: false
diff --git a/helmfile/apps/collabora/values.yaml.gotmpl b/helmfile/apps/collabora/values.yaml.gotmpl
index 5d902df3..1dc60831 100644
--- a/helmfile/apps/collabora/values.yaml.gotmpl
+++ b/helmfile/apps/collabora/values.yaml.gotmpl
@@ -110,7 +110,10 @@ ingress:
         - "{{ .Values.global.hosts.collabora }}.{{ .Values.global.domain }}"
 
 podAnnotations:
-  {{ .Values.annotations.collabora.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "collabora"
+  {{- with .Values.annotations.collabora.pod }}
+  {{ . | toYaml | nindent 2 }}
+  {{- end }}
 
 podSecurityContext:
   fsGroup: 1001
diff --git a/helmfile/apps/cryptpad/values.yaml.gotmpl b/helmfile/apps/cryptpad/values.yaml.gotmpl
index 47dc0a3d..c1657419 100644
--- a/helmfile/apps/cryptpad/values.yaml.gotmpl
+++ b/helmfile/apps/cryptpad/values.yaml.gotmpl
@@ -55,7 +55,10 @@ persistence:
   enabled: false
 
 podAnnotations:
-  {{ .Values.annotations.cryptpad.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "cryptpad"
+  {{- with .Values.annotations.cryptpad.pod }}
+  {{ . | toYaml | nindent 2 }}
+  {{- end }}
 
 podSecurityContext:
   fsGroup: 4001
diff --git a/helmfile/apps/element/values-element.yaml.gotmpl b/helmfile/apps/element/values-element.yaml.gotmpl
index e5c21a23..6a07e362 100644
--- a/helmfile/apps/element/values-element.yaml.gotmpl
+++ b/helmfile/apps/element/values-element.yaml.gotmpl
@@ -143,7 +143,10 @@ ingress:
     {{ .Values.annotations.element.ingress | toYaml | nindent 4 }}
 
 podAnnotations:
-  {{ .Values.annotations.element.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "opendesk-element"
+  {{- with .Values.annotations.element.pod }}
+  {{ . | toYaml | nindent 2 }}
+  {{- end }}
 
 podSecurityContext:
   enabled: true
diff --git a/helmfile/apps/element/values-matrix-neoboard-widget.yaml.gotmpl b/helmfile/apps/element/values-matrix-neoboard-widget.yaml.gotmpl
index 558a5312..0d885a05 100644
--- a/helmfile/apps/element/values-matrix-neoboard-widget.yaml.gotmpl
+++ b/helmfile/apps/element/values-matrix-neoboard-widget.yaml.gotmpl
@@ -44,7 +44,10 @@ ingress:
     {{ .Values.annotations.elementMatrixNeoboardWidget.ingress | toYaml | nindent 4 }}
 
 podAnnotations:
-  {{ .Values.annotations.elementMatrixNeoboardWidget.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "matrix-neoboard-widget"
+  {{- with .Values.annotations.elementMatrixNeoboardWidget.pod }}
+  {{ . | toYaml | nindent 2 }}
+  {{- end }}
 
 podSecurityContext:
   enabled: true
diff --git a/helmfile/apps/element/values-matrix-neochoice-widget.yaml.gotmpl b/helmfile/apps/element/values-matrix-neochoice-widget.yaml.gotmpl
index 6572950a..368c477f 100644
--- a/helmfile/apps/element/values-matrix-neochoice-widget.yaml.gotmpl
+++ b/helmfile/apps/element/values-matrix-neochoice-widget.yaml.gotmpl
@@ -44,7 +44,10 @@ ingress:
     {{ .Values.annotations.elementMatrixNeochoiceWidget.ingress | toYaml | nindent 4 }}
 
 podAnnotations:
-  {{ .Values.annotations.elementMatrixNeochoiceWidget.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "matrix-neochoice-widget"
+  {{- with .Values.annotations.elementMatrixNeochoiceWidget.pod }}
+  {{ . | toYaml | nindent 2 }}
+  {{- end }}
 
 podSecurityContext:
   enabled: true
diff --git a/helmfile/apps/element/values-matrix-neodatefix-bot-bootstrap.yaml.gotmpl b/helmfile/apps/element/values-matrix-neodatefix-bot-bootstrap.yaml.gotmpl
index 2713a494..b75aa36d 100644
--- a/helmfile/apps/element/values-matrix-neodatefix-bot-bootstrap.yaml.gotmpl
+++ b/helmfile/apps/element/values-matrix-neodatefix-bot-bootstrap.yaml.gotmpl
@@ -25,7 +25,10 @@ image:
 fullnameOverride: "matrix-neodatefix-bot-bootstrap"
 
 podAnnotations:
-  {{ .Values.annotations.elementMatrixNeodatefixBotBootstrap.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "values-matrix-neodatefix-bot-bootstrap"
+  {{- with .Values.annotations.elementMatrixNeodatefixBotBootstrap.pod }}
+  {{ . | toYaml | nindent 2 }}
+  {{- end }}
 
 securityContext:
   allowPrivilegeEscalation: false
@@ -42,7 +45,7 @@ securityContext:
   seLinuxOptions:
     {{ .Values.seLinuxOptions.synapseCreateUser | toYaml | nindent 4 }}
 
-podAnnotations:
-  {{ .Values.annotations.elementMatrixNeodatefixBotBootstrap.serviceAccount | toYaml | nindent 2 }}
-
+serviceAccount:
+  annotations:
+    {{ .Values.annotations.elementMatrixNeodatefixBotBootstrap.serviceAccount | toYaml | nindent 4 }}
 ...
diff --git a/helmfile/apps/element/values-matrix-neodatefix-bot.yaml.gotmpl b/helmfile/apps/element/values-matrix-neodatefix-bot.yaml.gotmpl
index ba4c41c6..2e4033ef 100644
--- a/helmfile/apps/element/values-matrix-neodatefix-bot.yaml.gotmpl
+++ b/helmfile/apps/element/values-matrix-neodatefix-bot.yaml.gotmpl
@@ -90,7 +90,10 @@ persistence:
     {{ .Values.annotations.elementMatrixNeodatefixBot.persistence | toYaml | nindent 4 }}
 
 podAnnotations:
-  {{ .Values.annotations.elementMatrixNeodatefixBot.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "matrix-neodatefix-bot"
+  {{- with .Values.annotations.elementMatrixNeodatefixBot.pod }}
+  {{ . | toYaml | nindent 2 }}
+  {{- end }}
 
 podSecurityContext:
   enabled: true
diff --git a/helmfile/apps/element/values-matrix-neodatefix-widget.yaml.gotmpl b/helmfile/apps/element/values-matrix-neodatefix-widget.yaml.gotmpl
index 532197dd..cc584af2 100644
--- a/helmfile/apps/element/values-matrix-neodatefix-widget.yaml.gotmpl
+++ b/helmfile/apps/element/values-matrix-neodatefix-widget.yaml.gotmpl
@@ -49,7 +49,10 @@ ingress:
     {{ .Values.annotations.elementMatrixNeodatefixWidget.ingress | toYaml | nindent 4 }}
 
 podAnnotations:
-  {{ .Values.annotations.elementMatrixNeodatefixWidget.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "matrix-neodatefix-widget"
+  {{- with .Values.annotations.elementMatrixNeodatefixWidget.pod }}
+  {{ . | toYaml | nindent 2 }}
+  {{- end }}
 
 podSecurityContext:
   enabled: true
diff --git a/helmfile/apps/element/values-matrix-user-verification-service-bootstrap.yaml.gotmpl b/helmfile/apps/element/values-matrix-user-verification-service-bootstrap.yaml.gotmpl
index cc89b979..34a3f3bc 100644
--- a/helmfile/apps/element/values-matrix-user-verification-service-bootstrap.yaml.gotmpl
+++ b/helmfile/apps/element/values-matrix-user-verification-service-bootstrap.yaml.gotmpl
@@ -25,7 +25,10 @@ image:
 fullnameOverride: "opendesk-matrix-user-verification-service-bootstrap"
 
 podAnnotations:
-  {{ .Values.annotations.elementMatrixUserVerificationServiceBootstrap.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "opendesk-matrix-user-verification-service-bootstrap"
+  {{- with .Values.annotations.elementMatrixUserVerificationServiceBootstrap.pod }}
+  {{ . | toYaml | nindent 2 }}
+  {{- end }}
 
 securityContext:
   allowPrivilegeEscalation: false
diff --git a/helmfile/apps/element/values-matrix-user-verification-service.yaml.gotmpl b/helmfile/apps/element/values-matrix-user-verification-service.yaml.gotmpl
index b427af90..033fbd5b 100644
--- a/helmfile/apps/element/values-matrix-user-verification-service.yaml.gotmpl
+++ b/helmfile/apps/element/values-matrix-user-verification-service.yaml.gotmpl
@@ -44,7 +44,10 @@ image:
   tag: {{ .Values.images.matrixUserVerificationService.tag | quote }}
 
 podAnnotations:
-  {{ .Values.annotations.elementMatrixUserVerificationService.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "opendesk-matrix-user-verification-service"
+  {{- with .Values.annotations.elementMatrixUserVerificationService.pod }}
+  {{ . | toYaml | nindent 2 }}
+  {{- end }}
 
 podSecurityContext:
   enabled: true
diff --git a/helmfile/apps/element/values-synapse-admin.yaml.gotmpl b/helmfile/apps/element/values-synapse-admin.yaml.gotmpl
index 2ea78cce..8961f0a5 100644
--- a/helmfile/apps/element/values-synapse-admin.yaml.gotmpl
+++ b/helmfile/apps/element/values-synapse-admin.yaml.gotmpl
@@ -56,7 +56,12 @@ cron:
     repository: {{ .Values.images.elementSyncAdmins.repository | quote }}
     tag: {{ .Values.images.elementSyncAdmins.tag | quote }}
     imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
+  podAnnotations:
+    intents.otterize.com/service-name: "opendesk-synapse-admin-cron"
 #fullnameOverride: "opendesk-synapse-admin"
+
+podAnnotations:
+  intents.otterize.com/service-name: "opendesk-synapse-admin"
 image:
   registry: {{ coalesce .Values.repositories.image.registryOpencodeDeEnterprise .Values.global.imageRegistry .Values.images.elementSynapseAdmin.registry | quote }}
   repository: {{ .Values.images.elementSynapseAdmin.repository | quote }}
diff --git a/helmfile/apps/element/values-synapse-adminbot-pipe.yaml.gotmpl b/helmfile/apps/element/values-synapse-adminbot-pipe.yaml.gotmpl
index 7ada80d2..d188114c 100644
--- a/helmfile/apps/element/values-synapse-adminbot-pipe.yaml.gotmpl
+++ b/helmfile/apps/element/values-synapse-adminbot-pipe.yaml.gotmpl
@@ -16,4 +16,6 @@ image:
   tag: {{ .Values.images.elementPipe.tag | quote }}
   imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
 fullnameOverride: "opendesk-synapse-adminbot-pipe"
+podAnnotations:
+  intents.otterize.com/service-name: "opendesk-synapse-adminbot-pipe"
 ...
diff --git a/helmfile/apps/element/values-synapse-adminbot-web.yaml.gotmpl b/helmfile/apps/element/values-synapse-adminbot-web.yaml.gotmpl
index dd75a987..312accd2 100644
--- a/helmfile/apps/element/values-synapse-adminbot-web.yaml.gotmpl
+++ b/helmfile/apps/element/values-synapse-adminbot-web.yaml.gotmpl
@@ -20,4 +20,6 @@ ingress:
   enabled: {{ .Values.ingress.enabled }}
   tls:
     secretName: {{ .Values.ingress.tls.secretName | quote }}
+podAnnotations:
+  intents.otterize.com/service-name: "opendesk-synapse-adminbot-web"
 ...
diff --git a/helmfile/apps/element/values-synapse-auditbot-pipe.yaml.gotmpl b/helmfile/apps/element/values-synapse-auditbot-pipe.yaml.gotmpl
index cd950209..f165260e 100644
--- a/helmfile/apps/element/values-synapse-auditbot-pipe.yaml.gotmpl
+++ b/helmfile/apps/element/values-synapse-auditbot-pipe.yaml.gotmpl
@@ -16,4 +16,6 @@ image:
   tag: {{ .Values.images.elementPipe.tag | quote }}
   imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
 fullnameOverride: "opendesk-synapse-auditbot-pipe"
+podAnnotations:
+  intents.otterize.com/service-name: "opendesk-synapse-auditbot-pipe"
 ...
diff --git a/helmfile/apps/element/values-synapse-groupsync.yaml.gotmpl b/helmfile/apps/element/values-synapse-groupsync.yaml.gotmpl
index 286c13aa..1bfba83a 100644
--- a/helmfile/apps/element/values-synapse-groupsync.yaml.gotmpl
+++ b/helmfile/apps/element/values-synapse-groupsync.yaml.gotmpl
@@ -51,4 +51,6 @@ image:
   url: {{ .Values.images.elementGroupsync.repository | quote }}
   tag: {{ .Values.images.elementGroupsync.tag | quote }}
   imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
+podAnnotations:
+  intents.otterize.com/service-name: "opendesk-synapse-groupsync"
 ...
diff --git a/helmfile/apps/element/values-synapse-web.yaml.gotmpl b/helmfile/apps/element/values-synapse-web.yaml.gotmpl
index 0ee4fd81..df5e1e98 100644
--- a/helmfile/apps/element/values-synapse-web.yaml.gotmpl
+++ b/helmfile/apps/element/values-synapse-web.yaml.gotmpl
@@ -56,7 +56,10 @@ ingress:
     secretName: {{ .Values.ingress.tls.secretName | quote }}
 
 podAnnotations:
-  {{ .Values.annotations.elementSynapseWeb.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "opendesk-synapse-web"
+  {{- with .Values.annotations.elementSynapseWeb.pod }}
+  {{ . | toYaml | nindent 2 }}
+  {{- end }}
 
 podSecurityContext:
   enabled: true
diff --git a/helmfile/apps/element/values-synapse.yaml.gotmpl b/helmfile/apps/element/values-synapse.yaml.gotmpl
index 2cc49521..ce782246 100644
--- a/helmfile/apps/element/values-synapse.yaml.gotmpl
+++ b/helmfile/apps/element/values-synapse.yaml.gotmpl
@@ -250,7 +250,10 @@ persistence:
     {{ .Values.annotations.elementSynapse.persistence | toYaml | nindent 4 }}
 
 podAnnotations:
-  {{ .Values.annotations.elementSynapse.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "opendesk-synapse"
+  {{- with .Values.annotations.elementSynapse.pod }}
+  {{ . | toYaml | nindent 2 }}
+  {{- end }}
 
 podSecurityContext:
   enabled: true
diff --git a/helmfile/apps/element/values-well-known.yaml.gotmpl b/helmfile/apps/element/values-well-known.yaml.gotmpl
index e284cff8..1fa1f8d6 100644
--- a/helmfile/apps/element/values-well-known.yaml.gotmpl
+++ b/helmfile/apps/element/values-well-known.yaml.gotmpl
@@ -49,7 +49,10 @@ ingress:
     {{ .Values.annotations.elementWellKnown.ingress | toYaml | nindent 4 }}
 
 podAnnotations:
-  {{ .Values.annotations.elementWellKnown.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "opendesk-well-known"
+  {{- with .Values.annotations.elementWellKnown.pod }}
+  {{ . | toYaml | nindent 2 }}
+  {{- end }}
 
 podSecurityContext:
   enabled: true
diff --git a/helmfile/apps/jitsi/values-jitsi.yaml.gotmpl b/helmfile/apps/jitsi/values-jitsi.yaml.gotmpl
index f541f1b7..b4944fda 100644
--- a/helmfile/apps/jitsi/values-jitsi.yaml.gotmpl
+++ b/helmfile/apps/jitsi/values-jitsi.yaml.gotmpl
@@ -111,10 +111,11 @@ jitsi:
         type: "RuntimeDefault"
       seLinuxOptions:
         {{ .Values.seLinuxOptions.jitsi | toYaml | nindent 8 }}
-    {{- if .Values.annotations.jitsiWeb.pod }}
     podAnnotations:
-      {{ .Values.annotations.jitsiWeb.pod | toYaml | nindent 6 }}
-    {{- end }}
+      intents.otterize.com/service-name: "jitsi-web"
+      {{- with .Values.annotations.jitsiWeb.pod }}
+      {{ . | toYaml | nindent 6 }}
+      {{- end }}
   prosody:
     image:
       repository: "{{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.prosody.registry }}/{{ .Values.images.prosody.repository }}"
@@ -164,10 +165,11 @@ jitsi:
         type: "RuntimeDefault"
       seLinuxOptions:
         {{ .Values.seLinuxOptions.prosody | toYaml | nindent 8 }}
-    {{- if .Values.annotations.jitsiProsody.pod }}
     podAnnotations:
-      {{ .Values.annotations.jitsiProsody.pod | toYaml | nindent 6 }}
-    {{- end }}
+      intents.otterize.com/service-name: "jitsi-prosody"
+      {{- with .Values.annotations.jitsiProsody.pod }}
+      {{ . | toYaml | nindent 6 }}
+      {{- end }}
   jicofo:
     replicaCount: {{ .Values.replicas.jicofo }}
     image:
@@ -191,10 +193,11 @@ jitsi:
         type: "RuntimeDefault"
       seLinuxOptions:
         {{ .Values.seLinuxOptions.jicofo | toYaml | nindent 8 }}
-    {{- if .Values.annotations.jitsiJicofo.pod }}
     podAnnotations:
-      {{ .Values.annotations.jitsiJicofo.pod | toYaml | nindent 6 }}
-    {{- end }}
+      intents.otterize.com/service-name: "jitsi-jicofo"
+      {{- with .Values.annotations.jitsiJicofo.pod }}
+      {{ . | toYaml | nindent 6 }}
+      {{- end }}
   jigasi:
     replicaCount: {{ .Values.replicas.jigasi }}
     enabled: {{ .Values.sip.jigasi.enabled }}
@@ -224,10 +227,11 @@ jitsi:
         type: "RuntimeDefault"
       seLinuxOptions:
         {{ .Values.seLinuxOptions.jigasi | toYaml | nindent 8 }}
-    {{- if .Values.annotations.jitsiJigasi.pod }}
     podAnnotations:
-      {{ .Values.annotations.jitsiJigasi.pod | toYaml | nindent 6 }}
-    {{- end }}
+      intents.otterize.com/service-name: "jitsi-jigasi"
+      {{- with .Values.annotations.jitsiJigasi.pod }}
+      {{ . | toYaml | nindent 6 }}
+      {{- end }}
   jvb:
     replicaCount: {{ .Values.replicas.jvb }}
     # The `useNodeIP` option provided by the upstream charts does not support all relevant scenarios, but since
@@ -260,10 +264,11 @@ jitsi:
         type: "RuntimeDefault"
       seLinuxOptions:
         {{ .Values.seLinuxOptions.jvb | toYaml | nindent 8 }}
-    {{- if .Values.annotations.jitsiJvb.pod }}
     podAnnotations:
-      {{ .Values.annotations.jitsiJvb.pod | toYaml | nindent 6 }}
-    {{- end }}
+      intents.otterize.com/service-name: "jitsi-jvb"
+      {{- with .Values.annotations.jitsiJvb.pod }}
+      {{ . | toYaml | nindent 6 }}
+      {{- end }}
     metrics:
       prometheusAnnotations:
         {{ .Values.annotations.jitsiJvb.metricsPrometheus | toYaml | nindent 8 }}
@@ -288,10 +293,11 @@ jitsi:
       # Chart does not allow to template more
       capabilities:
         add: ["SYS_ADMIN"]
-    {{- if .Values.annotations.jitsiJibri.pod }}
     podAnnotations:
-      {{ .Values.annotations.jitsiJibri.pod | toYaml | nindent 6 }}
-    {{- end }}
+      intents.otterize.com/service-name: "jitsi-jibri"
+      {{- with .Values.annotations.jitsiJibri.pod }}
+      {{ . | toYaml | nindent 6 }}
+      {{- end }}
   imagePullSecrets:
   {{- range .Values.global.imagePullSecrets }}
     - name: {{ . | quote }}
diff --git a/helmfile/apps/nextcloud/values-nextcloud-management.yaml.gotmpl b/helmfile/apps/nextcloud/values-nextcloud-management.yaml.gotmpl
index 9f9c02c3..3dddab1b 100644
--- a/helmfile/apps/nextcloud/values-nextcloud-management.yaml.gotmpl
+++ b/helmfile/apps/nextcloud/values-nextcloud-management.yaml.gotmpl
@@ -10,7 +10,7 @@ global:
     {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
 
 additionalAnnotations:
-  intents.otterize.com/service-name: "opendesk-nextcloud-php"
+  intents.otterize.com/service-name: "opendesk-nextcloud-management"
   {{- with .Values.annotations.nextcloudNextcloudMgmt.additional }}
   {{ . | toYaml | nindent 2}}
   {{- end }}
diff --git a/helmfile/apps/nextcloud/values-nextcloud-notifypush.yaml.gotmpl b/helmfile/apps/nextcloud/values-nextcloud-notifypush.yaml.gotmpl
index dc51230c..562c6e31 100644
--- a/helmfile/apps/nextcloud/values-nextcloud-notifypush.yaml.gotmpl
+++ b/helmfile/apps/nextcloud/values-nextcloud-notifypush.yaml.gotmpl
@@ -10,7 +10,6 @@ global:
     {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
 
 additionalAnnotations:
-  intents.otterize.com/service-name: "opendesk-nextcloud-notifypush"
   {{- with .Values.annotations.nextcloudNotifyPush.additional }}
   {{ . | toYaml | nindent 4 }}
   {{- end }}
@@ -114,7 +113,10 @@ metrics:
       {{ .Values.annotations.nextcloudNotifyPush.serviceMetrics | toYaml | nindent 6 }}
 
 podAnnotations:
-  {{ .Values.annotations.nextcloudNotifyPush.pod | toYaml | nindent 4 }}
+  intents.otterize.com/service-name: "opendesk-nextcloud-notifypush"
+  {{- with .Values.annotations.nextcloudNotifyPush.pod }}
+  {{ . | toYaml | nindent 2 }}
+  {{- end }}
 podSecurityContext:
   fsGroup: 101
 # prometheus:
diff --git a/helmfile/apps/nextcloud/values-nextcloud.yaml.gotmpl b/helmfile/apps/nextcloud/values-nextcloud.yaml.gotmpl
index 3742bb05..24d5b257 100644
--- a/helmfile/apps/nextcloud/values-nextcloud.yaml.gotmpl
+++ b/helmfile/apps/nextcloud/values-nextcloud.yaml.gotmpl
@@ -39,7 +39,10 @@ exporter:
     imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
     tag: {{ .Values.images.nextcloudExporter.tag | quote }}
   podAnnotations:
-    {{ .Values.annotations.nextcloudExporter.pod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "opendesk-nextcloud-exporter"
+    {{- with .Values.annotations.nextcloudExporter.pod }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   prometheus:
     serviceMonitor:
       enabled: {{ .Values.monitoring.prometheus.serviceMonitors.enabled }}
@@ -76,7 +79,7 @@ aio:
             topologyKey: "kubernetes.io/hostname"
 
   additionalAnnotations:
-    intents.otterize.com/service-name: "opendesk-nextcloud-aio"
+    intents.otterize.com/service-name: "opendesk-nextcloud-aio-cron"
     {{- with .Values.annotations.nextcloudAio.additional }}
     {{ . | toYaml | nindent 4 }}
     {{- end }}
@@ -177,7 +180,10 @@ aio:
     tls:
       secretName: {{ .Values.ingress.tls.secretName | quote }}
   podAnnotations:
-    {{ .Values.annotations.nextcloudAio.pod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "opendesk-nextcloud-aio"
+    {{- with .Values.annotations.nextcloudAio.pod }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   podSecurityContext:
     fsGroup: 101
   prometheus:
diff --git a/helmfile/apps/notes/values.yaml.gotmpl b/helmfile/apps/notes/values.yaml.gotmpl
index 0f1dc298..58055dc4 100644
--- a/helmfile/apps/notes/values.yaml.gotmpl
+++ b/helmfile/apps/notes/values.yaml.gotmpl
@@ -117,11 +117,20 @@ backend:
     seLinuxOptions:
       {{ .Values.seLinuxOptions.notesBackend | toYaml | nindent 6 }}
   podAnnotations:
-    {{ .Values.annotations.notesBackend.pod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "impress-backend"
+    {{- with .Values.annotations.notesBackend.pod }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   podAnnotationsCreateUser:
-    {{ .Values.annotations.notesBackend.createUserJob | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "impress-create-user"
+    {{- with .Values.annotations.notesBackend.createUserJob }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   podAnnotationsMigrate:
-    {{ .Values.annotations.notesBackend.migrateJob | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "impress-migrate"
+    {{- with .Values.annotations.notesBackend.migrateJob }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   podSecurityContext:
     enabled: true
     fsGroup: 1000
@@ -189,7 +198,10 @@ frontend:
     seLinuxOptions:
       {{ .Values.seLinuxOptions.notesFrontend | toYaml | nindent 6 }}
   podAnnotations:
-    {{ .Values.annotations.notesFrontend.pod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "impress-frontend"
+    {{- with .Values.annotations.notesFrontend.pod }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   podSecurityContext:
     enabled: true
     fsGroup: 1000
@@ -257,7 +269,10 @@ y-provider:
       {{ .Values.annotations.notesYProvider.ingressCollaborationWS | toYaml | nindent 6 }}
     ingressClassName: {{ .Values.ingress.ingressClassName }}
   podAnnotations:
-    {{ .Values.annotations.notesYProvider.pod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "impress-y-provider"
+    {{- with .Values.annotations.notesYProvider.pod }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   podSecurityContext:
     enabled: true
     fsGroup: 1001
diff --git a/helmfile/apps/nubus/values-intercom-service.yaml.gotmpl b/helmfile/apps/nubus/values-intercom-service.yaml.gotmpl
index 9983daff..569349fd 100644
--- a/helmfile/apps/nubus/values-intercom-service.yaml.gotmpl
+++ b/helmfile/apps/nubus/values-intercom-service.yaml.gotmpl
@@ -109,7 +109,10 @@ ingress:
     {{ .Values.annotations.nubusIntercomService.ingress | toYaml | nindent 4 }}
 
 podAnnotations:
-  {{ .Values.annotations.nubusIntercomService.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "intercom-service"
+  {{- with .Values.annotations.nubusIntercomService.pod }}
+  {{ . | toYaml | nindent 2}}
+  {{- end }}
 
 podSecurityContext:
   enabled: true
diff --git a/helmfile/apps/nubus/values-nginx-s3-gateway.yaml.gotmpl b/helmfile/apps/nubus/values-nginx-s3-gateway.yaml.gotmpl
index ce64a308..056341f2 100644
--- a/helmfile/apps/nubus/values-nginx-s3-gateway.yaml.gotmpl
+++ b/helmfile/apps/nubus/values-nginx-s3-gateway.yaml.gotmpl
@@ -42,7 +42,10 @@ configuration:
       value: {{ .Values.objectstores.nubus.secretKey | default .Values.secrets.minio.umsUser | quote }}
 
 podAnnotations:
-  {{ .Values.annotations.nubusNginxS3Gateway.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "nubus-nginx-s3-gateway"
+  {{- with .Values.annotations.nubusNginxS3Gateway.pod }}
+  {{ . | toYaml | nindent 2 }}
+  {{- end }}
 
 resources:
   {{ .Values.resources.nginxS3Gateway | toYaml | nindent 2 }}
diff --git a/helmfile/apps/nubus/values-nubus.yaml.gotmpl b/helmfile/apps/nubus/values-nubus.yaml.gotmpl
index 9cb2a43d..f6f81890 100644
--- a/helmfile/apps/nubus/values-nubus.yaml.gotmpl
+++ b/helmfile/apps/nubus/values-nubus.yaml.gotmpl
@@ -274,7 +274,6 @@ nubusTwofaHelpdesk:
 nubusNotificationsApi:
   enabled: false
   additionalAnnotations:
-    intents.otterize.com/service-name: "ums-notifications-api"
     {{- with .Values.annotations.nubusNotificationsApi.additional }}
     {{ . | toYaml | nindent 4 }}
     {{- end }}
@@ -312,7 +311,10 @@ nubusNotificationsApi:
     annotations:
       {{ .Values.annotations.nubusNotificationsApi.persistence | toYaml | nindent 6 }}
   podAnnotations:
-    {{ .Values.annotations.nubusNotificationsApi.pod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "ums-notifications-api"
+    {{- with .Values.annotations.nubusNotificationsApi.pod }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   postgresql:
     connection:
       host: {{ .Values.databases.umsNotificationsApi.host | quote }}
@@ -339,7 +341,6 @@ nubusNotificationsApi:
 
 nubusPortalFrontend:
   additionalAnnotations:
-    intents.otterize.com/service-name: "ums-portal-frontend"
     {{- with .Values.annotations.nubusPortalFrontend.additional }}
     {{ . | toYaml | nindent 4 }}
     {{- end }}
@@ -415,7 +416,10 @@ nubusPortalFrontend:
     annotations:
       {{ .Values.annotations.nubusPortalFrontend.persistence | toYaml | nindent 6 }}
   podAnnotations:
-    {{ .Values.annotations.nubusPortalFrontend.pod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "ums-portal-frontend"
+    {{- with .Values.annotations.nubusPortalFrontend.pod }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   portalFrontend:
     branding:
       css: {{ .Values.theme.styles.portal.main | toJson }}
@@ -666,7 +670,6 @@ nubusPortalConsumer:
 
 nubusPortalServer:
   additionalAnnotations:
-    intents.otterize.com/service-name: "ums-portal-server"
     {{- with .Values.annotations.nubusPortalServer.additional }}
     {{ . | toYaml | nindent 4 }}
     {{- end }}
@@ -711,7 +714,10 @@ nubusPortalServer:
     annotations:
       {{ .Values.annotations.nubusPortalServer.persistence | toYaml | nindent 6 }}
   podAnnotations:
-    {{ .Values.annotations.nubusPortalServer.pod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "ums-portal-server"
+    {{- with .Values.annotations.nubusPortalServer.pod }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   portalServer:
     centralNavigation:
       enabled: true
@@ -839,7 +845,10 @@ nubusUdmRestApi:
     annotations:
       {{ .Values.annotations.nubusUdmRestApi.persistence | toYaml | nindent 6 }}
   podAnnotations:
-    {{ .Values.annotations.nubusUdmRestApi.pod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "ums-udm-rest-api"
+    {{- with .Values.annotations.nubusUdmRestApi.pod }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end}}
   replicaCount: {{ .Values.replicas.umsUdmRestApi }}
   resources:
     {{ .Values.resources.umsUdmRestApi | toYaml | nindent 4 }}
@@ -898,7 +907,7 @@ nubusLdapServer:
   additionalAnnotations:
     {{ .Values.annotations.nubusLdapServer.additional | toYaml | nindent 4 }}
   additionalAnnotations:
-    intents.otterize.com/service-name: "ums-ldap-server"
+    {{ .Values.annotations.nubusLdapServer.additional | toYaml | nindent 4 }}
   dhInitcontainer:
     image:
       registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.nubusLdapServerDhInitContainer.registry | quote }}
@@ -921,7 +930,10 @@ nubusLdapServer:
     size: {{ .Values.persistence.storages.nubusLdapServerData.size | quote }}
     storageClass: {{ coalesce .Values.persistence.storages.nubusLdapServerData.storageClassName .Values.persistence.storageClassNames.RWO | quote }}
   podAnnotations:
-    {{ .Values.annotations.nubusLdapServer.pod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "ums-ldap-server"
+    {{- with .Values.annotations.nubusLdapServer.pod }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   replicaCountPrimary: {{ .Values.replicas.umsLdapServerPrimary }}
   replicaCountSecondary: {{ .Values.replicas.umsLdapServerSecondary }}
   replicaCountProxy: {{ .Values.replicas.umsLdapServerProxy }}
@@ -947,7 +959,6 @@ nubusProvisioning:
     {{ .Values.annotations.nubusProvisioning.additional | toYaml | nindent 4 }}
   api:
     additionalAnnotations:
-      intents.otterize.com/service-name: "ums-provisioning-api"
       {{- with .Values.annotations.nubusProvisioning.apiAdditional }}
       {{ . | toYaml | nindent 6 }}
       {{- end }}
@@ -966,7 +977,10 @@ nubusProvisioning:
       auth:
         password: {{ .Values.secrets.nubus.provisioning.api.natsPassword | quote}}
     podAnnotations:
-      {{ .Values.annotations.nubusProvisioning.apiPod | toYaml | nindent 6 }}
+      intents.otterize.com/service-name: "ums-provisioning-api"
+      {{- with .Values.annotations.nubusProvisioning.apiPod }}
+      {{ . | toYaml | nindent 6 }}
+      {{- end }}
     resources:
       {{ .Values.resources.umsProvisioningApi | toYaml | nindent 6 }}
   containerSecurityContext:
@@ -985,7 +999,6 @@ nubusProvisioning:
       {{ .Values.seLinuxOptions.umsProvisioning | toYaml | nindent 6 }}
   dispatcher:
     additionalAnnotations:
-      intents.otterize.com/service-name: "ums-provisioning-dispatcher"
       {{- with .Values.annotations.nubusProvisioning.dispatcherAdditional }}
       {{ . | toYaml | nindent 6 }}
       {{- end }}
@@ -997,12 +1010,14 @@ nubusProvisioning:
       auth:
         password: {{ .Values.secrets.nubus.provisioning.dispatcherNatsPassword | quote}}
     podAnnotations:
-      {{ .Values.annotations.nubusProvisioning.dispatcherPod | toYaml | nindent 6 }}
+      intents.otterize.com/service-name: "ums-provisioning-dispatcher"
+      {{- with .Values.annotations.nubusProvisioning.dispatcherPod }}
+      {{ . | toYaml | nindent 6 }}
+      {{- end }}
     resources:
       {{ .Values.resources.umsProvisioningDispatcher | toYaml | nindent 6 }}
   nats:
     additionalAnnotations:
-      intents.otterize.com/service-name: "ums-provisioning-nats"
       {{- with .Values.annotations.nubusProvisioning.natsAdditional }}
       {{ . | toYaml | nindent 6 }}
       {{- end }}
@@ -1060,10 +1075,12 @@ nubusProvisioning:
     serviceAccount:
       create: true
   podAnnotations:
-    {{ .Values.annotations.nubusProvisioning.pod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "ums-provisioning-nats"
+    {{- with .Values.annotations.nubusProvisioning.pod }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   prefill:
     additionalAnnotations:
-      intents.otterize.com/service-name: "ums-provisioning-prefill"
       {{- with .Values.annotations.nubusProvisioning.prefillAdditional }}
       {{ . | toYaml | nindent 6 }}
       {{- end }}
@@ -1075,12 +1092,14 @@ nubusProvisioning:
       auth:
         password: {{ .Values.secrets.nubus.provisioning.prefillNatsPassword | quote}}
     podAnnotations:
-      {{ .Values.annotations.nubusProvisioning.prefillPod | toYaml | nindent 6 }}
+      intents.otterize.com/service-name: "ums-provisioning-prefill"
+      {{- with .Values.annotations.nubusProvisioning.prefillPod }}
+      {{ . | toYaml | nindent 6 }}
+      {{- end }}
     resources:
       {{ .Values.resources.umsProvisioningPrefill | toYaml | nindent 6 }}
   udmTransformer:
     additionalAnnotations:
-      intents.otterize.com/service-name: "ums-provisioning-udm-transformer"
       {{- with .Values.annotations.nubusProvisioning.udmTransformerAdditional }}
       {{ . | toYaml | nindent 6 }}
       {{- end }}
@@ -1092,7 +1111,10 @@ nubusProvisioning:
       auth:
         password: {{ .Values.secrets.nubus.provisioning.udmTransformerNatsPassword | quote}}
     podAnnotations:
-      {{ .Values.annotations.nubusProvisioning.udmTransformerPod | toYaml | nindent 6 }}
+      intents.otterize.com/service-name: "ums-provisioning-udm-transformer"
+      {{- with .Values.annotations.nubusProvisioning.udmTransformerPod }}
+      {{ . | toYaml | nindent 6 }}
+      {{- end }}
     resources:
       {{ .Values.resources.umsProvisioningUdmTransformer | toYaml | nindent 6 }}
   replicaCount:
@@ -1163,7 +1185,10 @@ nubusUdmListener:
     size: {{ .Values.persistence.storages.nubusUdmListener.size | quote }}
 #    storageClass: -- coalesce .Values.persistence.storages.nubusUdmListener.storageClassName .Values.persistence.storageClassNames.RWO | quote --
   podAnnotations:
-    {{ .Values.annotations.nubusUdmListener.pod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "ums-provisioning-udm-listener"
+    {{- with .Values.annotations.nubusUdmListener.pod }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   replicaCount: {{ .Values.replicas.umsUdmListener }}
   resources:
     {{ .Values.resources.umsUdmListener | toYaml | nindent 4 }}
@@ -1219,9 +1244,9 @@ nubusSelfServiceConsumer:
 # Nubus services
 nubusStackDataUms:
   additionalAnnotations:
+    intents.otterize.com/service-name: "ums-stack-data-ums"
     argocd.argoproj.io/hook: "Sync"
     argocd.argoproj.io/hook-delete-policy: "BeforeHookCreation"
-    intents.otterize.com/service-name: "ums-stack-data-ums"
     {{- with .Values.annotations.nubusStackDataUms.additional }}
     {{ . | toYaml | nindent 4 }}
     {{- end }}
@@ -1270,7 +1295,10 @@ nubusStackDataUms:
       connection:
         host: {{ .Values.databases.umsSelfservice.host | quote }}
   podAnnotations:
-    {{ .Values.annotations.nubusStackDataUms.pod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "ums-stack-data-ums"
+    {{- with .Values.annotations.nubusStackDataUms.pod }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   resources:
     {{ .Values.resources.umsStackDataUms | toYaml | nindent 4 }}
   stackDataContext:
@@ -1459,7 +1487,10 @@ nubusUmcServer:
     auth:
       password: ""
   podAnnotations:
-    {{ .Values.annotations.nubusUmcServer.pod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "ums-umc-server"
+    {{- with .Values.annotations.nubusUmcServer.pod }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   # Ref.: https://docs.software-univention.de/nubus-kubernetes-operation/1.x/en/reference.html#envvar-nubusUmcServer.podManagementPolicy
   podManagementPolicy: "{{ if gt .Values.replicas.umsUmcServer 4 }}Parallel{{ else }}OrderedReady{{ end }}"
   postgresql:
@@ -1555,7 +1586,10 @@ nubusUmcGateway:
   initResources:
     {{ .Values.resources.umsUmcGateway | toYaml | nindent 4 }}
   podAnnotations:
-    {{ .Values.annotations.nubusUmcGateway.pod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "ums-umc-gateway"
+    {{- with .Values.annotations.nubusUmcGateway.pod }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   replicaCount: {{ .Values.replicas.umsUmcGateway }}
   serviceAccount:
     annotations:
diff --git a/helmfile/apps/open-xchange/values-dovecot.yaml.gotmpl b/helmfile/apps/open-xchange/values-dovecot.yaml.gotmpl
index 4d4cfca1..c75b9f8a 100644
--- a/helmfile/apps/open-xchange/values-dovecot.yaml.gotmpl
+++ b/helmfile/apps/open-xchange/values-dovecot.yaml.gotmpl
@@ -126,7 +126,10 @@ persistence:
     {{ .Values.annotations.openxchangeDovecot.persistence | toYaml | nindent 4 }}
 
 podAnnotations:
-  {{ .Values.annotations.openxchangeDovecot.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "open-xchange-dovecot"
+  {{- with .Values.annotations.openxchangeDovecot.pod }}
+  {{ . | toYaml | nindent 2 }}
+  {{- end }}
 
 resources:
   {{ .Values.resources.dovecot | toYaml | nindent 2 }}
diff --git a/helmfile/apps/open-xchange/values-openxchange-bootstrap.yaml.gotmpl b/helmfile/apps/open-xchange/values-openxchange-bootstrap.yaml.gotmpl
index 8d1f69b8..c5368986 100644
--- a/helmfile/apps/open-xchange/values-openxchange-bootstrap.yaml.gotmpl
+++ b/helmfile/apps/open-xchange/values-openxchange-bootstrap.yaml.gotmpl
@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 ---
 additionalAnnotations:
+  intents.otterize.com/service-name: "open-xchange-bootstrap"
   argocd.argoproj.io/hook: "Sync"
   argocd.argoproj.io/hook-delete-policy: "HookSucceeded"
   {{- with .Values.annotations.openxchangeBootstrap.additional }}
diff --git a/helmfile/apps/open-xchange/values-openxchange-contact-picker.yaml.gotmpl b/helmfile/apps/open-xchange/values-openxchange-contact-picker.yaml.gotmpl
index fb7dca1f..c1daffee 100644
--- a/helmfile/apps/open-xchange/values-openxchange-contact-picker.yaml.gotmpl
+++ b/helmfile/apps/open-xchange/values-openxchange-contact-picker.yaml.gotmpl
@@ -5,6 +5,7 @@
 appsuite:
   core-mw:
     podAnnotations:
+      intents.otterize.com/service-name: "open-xchange-core-mw"
       logging.open-xchange.com/format: "appsuite-json"
       {{- with .Values.annotations.openxchangeEnterpriseContactPicker.appsuiteCoreMwPod }}
       {{ . | toYaml | nindent 6 }}
diff --git a/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl b/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl
index de1fc88b..0dccd8ac 100644
--- a/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl
+++ b/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl
@@ -31,7 +31,10 @@ nextcloud-integration-ui:
     - name: {{ . | quote }}
   {{- end }}
   podAnnotations:
-    {{ .Values.annotations.openxchangeNextcloudIntegrationUi.pod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "open-xchange-nextcloud-integration-ui"
+    {{- with .Values.annotations.openxchangeNextcloudIntegrationUi.pod }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   replicaCount: {{ .Values.replicas.openxchangeNextcloudIntegrationUI }}
   resources:
     {{ .Values.resources.openxchangeNextcloudIntegrationUI | toYaml | nindent 4 }}
@@ -66,7 +69,10 @@ public-sector-ui:
   pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
   replicaCount: {{ .Values.replicas.openxchangePublicSectorUI }}
   podAnnotations:
-    {{ .Values.annotations.openxchangePublicSectorUi.pod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "open-xchange-public-sector-ui"
+    {{- with .Values.annotations.openxchangePublicSectorUi.pod }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   resources:
     {{ .Values.resources.openxchangePublicSectorUI | toYaml | nindent 4 }}
   securityContext:
@@ -311,7 +317,10 @@ appsuite:
     jolokiaPassword: {{ .Values.secrets.oxAppSuite.jolokiaPassword | quote }}
     hostname: "{{ .Values.global.hosts.openxchange }}.{{ .Values.global.domain }}"
     podAnnotations:
-      {{ .Values.annotations.openxchangeAppsuiteCoreMw.pod | toYaml | nindent 6 }}
+      intents.otterize.com/service-name: "open-xchange-core-mw"
+      {{- with .Values.annotations.openxchangeAppsuiteCoreMw.pod }}
+      {{ . | toYaml | nindent 6 }}
+      {{- end }}
     serviceAccount:
       annotations:
         {{ .Values.annotations.openxchangeAppsuiteCoreMw.serviceAccount | toYaml | nindent 8 }}
@@ -338,7 +347,10 @@ appsuite:
         pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
       replicaCount: {{ .Values.replicas.openxchangeGotenberg }}
       podAnnotations:
-        {{ .Values.annotations.openxchangeAppsuiteCoreMw.gotenbergPod | toYaml | nindent 8 }}
+        intents.otterize.com/service-name: "open-xchange-gotenberg"
+        {{- with .Values.annotations.openxchangeAppsuiteCoreMw.gotenbergPod }}
+        {{ . | toYaml | nindent 8 }}
+        {{- end }}
       resources:
         {{ .Values.resources.openxchangeGotenberg | toYaml | nindent 8 }}
       securityContext:
@@ -351,7 +363,6 @@ appsuite:
         runAsNonRoot: true
         runAsUser: 1001
         runAsGroup: 1001
-        privileged: false
         seccompProfile:
           type: "RuntimeDefault"
         seLinuxOptions:
@@ -769,7 +780,10 @@ appsuite:
       pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
     replicaCount: {{ .Values.replicas.openxchangeCoreUI }}
     podAnnotations:
-      {{ .Values.annotations.openxchangeAppsuiteCoreUi.pod | toYaml | nindent 6 }}
+      intents.otterize.com/service-name: "open-xchange-core-ui"
+      {{- with .Values.annotations.openxchangeAppsuiteCoreUi.pod }}
+      {{ . | toYaml | nindent 6 }}
+      {{- end }}
     resources:
       {{ .Values.resources.openxchangeCoreUI | toYaml | nindent 6 }}
     securityContext:
@@ -806,7 +820,10 @@ appsuite:
       pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
     overrides: {}
     podAnnotations:
-      {{ .Values.annotations.openxchangeAppsuiteCoreUiMiddleware.pod | toYaml | nindent 6 }}
+      intents.otterize.com/service-name: "open-xchange-core-ui-middleware"
+      {{- with .Values.annotations.openxchangeAppsuiteCoreUiMiddleware.pod }}
+      {{ . | toYaml | nindent 6 }}
+      {{- end }}
     redis: *redisConfiguration
     replicaCount: {{ .Values.replicas.openxchangeCoreUIMiddleware }}
     resources:
@@ -855,7 +872,10 @@ appsuite:
       pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
     {{- if .Values.annotations.openxchangeAppsuiteCoreDocumentconverter.pod }}
     podAnnotations:
-      {{ .Values.annotations.openxchangeAppsuiteCoreDocumentconverter.pod | toYaml | nindent 6 }}
+      intents.otterize.com/service-name: "open-xchange-core-documentconverter"
+      {{- with .Values.annotations.openxchangeAppsuiteCoreDocumentconverter.pod }}
+      {{ . | toYaml | nindent 6 }}
+      {{- end }}
     {{- end }}
     redis: *redisConfiguration
     replicaCount: {{ .Values.replicas.openxchangeCoreDocumentConverter }}
@@ -907,7 +927,10 @@ appsuite:
       tag: {{ .Values.images.openxchangeCoreGuidedtours.tag | quote }}
       pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
     podAnnotations:
-      {{ .Values.annotations.openxchangeAppsuiteCoreGuidedtours.pod | toYaml | nindent 6 }}
+      intents.otterize.com/service-name: "open-xchange-guidedtours"
+      {{- with .Values.annotations.openxchangeAppsuiteCoreGuidedtours.pod }}
+      {{ . | toYaml | nindent 6 }}
+      {{- end }}
     replicaCount: {{ .Values.replicas.openxchangeCoreGuidedtours }}
     resources:
       {{- .Values.resources.openxchangeCoreGuidedtours | toYaml | nindent 6 }}
@@ -951,7 +974,10 @@ appsuite:
           secretKey: "."
     {{- if .Values.annotations.openxchangeAppsuiteCoreImageconverter.pod }}
     podAnnotations:
-      {{ .Values.annotations.openxchangeAppsuiteCoreImageconverter.pod | toYaml | nindent 6 }}
+      intents.otterize.com/service-name: "open-xchange-core-imageconverter"
+      {{- with .Values.annotations.openxchangeAppsuiteCoreImageconverter.pod }}
+      {{ . | toYaml | nindent 6 }}
+      {{- end }}
     {{- end }}
     redis: *redisConfiguration
     replicaCount: {{ .Values.replicas.openxchangeCoreImageConverter }}
@@ -987,7 +1013,8 @@ appsuite:
       repository: {{ .Values.images.openxchangeGuardUI.repository | quote }}
       tag: {{ .Values.images.openxchangeGuardUI.tag | quote }}
       pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
-    podAnnotations: {}
+    podAnnotations:
+      intents.otterize.com/service-name: "open-xchange-guard-ui"
     replicaCount: {{ .Values.replicas.openxchangeGuardUI }}
     resources:
       {{- .Values.resources.openxchangeGuardUI | toYaml | nindent 6 }}
@@ -1023,7 +1050,10 @@ appsuite:
       - name: {{ . | quote }}
     {{- end }}
     podAnnotations:
-      {{ .Values.annotations.openxchangeAppsuiteCoreUserGuide.pod | toYaml | nindent 6 }}
+      intents.otterize.com/service-name: "open-xchange-core-user-guide"
+      {{- with .Values.annotations.openxchangeAppsuiteCoreUserGuide.pod }}
+      {{ . | toYaml | nindent 6 }}
+      {{- end }}
     replicaCount: {{ .Values.replicas.openxchangeCoreUserGuide }}
     resources:
       {{- .Values.resources.openxchangeCoreUserGuide | toYaml | nindent 6 }}
diff --git a/helmfile/apps/open-xchange/values-oxconnector.yaml.gotmpl b/helmfile/apps/open-xchange/values-oxconnector.yaml.gotmpl
index 9f88b461..0cbb8225 100644
--- a/helmfile/apps/open-xchange/values-oxconnector.yaml.gotmpl
+++ b/helmfile/apps/open-xchange/values-oxconnector.yaml.gotmpl
@@ -68,7 +68,10 @@ persistence:
   #storageClass: {{ coalesce .Values.persistence.storages.oxConnector.storageClassName .Values.persistence.storageClassNames.RWO | quote }}
 
 podAnnotations:
-  {{ .Values.annotations.nubusOxConnector.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "open-xchange-connector"
+  {{- with .Values.annotations.nubusOxConnector.pod }}
+  {{ . | toYaml | nindent 2 }}
+  {{- end }}
 
 replicaCount: {{ .Values.replicas.oxConnector }}
 
diff --git a/helmfile/apps/open-xchange/values-postfix.yaml.gotmpl b/helmfile/apps/open-xchange/values-postfix.yaml.gotmpl
index a7d74f1c..e67364f4 100644
--- a/helmfile/apps/open-xchange/values-postfix.yaml.gotmpl
+++ b/helmfile/apps/open-xchange/values-postfix.yaml.gotmpl
@@ -91,7 +91,10 @@ postfix:
   virtualTransport: "lmtps:dovecot:24"
 
 podAnnotations:
-  {{ .Values.annotations.openxchangePostfix.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "open-xchange-postfix"
+  {{- with .Values.annotations.openxchangePostfix.pod }}
+  {{ . | toYaml | nindent 2 }}
+  {{- end }}
 
 replicaCount: {{ .Values.replicas.postfix }}
 
diff --git a/helmfile/apps/opendesk-migrations-post/values.yaml.gotmpl b/helmfile/apps/opendesk-migrations-post/values.yaml.gotmpl
index 9680dfce..94f00dac 100644
--- a/helmfile/apps/opendesk-migrations-post/values.yaml.gotmpl
+++ b/helmfile/apps/opendesk-migrations-post/values.yaml.gotmpl
@@ -5,7 +5,10 @@ additionalAnnotations:
   {{ .Values.annotations.opendeskMigrationsPost.additional | toYaml | nindent 2 }}
 
 podAnnotations:
-  {{ .Values.annotations.opendeskMigrationsPost.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "opendesk-migrations-post"
+  {{- with .Values.annotations.opendeskMigrationsPost.pod }}
+  {{ . | toYaml | nindent 2 }}
+  {{- end }}
 
 serviceAccount:
   annotations:
diff --git a/helmfile/apps/opendesk-openproject-bootstrap/values.yaml.gotmpl b/helmfile/apps/opendesk-openproject-bootstrap/values.yaml.gotmpl
index ae6c8b72..6463b015 100644
--- a/helmfile/apps/opendesk-openproject-bootstrap/values.yaml.gotmpl
+++ b/helmfile/apps/opendesk-openproject-bootstrap/values.yaml.gotmpl
@@ -74,7 +74,10 @@ job:
   enabled: true
 
 podAnnotations:
-  {{ .Values.annotations.openprojectBootstrap.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "opendesk-openproject-bootstrap"
+  {{- with .Values.annotations.openprojectBootstrap.pod }}
+  {{ . | toYaml | nindent 2 }}
+  {{- end }}
 
 podSecurityContext:
   enabled: true
diff --git a/helmfile/apps/opendesk-services/values-opendesk-static-files.yaml.gotmpl b/helmfile/apps/opendesk-services/values-opendesk-static-files.yaml.gotmpl
index 185e6c71..28e207f7 100644
--- a/helmfile/apps/opendesk-services/values-opendesk-static-files.yaml.gotmpl
+++ b/helmfile/apps/opendesk-services/values-opendesk-static-files.yaml.gotmpl
@@ -116,7 +116,10 @@ image:
   imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
 
 podAnnotations:
-  {{ .Values.annotations.opendeskServicesStaticFiles.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "opendesk-static-files"
+  {{- with .Values.annotations.opendeskServicesStaticFiles.pod }}
+  {{ . | toYaml | nindent 2 }}
+  {{- end }}
 
 podSecurityContext:
   enabled: true
diff --git a/helmfile/apps/opendesk-services/values-otterize.yaml.gotmpl b/helmfile/apps/opendesk-services/values-otterize.yaml.gotmpl
index 565f3386..51a69100 100644
--- a/helmfile/apps/opendesk-services/values-otterize.yaml.gotmpl
+++ b/helmfile/apps/opendesk-services/values-otterize.yaml.gotmpl
@@ -10,12 +10,18 @@ additionalAnnotations:
   {{ .Values.annotations.opendeskServicesOtterize.additional | toYaml | nindent 2 }}
 
 apps:
+  cassandra:
+    enabled: {{ .Values.apps.cassandra.enabled }}
+  certificates:
+    enabled: {{ .Values.apps.certificates.enabled }}
   clamavDistributed:
     enabled: {{ .Values.apps.clamavDistributed.enabled }}
   clamavSimple:
     enabled: {{ .Values.apps.clamavSimple.enabled }}
   collabora:
     enabled: {{ .Values.apps.collabora.enabled }}
+  collaboraController:
+    enabled: {{ .Values.apps.collaboraController.enabled }}
   cryptpad:
     enabled: {{ .Values.apps.cryptpad.enabled }}
   dkimpy:
@@ -24,6 +30,12 @@ apps:
     enabled: {{ .Values.apps.dovecot.enabled }}
   element:
     enabled: {{ .Values.apps.element.enabled }}
+  elementAdmin:
+    enabled: {{ .Values.apps.elementAdmin.enabled }}
+  elementGroupsync:
+    enabled: {{ .Values.apps.elementGroupsync.enabled }}
+  home:
+    enabled: {{ .Values.apps.home.enabled }}
   jitsi:
     enabled: {{ .Values.apps.jitsi.enabled }}
   mariadb:
@@ -42,7 +54,7 @@ apps:
     enabled: {{ .Values.apps.nubus.enabled }}
   openproject:
     enabled: {{ .Values.apps.openproject.enabled }}
-  oxAppsuite:
+  oxAppSuite:
     enabled: {{ .Values.apps.oxAppSuite.enabled }}
   postfix:
     enabled: {{ .Values.apps.postfix.enabled }}
@@ -50,6 +62,8 @@ apps:
     enabled: {{ .Values.apps.postgresql.enabled }}
   redis:
     enabled: {{ .Values.apps.redis.enabled }}
+  staticFiles:
+    enabled: {{ .Values.apps.staticFiles.enabled }}
   xwiki:
     enabled: {{ .Values.apps.xwiki.enabled }}
 
diff --git a/helmfile/apps/openproject/values.yaml.gotmpl b/helmfile/apps/openproject/values.yaml.gotmpl
index 9c5af17a..8c366342 100644
--- a/helmfile/apps/openproject/values.yaml.gotmpl
+++ b/helmfile/apps/openproject/values.yaml.gotmpl
@@ -131,7 +131,10 @@ persistence:
   enabled: false
 
 podAnnotations:
-  {{ .Values.annotations.openproject.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "openproject"
+  {{- with .Values.annotations.openproject.pod }}
+  {{ . | toYaml | nindent 2 }}
+  {{- end }}
 
 postgresql:
   bundled: false
diff --git a/helmfile/apps/services-external/values-cassandra.yaml.gotmpl b/helmfile/apps/services-external/values-cassandra.yaml.gotmpl
index a1fd9ae8..100ce239 100644
--- a/helmfile/apps/services-external/values-cassandra.yaml.gotmpl
+++ b/helmfile/apps/services-external/values-cassandra.yaml.gotmpl
@@ -73,8 +73,10 @@ persistence:
   storageClass: {{ coalesce .Values.persistence.storages.cassandra.storageClassName .Values.persistence.storageClassNames.RWO | quote }}
 
 podAnnotations:
-  {{ .Values.annotations.cassandra.pod | toYaml | nindent 2 }}
-
+  intents.otterize.com/service-name: "cassandra"
+  {{- with .Values.annotations.cassandra.pod }}
+  {{ . | toYaml | nindent 2 }}
+  {{- end }}
 podSecurityContext:
   enabled: true
   fsGroup: 1001
diff --git a/helmfile/apps/services-external/values-clamav-distributed.yaml.gotmpl b/helmfile/apps/services-external/values-clamav-distributed.yaml.gotmpl
index 11ce3961..d084c0a2 100644
--- a/helmfile/apps/services-external/values-clamav-distributed.yaml.gotmpl
+++ b/helmfile/apps/services-external/values-clamav-distributed.yaml.gotmpl
@@ -26,7 +26,10 @@ clamd:
     tag: {{ .Values.images.clamd.tag | quote }}
     imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
   podAnnotations:
-    {{ .Values.annotations.servicesExternalClamavDistributed.clamdPod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "clamav-distributed"
+    {{- with .Values.annotations.servicesExternalClamavDistributed.clamdPod }}
+    {{ .  | toYaml | nindent 4 }}
+    {{- end }}
   podSecurityContext:
     enabled: true
     fsGroup: 101
@@ -81,7 +84,10 @@ freshclam:
     tag: {{ .Values.images.freshclam.tag | quote }}
     imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
   podAnnotations:
-    {{ .Values.annotations.servicesExternalClamavDistributed.freshclamPod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "clamav-freshclam"
+    {{- with .Values.annotations.servicesExternalClamavDistributed.freshclamPod }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   podSecurityContext:
     enabled: true
     fsGroup: 101
@@ -129,7 +135,10 @@ icap:
     tag: {{ .Values.images.icap.tag | quote }}
     imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
   podAnnotations:
-    {{ .Values.annotations.servicesExternalClamavDistributed.icapPod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "clamav-icap"
+    {{- with .Values.annotations.servicesExternalClamavDistributed.icapPod }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   podSecurityContext:
     enabled: true
     fsGroup: 101
@@ -169,7 +178,10 @@ milter:
     tag: {{ .Values.images.milter.tag | quote }}
     imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
   podAnnotations:
-    {{ .Values.annotations.servicesExternalClamavDistributed.milterPod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "clamav-milter"
+    {{- with .Values.annotations.servicesExternalClamavDistributed.milterPod }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   podSecurityContext:
     enabled: true
     fsGroup: 101
diff --git a/helmfile/apps/services-external/values-clamav-simple.yaml.gotmpl b/helmfile/apps/services-external/values-clamav-simple.yaml.gotmpl
index 3a25d1b6..ffc434c0 100644
--- a/helmfile/apps/services-external/values-clamav-simple.yaml.gotmpl
+++ b/helmfile/apps/services-external/values-clamav-simple.yaml.gotmpl
@@ -44,7 +44,10 @@ persistence:
     {{ .Values.annotations.servicesExternalClamavSimple.persistence | toYaml | nindent 4 }}
 
 podAnnotations:
-  {{ .Values.annotations.servicesExternalClamavSimple.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "clamav-simple"
+  {{- with .Values.annotations.servicesExternalClamavSimple.pod }}
+  {{ .  | toYaml | nindent 2 }}
+  {{- end }}
 
 podSecurityContext:
   enabled: true
diff --git a/helmfile/apps/services-external/values-dkimpy.yaml.gotmpl b/helmfile/apps/services-external/values-dkimpy.yaml.gotmpl
index ab51c42c..c1f23e8a 100644
--- a/helmfile/apps/services-external/values-dkimpy.yaml.gotmpl
+++ b/helmfile/apps/services-external/values-dkimpy.yaml.gotmpl
@@ -30,7 +30,10 @@ image:
   imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
 
 podAnnotations:
-  {{ .Values.annotations.servicesExternalDkimpy.service | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "dkimpy-milter"
+  {{- with .Values.annotations.servicesExternalDkimpy.service }}
+  {{ .  | toYaml | nindent 2 }}
+  {{- end }}
 
 podSecurityContext:
   enabled: true
diff --git a/helmfile/apps/services-external/values-mariadb.yaml.gotmpl b/helmfile/apps/services-external/values-mariadb.yaml.gotmpl
index ff2190c8..ef4db136 100644
--- a/helmfile/apps/services-external/values-mariadb.yaml.gotmpl
+++ b/helmfile/apps/services-external/values-mariadb.yaml.gotmpl
@@ -78,6 +78,7 @@ persistence:
     {{ .Values.annotations.servicesExternalMariadb.persistence | toYaml | nindent 4 }}
 
 podAnnotations:
+  intents.otterize.com/service-name: "mariadb"
   argocd.argoproj.io/hook: "PostSync"
   argocd.argoproj.io/hook-delete-policy: "BeforeHookCreation"
   {{- with .Values.annotations.servicesExternalMariadb.pod }}
diff --git a/helmfile/apps/services-external/values-memcached.yaml.gotmpl b/helmfile/apps/services-external/values-memcached.yaml.gotmpl
index 4837c54b..2492c8a1 100644
--- a/helmfile/apps/services-external/values-memcached.yaml.gotmpl
+++ b/helmfile/apps/services-external/values-memcached.yaml.gotmpl
@@ -34,8 +34,10 @@ image:
   pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
 
 podAnnotations:
-  {{ .Values.annotations.servicesExternalMemcached.pod | toYaml | nindent 2 }}
-
+  intents.otterize.com/service-name: "memcached"
+  {{- with .Values.annotations.servicesExternalMemcached.pod }}
+  {{ .  | toYaml | nindent 2 }}
+  {{- end}}
 replicaCount: {{ .Values.replicas.memcached }}
 
 resources:
diff --git a/helmfile/apps/services-external/values-minio.yaml.gotmpl b/helmfile/apps/services-external/values-minio.yaml.gotmpl
index 7b1cfefd..e68abfcd 100644
--- a/helmfile/apps/services-external/values-minio.yaml.gotmpl
+++ b/helmfile/apps/services-external/values-minio.yaml.gotmpl
@@ -134,7 +134,10 @@ provisioning:
       withLock: false
     {{- end }}
   podAnnotations:
-    {{ .Values.annotations.servicesExternalMinio.provisioningPod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "minio-provisioning"
+    {{- with .Values.annotations.servicesExternalMinio.provisioningPod }}
+    {{ .  | toYaml | nindent 4}}
+    {{- end }}
   policies:
     - name: "migrations-bucket-policy"
       statements:
@@ -271,7 +274,10 @@ provisioning:
     {{ .Values.resources.minio | toYaml | nindent 4 }}
 
 podAnnotations:
-  {{ .Values.annotations.servicesExternalMinio.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "minio"
+  {{- with .Values.annotations.servicesExternalMinio.pod }}
+  {{ . | toYaml | nindent 2 }}
+  {{- end }}
 
 readinessProbe:
   enabled: true
diff --git a/helmfile/apps/services-external/values-postfix.yaml.gotmpl b/helmfile/apps/services-external/values-postfix.yaml.gotmpl
index d98a9236..a736bc40 100644
--- a/helmfile/apps/services-external/values-postfix.yaml.gotmpl
+++ b/helmfile/apps/services-external/values-postfix.yaml.gotmpl
@@ -41,7 +41,10 @@ persistence:
     {{ .Values.annotations.servicesExternalPostfix.persistence | toYaml | nindent 4 }}
 
 podAnnotations:
-  {{ .Values.annotations.servicesExternalPostfix.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "postfix"
+  {{- with .Values.annotations.servicesExternalPostfix.pod }}
+  {{ . | toYaml | nindent 2}}
+  {{- end}}
 
 podSecurityContext:
   enabled: true
@@ -106,8 +109,6 @@ postfix:
   virtualTransport: "lmtps:dovecot:24"
   {{- end }}
 
-podAnnotations: {}
-
 replicaCount: {{ .Values.replicas.postfix }}
 
 resources:
diff --git a/helmfile/apps/services-external/values-postgresql.yaml.gotmpl b/helmfile/apps/services-external/values-postgresql.yaml.gotmpl
index 447a0c7a..1e4c59e3 100644
--- a/helmfile/apps/services-external/values-postgresql.yaml.gotmpl
+++ b/helmfile/apps/services-external/values-postgresql.yaml.gotmpl
@@ -115,6 +115,7 @@ persistence:
     {{ .Values.annotations.servicesExternalPostgresql.persistence | toYaml | nindent 4 }}
 
 podAnnotations:
+  intents.otterize.com/service-name: "postgresql"
   argocd.argoproj.io/hook: "PostSync"
   argocd.argoproj.io/hook-delete-policy: "BeforeHookCreation"
   {{- with .Values.annotations.servicesExternalPostgresql.pod}}
diff --git a/helmfile/apps/services-external/values-redis.yaml.gotmpl b/helmfile/apps/services-external/values-redis.yaml.gotmpl
index d72dc43f..b7d81579 100644
--- a/helmfile/apps/services-external/values-redis.yaml.gotmpl
+++ b/helmfile/apps/services-external/values-redis.yaml.gotmpl
@@ -44,7 +44,10 @@ master:
     annotations:
       {{ .Values.annotations.servicesExternalRedis.masterPersistence | toYaml | nindent 6 }}
   podAnnotations:
-    {{ .Values.annotations.servicesExternalRedis.masterPod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "redis"
+    {{- with .Values.annotations.servicesExternalRedis.masterPod }}
+    {{ . | toYaml | nindent 4  }}
+    {{- end }}
   resources:
     {{ .Values.resources.redis | toYaml | nindent 4 }}
   service:
diff --git a/helmfile/environments/default/annotations.yaml.gotmpl b/helmfile/environments/default/annotations.yaml.gotmpl
index 32ad72e8..3712b4d0 100644
--- a/helmfile/environments/default/annotations.yaml.gotmpl
+++ b/helmfile/environments/default/annotations.yaml.gotmpl
@@ -376,7 +376,12 @@ annotations:
     clamdPod: ~
     clamdService: ~
     clamdServiceAccount: ~
+    icapCommon: ~
+    icapPod: ~
+    icapService: ~
+    icapServiceAccount: ~
     freshclamCommon: ~
+    freshclamPod: ~
     freshclamService: ~
     freshclamServiceAccount: ~
     milterCommon: ~