diff --git a/charts/stable/anonaddy/Chart.yaml b/charts/stable/anonaddy/Chart.yaml
index 6dce73db306..bf474e3c5a9 100644
--- a/charts/stable/anonaddy/Chart.yaml
+++ b/charts/stable/anonaddy/Chart.yaml
@@ -26,7 +26,7 @@ name: anonaddy
 sources:
   - https://github.com/truecharts/charts/tree/master/charts/stable/anonaddy
   - https://github.com/anonaddy/docker
-version: 15.0.3
+version: 15.0.4
 annotations:
   truecharts.org/catagories: |
     - email
diff --git a/charts/stable/anonaddy/questions.yaml b/charts/stable/anonaddy/questions.yaml
index e15180e3084..bfe8ea273fa 100644
--- a/charts/stable/anonaddy/questions.yaml
+++ b/charts/stable/anonaddy/questions.yaml
@@ -19,11 +19,57 @@ questions:
                                     type: dict
                                     attrs:
                                       - variable: ANONADDY_DOMAIN
-                                        label: "ANONADDY_DOMAIN"
+                                        label: "Anonaddy Domain"
+                                        schema:
+                                          type: string
+                                          required: true
+                                          default: ""
+                                      - variable: APP_URL
+                                        label: "App Url"
                                         schema:
                                           type: string
                                           default: ""
-                                          required: true
+                                      - variable: MAIL_FROM_NAME
+                                        label: "Mail From Name"
+                                        schema:
+                                          type: string
+                                          default: ""
+                                      - variable: MAIL_FROM_ADDRESS
+                                        label: "Mail From Address"
+                                        schema:
+                                          type: string
+                                          default: ""
+                                      - variable: MAIL_FROM_ADDRESS
+                                        label: "Mail From Address"
+                                        schema:
+                                          type: string
+                                          default: ""
+                                      - variable: MAIL_HOST
+                                        label: "Mail Host"
+                                        schema:
+                                          type: string
+                                          default: ""
+                                      - variable: MAIL_PORT
+                                        label: "Mail Port"
+                                        schema:
+                                          type: int
+                                          default: 587
+                                      - variable: MAIL_ENCRYPTION
+                                        label: "Mail Encryption"
+                                        schema:
+                                          type: string
+                                          default: "tls"
+                                      - variable: MAIL_EHLO_DOMAIN
+                                        label: "Mail Ehlo Domain"
+                                        schema:
+                                          type: string
+                                          default: ""
+                                      - variable: MAIL_VERIFY_PEER
+                                        label: "Mail Verify Peer"
+                                        schema:
+                                          type: boolean
+                                          default: false
+
 # Include{containerBasic}
 # Include{containerAdvanced}
 # Include{containerConfig}
diff --git a/charts/stable/anonaddy/templates/_secrets.tpl b/charts/stable/anonaddy/templates/_secrets.tpl
index 636f5014742..3d55859df05 100644
--- a/charts/stable/anonaddy/templates/_secrets.tpl
+++ b/charts/stable/anonaddy/templates/_secrets.tpl
@@ -13,7 +13,7 @@ enabled: true
 data:
   # Anonaddy requires APP_KEY to be in base 64 format presented in the container, so this b64enc here is intentional
   # https://github.com/anonaddy/docker/blob/master/README.md#app
-  APP_KEY: {{ $appKey | b64enc }}
+  APP_KEY: {{ printf "base64:%v" ($appKey | b64enc) }}
   # Anonaddy requires ANONADDY_SECRET to be a long string
   ANONADDY_SECRET: {{ $secretKey }}
 {{- end -}}
diff --git a/charts/stable/anonaddy/values.yaml b/charts/stable/anonaddy/values.yaml
index a48bbc669bf..bd61d10be96 100644
--- a/charts/stable/anonaddy/values.yaml
+++ b/charts/stable/anonaddy/values.yaml
@@ -41,8 +41,20 @@ workload:
               type: tcp
           env:
             ANONADDY_DOMAIN: "chart-example.local"
-            DB_DATABASE: anonaddy
-            DB_USERNAME: anonaddy
+            APP_URL: "http://localhost:10110"
+            # The from name to be used for outgoing email notifications from AnonAddy
+            MAIL_FROM_NAME: Example
+            # The from address to be used for outgoing email notifications from AnonAddy
+            MAIL_FROM_ADDRESS: mailer@example.com
+            # just smtp is configurable
+            MAIL_DRIVER: smtp
+            MAIL_HOST: mail.example.com
+            MAIL_PORT: 25
+            MAIL_ENCRYPTION: tls
+            MAIL_EHLO_DOMAIN: mail.example.com
+            MAIL_VERIFY_PEER: false
+            DB_DATABASE: "{{ .Values.mariadb.mariadbDatabase }}"
+            DB_USERNAME: "{{ .Values.mariadb.mariadbUsername }}"
             DB_HOST:
               secretKeyRef:
                 expandObjectName: false