diff --git a/share/wildduck/index.yaml b/share/wildduck/index.yaml
index a36803b..1d79963 100644
--- a/share/wildduck/index.yaml
+++ b/share/wildduck/index.yaml
@@ -6,11 +6,21 @@ metadata:
   name: wildduck
   description: null
 options:
-  ingress-class:
-    default: traefik
+  sub-domain:
+    default: mail
     examples:
-    - traefik
+    - mail
     type: string
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  additional-domains:
+    default: []
+    items:
+      type: string
+    type: array
   redis:
     default:
       exporter:
@@ -44,61 +54,6 @@ options:
         default: 2Gi
         type: string
     type: object
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
-  sub-domain:
-    default: mail
-    examples:
-    - mail
-    type: string
-  backups:
-    default:
-      enable: false
-      endpoint: ''
-      key-id-key: s3-id
-      secret-key: s3-secret
-      secret-name: backup-settings
-    examples:
-    - enable: false
-      endpoint: ''
-      key-id-key: s3-id
-      secret-key: s3-secret
-      secret-name: backup-settings
-    properties:
-      enable:
-        default: false
-        type: boolean
-      endpoint:
-        default: ''
-        type: string
-      key-id-key:
-        default: s3-id
-        type: string
-      secret-key:
-        default: s3-secret
-        type: string
-      secret-name:
-        default: backup-settings
-        type: string
-    type: object
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  additional-domains:
-    default: []
-    items:
-      type: string
-    type: array
   images:
     default:
       haraka:
@@ -262,6 +217,51 @@ options:
             type: string
         type: object
     type: object
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  backups:
+    default:
+      enable: false
+      endpoint: ''
+      key-id-key: s3-id
+      secret-key: s3-secret
+      secret-name: backup-settings
+    examples:
+    - enable: false
+      endpoint: ''
+      key-id-key: s3-id
+      secret-key: s3-secret
+      secret-name: backup-settings
+    properties:
+      enable:
+        default: false
+        type: boolean
+      endpoint:
+        default: ''
+        type: string
+      key-id-key:
+        default: s3-id
+        type: string
+      secret-key:
+        default: s3-secret
+        type: string
+      secret-name:
+        default: backup-settings
+        type: string
+    type: object
 dependencies:
 - dist: null
   category: dbo
diff --git a/share/wildduck/mongo.tf b/share/wildduck/mongo.tf
index 483ae6f..c9a89db 100644
--- a/share/wildduck/mongo.tf
+++ b/share/wildduck/mongo.tf
@@ -80,18 +80,6 @@ resource "kubectl_manifest" "prj_mongo" {
         passwordSecretRef:
           name: "${var.instance}-${var.component}-mongo"
         roles:
-        - db: ${var.component}
-          name: readWrite
-        - db: zonemta
-          name: readWrite
-        scramCredentialsSecretName: "${var.instance}-${var.component}-mongo-scram"
-      - name: zonemta
-        db: zonemta
-        passwordSecretRef:
-          name: "${var.instance}-${var.component}-mongo"
-        roles:
-        - db: zonemta
-          name: readWrite
         - db: ${var.component}
           name: readWrite
         scramCredentialsSecretName: "${var.instance}-${var.component}-mongo-scram"
diff --git a/share/wildduck/wildduck.tf b/share/wildduck/wildduck.tf
index b93fa6e..9018a89 100644
--- a/share/wildduck/wildduck.tf
+++ b/share/wildduck/wildduck.tf
@@ -250,7 +250,7 @@ resource "kubectl_manifest" "wildduck_config" {
 
         # Optional database name or connection url for ZoneMTA queue database. This is
         # used to push outbound emails to the sending queue
-        # sender="zonemta"
+        sender="wildduck"
 
         #queued="mail"
       dkim.toml: |-
diff --git a/share/wildduck/zonemta.tf b/share/wildduck/zonemta.tf
index 9ad7e98..2ea56ef 100644
--- a/share/wildduck/zonemta.tf
+++ b/share/wildduck/zonemta.tf
@@ -120,7 +120,7 @@ resource "kubectl_manifest" "zonemta_config" {
         # Redis connection string
         redis="redis://${var.instance}-${var.component}-redis.${var.namespace}.svc:6379/2"
         # Database name for ZoneMTA data in MongoDB. In most cases it should be the same as in the connection string
-        # sender="zonemta"
+        sender="wildduck"
         # Database name for Wild Duck users
         # users="wildduck"
         # Database name for Wild Duck attachments