diff --git a/helmfile/apps/opendesk-migrations-pre/values.yaml.gotmpl b/helmfile/apps/opendesk-migrations-pre/values.yaml.gotmpl
index 1ec7e756..29375c24 100644
--- a/helmfile/apps/opendesk-migrations-pre/values.yaml.gotmpl
+++ b/helmfile/apps/opendesk-migrations-pre/values.yaml.gotmpl
@@ -5,7 +5,10 @@ additionalAnnotations:
   {{ .Values.annotations.opendeskMigrationsPre.additional | toYaml | nindent 2 }}
 
 podAnnotations:
-  {{ .Values.annotations.opendeskMigrationsPre.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "opendesk-migrations-pre"
+  {{- with .Values.annotations.opendeskMigrationsPre.pod  }}
+  {{ . | toYaml | nindent 2 }}
+  {{- end }}
 
 serviceAccount:
   annotations:
diff --git a/helmfile/apps/opendesk-services/values-otterize.yaml.gotmpl b/helmfile/apps/opendesk-services/values-otterize.yaml.gotmpl
index 51a69100..d07f1da9 100644
--- a/helmfile/apps/opendesk-services/values-otterize.yaml.gotmpl
+++ b/helmfile/apps/opendesk-services/values-otterize.yaml.gotmpl
@@ -67,11 +67,69 @@ apps:
   xwiki:
     enabled: {{ .Values.apps.xwiki.enabled }}
 
-ingressController:
-  {{ .Values.security.ingressController | toYaml | nindent 2 }}
+databases:
+  dovecotDictmap:
+    host: {{ .Values.databases.dovecotDictmap.host }}
+  dovecotACL:
+    host: {{ .Values.databases.dovecotACL.host }}
+  keycloak:
+    host: {{ .Values.databases.keycloak.host }}
+  keycloakExtension:
+    host: {{ .Values.databases.keycloakExtension.host }}
+  nextcloud:
+    host: {{ .Values.databases.nextcloud.host }}
+  notes:
+    host: {{ .Values.databases.notes.host }}
+  openproject:
+    host: {{ .Values.databases.openproject.host }}
+  oxAppSuite:
+    host: {{ .Values.databases.oxAppSuite.host }}
+  synapse:
+    host: {{ .Values.databases.synapse.host }}
+  umsAuthSession:
+    host: {{ .Values.databases.umsAuthSession.host }}
+  umsGuardianManagementApi:
+    host: {{ .Values.databases.umsGuardianManagementApi.host }}
+  umsNotificationsApi:
+    host: {{ .Values.databases.umsNotificationsApi.host }}
+  umsSelfservice:
+    host: {{ .Values.databases.umsSelfservice.host }}
+  xwiki:
+    host: {{ .Values.databases.xwiki.host }}
 
 extraApps:
   clusterPostfix:
     enabled: {{ .Values.security.clusterPostfix.enabled }}
     namespace: {{ .Values.security.clusterPostfix.namespace }}
+
+ingressController:
+  {{ .Values.security.ingressController | toYaml | nindent 2 }}
+
+monitoring:
+  prometheus:
+    serviceMonitors:
+      enabled: {{ .Values.monitoring.prometheus.serviceMonitors.enabled }}
+
+objectstores:
+  dovecot:
+    endpoint: {{ .Values.objectstores.dovecot.endpoint }}
+  migrations:
+    endpoint: {{ .Values.objectstores.migrations.endpoint }}
+  nextcloud:
+    endpoint: {{ .Values.objectstores.nextcloud.endpoint }}
+  notes:
+    endpoint: {{ .Values.objectstores.notes.endpoint }}
+  nubus:
+    endpoint: {{ .Values.objectstores.nubus.endpoint }}
+  openproject:
+    endpoint: {{ .Values.objectstores.openproject.endpoint }}
+  openxchange:
+    endpoint: {{ .Values.objectstores.openxchange.endpoint }}
+
+smtp:
+  host: {{ .Values.smtp.host }}
+
+extraIntents:
+  {{ .Values.extraIntents | toYaml | nindent 2 }}
+
 ...