diff --git a/helmfile/apps/open-xchange/values-dovecot.yaml.gotmpl b/helmfile/apps/open-xchange/values-dovecot.yaml.gotmpl
index 4d4cfca1..d0b96f9c 100644
--- a/helmfile/apps/open-xchange/values-dovecot.yaml.gotmpl
+++ b/helmfile/apps/open-xchange/values-dovecot.yaml.gotmpl
@@ -55,6 +55,13 @@ dovecot:
   sieve:
     notify:
       mailtoEnvelopeFrom: "orig_recipient"
+  pushNotification:
+    enabled: true
+    host: "open-xchange-core-mw-http-api"
+    username:
+      value: "oxlogin"
+    password:
+      value: {{ .Values.secrets.oxAppSuite.basicAuthPassword | quote }}
   submission:
     enabled: true
     ssl: "no"
diff --git a/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl b/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl
index fc1e3727..11ec4706 100644
--- a/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl
+++ b/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl
@@ -91,7 +91,7 @@ appsuite:
   appsuite-toolkit:
     enabled: false
   switchboard:
-    enabled: false
+    enabled: true
   istio:
     enabled: false
   ingress:
@@ -365,6 +365,10 @@ appsuite:
         open-xchange-documents-templates: "disabled"
         # Required for the central contacts integration
         open-xchange-oauth-provider: "enabled"
+        # Required for push notifications from Dovecot
+        open-xchange-push-dovecot: "enabled"
+        open-xchange-rest: "enabled"
+        open-xchange-pns-impl: "enabled"
         # Needed to set com.openexchange.hostname
         open-xchange-hostname-config-cascade: "enabled"
         # Enable s3 storage
@@ -422,6 +426,15 @@ appsuite:
       com.openexchange.oauth.provider.mode: "expect_jwt"
       com.openexchange.oauth.provider.userLookupNamePart: "full"
       com.openexchange.oauth.provider.userLookupClaim: "opendesk_username"
+      # PUSH
+      com.openexchange.pns.transport.webhooks.enabled: "true"
+      com.openexchange.pns.transport.webhooks.allowLocalWebhooks: "true"
+      com.openexchange.pns.transport.webhooks.httpsOnly: "false"
+      com.openexchange.pns.transport.webhooks.allowTrustAll: "true"
+      com.openexchange.webhooks.enabledIds: switchboard
+      com.openexchange.push.credstorage.enabled: "true"
+      com.openexchange.push.dovecot.enabled: "true"
+      #com.openexchange.push.dovecot.preferDoveadmForMetadata: "true"
       # MAIL
       com.openexchange.mail.authType: "xoauth2"
       com.openexchange.mail.loginSource: "name"
@@ -548,6 +561,11 @@ appsuite:
         MASTER_ACCOUNT_OVERRIDE: "true"
       /opt/open-xchange/etc/AdminUser.properties:
         USERNAME_CHANGEABLE: "true"
+      #/opt/open-xchange/etc/doveadm.properties:
+      #  #com.openexchange.dovecot.doveadm.enabled: "true"
+      #  #com.openexchange.dovecot.doveadm.endpoints: "http://dovecot:8080/doveadm/v1"
+      #  #com.openexchange.dovecot.doveadm.apiSecret: {{ printf "X-Dovecot-API %s" (.Values.secrets.dovecot.doveadm | b64enc ) | quote }}
+      #  #com.openexchange.dovecot.doveadm.apiSecret: {{ .Values.secrets.dovecot.doveadm | quote }}
       /opt/open-xchange/etc/antivirus.properties:
         com.openexchange.antivirus.enabled: "true"
         {{- if .Values.antivirus.icap.host }}
@@ -572,6 +590,12 @@ appsuite:
         bindDN: "uid=ldapsearch_ox,cn=users,{{ .Values.ldap.baseDn }}"
         bindDNPassword: {{ .Values.secrets.nubus.ldapSearch.ox | quote }}
         bindOnly: "false"
+      /opt/open-xchange/etc/mail-push.properties:
+        com.openexchange.push.allowPermanentPush: "true"
+        com.openexchange.push.allowedClients: "USM-EAS*, open-xchange-mobile-api-facade*, open-xchange-appsuite*"
+        com.openexchange.push.credstorage.enabled: "true"
+        com.openexchange.push.credstorage.passcrypt: "abcd123"
+        com.openexchange.push.dovecot.enabled: "true"
       /opt/open-xchange/etc/noreply.properties:
         com.openexchange.noreply.address: "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.mailDomain | default .Values.global.domain }}"
         com.openexchange.noreply.login: {{ printf "%s@%s" "opendesk-system" ( .Values.global.mailDomain | default .Values.global.domain ) }}
@@ -579,6 +603,9 @@ appsuite:
         com.openexchange.noreply.server: "postfix"
         com.openexchange.noreply.port: "25"
         com.openexchange.noreply.secureMode: "plain"
+      /opt/open-xchange/etc/settings/switchboard.properties:
+        io.ox/switchboard//host: open-xchange-core-mw-http-api
+        io.ox/switchboard//apiRoot: /switchboard/
       /opt/open-xchange/etc/system.properties:
         SERVER_NAME: "oxserver"
     uiSettings:
@@ -587,6 +614,8 @@ appsuite:
       # Show the Enterprise Picker in the top right corner instead of the launcher drop-down
       io.ox/core//features/enterprisePicker/showLauncher: "false"
       io.ox/core//features/enterprisePicker/showTopRightLauncher: "true"
+      # Push
+      io.ox/core//features/pns: "true"
       # Text and icon color in the topbar
       io.ox/dynamic-theme//topbarColor: "#000"
       io.ox/dynamic-theme//logoWidth: "82"
@@ -963,4 +992,13 @@ appsuite:
         {{ .Values.seLinuxOptions.openxchangeCoreUserGuide | toYaml | nindent 8 }}
     serviceAccount:
       create: false
+
+  switchboard:
+    image:
+      registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.openxchangeSwitchboard.registry | quote }}
+      repository: {{ .Values.images.openxchangeSwitchboard.repository | quote }}
+      tag: {{ .Values.images.openxchangeSwitchboard.tag | quote }}
+      pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
+    jwt:
+      sharedSecret: "asdf123123!"
 ...
diff --git a/helmfile/environments/default-enterprise-overrides/charts.yaml.gotmpl b/helmfile/environments/default-enterprise-overrides/charts.yaml.gotmpl
index ea0bbd40..9341bd59 100644
--- a/helmfile/environments/default-enterprise-overrides/charts.yaml.gotmpl
+++ b/helmfile/environments/default-enterprise-overrides/charts.yaml.gotmpl
@@ -6,7 +6,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "zendis/opendesk-enterprise/components/product-development/charts/opendesk-dovecot-pro"
     name: "dovecot"
-    version: "3.1.8"
+    version: "3.1.9-fix-ox-optimizations"
     verify: true
   oxAppSuite:
     registry: "registry.opencode.de"
diff --git a/helmfile/environments/default/charts.yaml.gotmpl b/helmfile/environments/default/charts.yaml.gotmpl
index 6f52fa80..ac022e1a 100644
--- a/helmfile/environments/default/charts.yaml.gotmpl
+++ b/helmfile/environments/default/charts.yaml.gotmpl
@@ -97,7 +97,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-dovecot"
     name: "dovecot"
-    version: "3.1.5"
+    version: "3.1.6-fix-ox-optimizations"
     verify: true
   element:
     # providerCategory: "Platform"
diff --git a/helmfile/environments/default/images.yaml.gotmpl b/helmfile/environments/default/images.yaml.gotmpl
index e56f5685..8a6f5660 100644
--- a/helmfile/environments/default/images.yaml.gotmpl
+++ b/helmfile/environments/default/images.yaml.gotmpl
@@ -899,6 +899,16 @@ images:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/open-xchange/images-mirror/public-sector-ui"
     tag: "2.5.0@sha256:e7838687b30eb7d4976e9e0c99d23cdc0cc59b1f38d322dc8562905a723218bf"
+  openxchangeSwitchboard:
+    # providerCategory: "Supplier"
+    # providerResponsible: "Open-Xchange"
+    # upstreamRegistry: "https://registry.open-xchange.com"
+    # upstreamRepository: "appsuite-public-sector/switchboard"
+    # upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)$'
+    # upstreamMirrorStartFrom: ["5", "1", "4"]
+    registry: "registry.opencode.de"
+    repository: "bmi/opendesk/components/supplier/open-xchange/images-mirror/switchboard"
+    tag: "5.1.4@sha256:603870c99d15156ca613913820a4a907e808b908711e99ea3d6f63fac0edc217"
   oxConnector:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"