diff --git a/apps/templates/sogo-helm.yaml b/apps/templates/sogo-helm.yaml
index 7a1cbf1..da2cf12 100644
--- a/apps/templates/sogo-helm.yaml
+++ b/apps/templates/sogo-helm.yaml
@@ -21,6 +21,8 @@ spec:
         values: |
           sogo:
             host: post.hensen.io
+            existingSecrets:
+              - sogo-secrets
           ingress:
             enabled: true
             className: nginx
@@ -47,9 +49,6 @@ spec:
           memcached:
             ## Only enable this if you don't have an external database
             enabled: false
-
-          existingSecrets:
-            - sogo-secrets
     - repoURL: https://github.com/rubenhensen/k8scd.git
       targetRevision: HEAD
       path: sogo
diff --git a/sogo/sogo-config-secret.yaml b/sogo/sogo-config-secret.yaml
index bd27e32..4c09cbc 100644
--- a/sogo/sogo-config-secret.yaml
+++ b/sogo/sogo-config-secret.yaml
@@ -13,29 +13,30 @@ spec:
     template:
       engineVersion: v2
       data:
-        SOGoProfileURL: "postgresql://{{ .postgres_user }}:{{ .postgres_pw }}@sogo-postgres-rw:5432/sogo/sogo_user_profile?sslmode=require"
-        OCSFolderInfoURL: "postgresql://{{ .postgres_user }}:{{ .postgres_pw }}@sogo-postgres-rw:5432/sogo/sogo_folder_info?sslmode=require"
-        OCSSessionsFolderURL: "postgresql://{{ .postgres_user }}:{{ .postgres_pw }}@sogo-postgres-rw:5432/sogo/sogo_sessions_folder?sslmode=require"
-        OCSCacheFolderURL: "postgresql://{{ .postgres_user }}:{{ .postgres_pw }}@sogo-postgres-rw:5432/sogo/sogo_cache_folder?sslmode=require"
-        OCSStoreURL: "postgresql://{{ .postgres_user }}:{{ .postgres_pw }}@sogo-postgres-rw:5432/sogo/sogo_store?sslmode=require"
-        OCSAclURL: "postgresql://{{ .postgres_user }}:{{ .postgres_pw }}@sogo-postgres-rw:5432/sogo/sogo_acl?sslmode=require"
-        SOGoUserSources__yaml: |
-          - type: imap
-            id: stalwart
-            canAuthenticate: YES
-            isAddressBook: NO
-            displayName: "Stalwart Mail"
-            hostname: "stalwart.stalwart.svc.cluster.local"
-            port: 993
-            encryption: tls
-            loginFieldNames:
-              - mail
-              - cn
-        SOGoIMAPServer: "imaps://stalwart.stalwart.svc.cluster.local:993"
-        SOGoSieveServer: "sieve://stalwart.stalwart.svc.cluster.local:4190"
-        SOGoSMTPServer: "stalwart.stalwart.svc.cluster.local"
-        SOGoMailDomain: "hensen.io"
-        SOGoForceExternalLoginWithEmail: "YES"
+        sogo-config__yaml: |
+          SOGoProfileURL: "postgresql://{{ .postgres_user }}:{{ .postgres_pw }}@sogo-postgres-rw:5432/sogo/sogo_user_profile?sslmode=require"
+          OCSFolderInfoURL: "postgresql://{{ .postgres_user }}:{{ .postgres_pw }}@sogo-postgres-rw:5432/sogo/sogo_folder_info?sslmode=require"
+          OCSSessionsFolderURL: "postgresql://{{ .postgres_user }}:{{ .postgres_pw }}@sogo-postgres-rw:5432/sogo/sogo_sessions_folder?sslmode=require"
+          OCSCacheFolderURL: "postgresql://{{ .postgres_user }}:{{ .postgres_pw }}@sogo-postgres-rw:5432/sogo/sogo_cache_folder?sslmode=require"
+          OCSStoreURL: "postgresql://{{ .postgres_user }}:{{ .postgres_pw }}@sogo-postgres-rw:5432/sogo/sogo_store?sslmode=require"
+          OCSAclURL: "postgresql://{{ .postgres_user }}:{{ .postgres_pw }}@sogo-postgres-rw:5432/sogo/sogo_acl?sslmode=require"
+          SOGoUserSources:
+            - type: imap
+              id: stalwart
+              canAuthenticate: YES
+              isAddressBook: NO
+              displayName: "Stalwart Mail"
+              hostname: "stalwart.stalwart.svc.cluster.local"
+              port: 993
+              encryption: tls
+              loginFieldNames:
+                - mail
+                - cn
+          SOGoIMAPServer: "imaps://stalwart.stalwart.svc.cluster.local:993"
+          SOGoSieveServer: "sieve://stalwart.stalwart.svc.cluster.local:4190"
+          SOGoSMTPServer: "stalwart.stalwart.svc.cluster.local"
+          SOGoMailDomain: "hensen.io"
+          SOGoForceExternalLoginWithEmail: "YES"
   dataFrom:
   - extract:
       key: kv/sogo