diff --git a/charts/ghost/Chart.lock b/charts/ghost/Chart.lock
index 1596053031e2db32833f29cabfc031c95e8ded33..46046c1397a07dd91ded0f2408569e3c7df88a2b 100644
--- a/charts/ghost/Chart.lock
+++ b/charts/ghost/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: mariadb
   repository: https://groundhog2k.github.io/helm-charts
-  version: 0.2.8
-digest: sha256:6ae732ab7bb3c3996253ea9520fd42c5a4bad7d298d55f7cb848634139b267d6
-generated: "2021-02-03T16:47:20.6764971+01:00"
+  version: 0.2.9
+digest: sha256:456a570d31d6f987484bb7ba7d4a14dc640ecbd920369b4e63799330d0d27460
+generated: "2021-02-04T13:51:17.7657885+01:00"
diff --git a/charts/ghost/Chart.yaml b/charts/ghost/Chart.yaml
index 51259febbfaf044290cfacf2901c40f5d359d52f..f0d3259891b4f7ba211f80556e4cd2b7e4677ac0 100644
--- a/charts/ghost/Chart.yaml
+++ b/charts/ghost/Chart.yaml
@@ -7,12 +7,12 @@ type: application
 maintainers:
   - name: groundhog2k
 
-version: 0.2.14
+version: 0.2.15
 
 appVersion: "3.41.3"
 
 dependencies:
   - name: mariadb
-    version: 0.2.8
+    version: 0.2.9
     repository: "https://groundhog2k.github.io/helm-charts"
     condition: mariadb.enabled
diff --git a/charts/ghost/README.md b/charts/ghost/README.md
index d0932739a78b35462eb97383afe6acc7b66d110b..276adf7821f1c0311a5249eadeed7620e662ab0e 100644
--- a/charts/ghost/README.md
+++ b/charts/ghost/README.md
@@ -1,6 +1,6 @@
 # Ghost
 
-![Version: 0.2.14](https://img.shields.io/badge/Version-0.2.14-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.41.3](https://img.shields.io/badge/AppVersion-3.41.3-informational?style=flat-square)
+![Version: 0.2.15](https://img.shields.io/badge/Version-0.2.15-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.41.3](https://img.shields.io/badge/AppVersion-3.41.3-informational?style=flat-square)
 
 A Helm chart for Ghost blog on Kubernetes
 
@@ -43,7 +43,7 @@ $ helm uninstall my-release
 
 | Repository | Name | Version |
 |------------|------|---------|
-| @groundhog2k | mariadb | 0.2.8 |
+| @groundhog2k | mariadb | 0.2.9 |
 
 ## Common parameters
 
diff --git a/charts/ghost/charts/mariadb-0.2.8.tgz b/charts/ghost/charts/mariadb-0.2.8.tgz
deleted file mode 100644
index 19b04962300d9b10b6c7263a9dab310f9c2f186e..0000000000000000000000000000000000000000
Binary files a/charts/ghost/charts/mariadb-0.2.8.tgz and /dev/null differ
diff --git a/charts/ghost/charts/mariadb-0.2.9.tgz b/charts/ghost/charts/mariadb-0.2.9.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..216ca2b342f8b2261ce5c3edbc8a3f53b6ae357c
Binary files /dev/null and b/charts/ghost/charts/mariadb-0.2.9.tgz differ
diff --git a/charts/ghost/templates/deployment.yaml b/charts/ghost/templates/deployment.yaml
index 922d26fcd514b7ca36a4d5d498f8296c81993549..0da7887a10df136d5415ce6ec30bfedb734d833e 100644
--- a/charts/ghost/templates/deployment.yaml
+++ b/charts/ghost/templates/deployment.yaml
@@ -50,31 +50,29 @@ spec:
           env:
             {{- if .Values.settings.url }}
             - name: url
-              value: {{ .Values.settings.url }}
+              value: {{ .Values.settings.url | quote }}
             {{- end }}
-            {{- if .Values.settings.mail.from }}
+            {{- with .Values.settings.mail }}
+            {{- if .from }}
             - name: mail__from
-              value: {{ .Values.settings.mail.from | quote }}
+              value: {{ .from | quote }}
             {{- end }}
-            {{- if .Values.settings.mail.transport }}
+            {{- if .transport }}
             - name: mail__transport
-              value: {{ .Values.settings.mail.transport | quote }}
+              value: {{ .transport | quote }}
             {{- end }}
-            {{- if .Values.settings.mail.host }}
+            {{- if .host }}
             - name: mail__options__host
-              value: {{ .Values.settings.mail.host | quote }}
+              value: {{ .host | quote }}
             {{- end }}
-            {{- if .Values.settings.mail.port }}
+            {{- if .port }}
             - name: mail__options__port
-              value: {{ .Values.settings.mail.port | quote }}
+              value: {{ .port | quote }}
             {{- end }}
-            {{- if .Values.settings.mail.service }}
+            {{- if .service }}
             - name: mail__options__service
-              value: {{ .Values.settings.mail.service | quote }}
+              value: {{ .service | quote }}
             {{- end }}
-            {{- if .Values.settings.mail.user }}
-            - name: mail__options__auth__user
-              value: {{ .Values.settings.mail.user | quote }}
             {{- end }}
           {{- with .Values.env }}
             {{- toYaml . | nindent 12 }}
diff --git a/charts/ghost/templates/secureconfig.yaml b/charts/ghost/templates/secureconfig.yaml
index a375d6e8b461360b5af966e991817c72aac1a301..8f9df63d628e30e5daab5c1c3d081132674fc90d 100644
--- a/charts/ghost/templates/secureconfig.yaml
+++ b/charts/ghost/templates/secureconfig.yaml
@@ -28,6 +28,11 @@ data:
   {{- end }}
   {{- end }}
 {{- end }}
-{{- if .Values.settings.mail.password }}
-  mail__options__auth__pass: {{ .Values.settings.mail.password | b64enc }}
-{{- end }}
\ No newline at end of file
+{{- with .Values.settings.mail }}
+{{- if .user }}
+  mail__options__auth__user: {{ .user | b64enc }}
+{{- end }}
+{{- if .password }}
+  mail__options__auth__pass: {{ .password | b64enc }}
+{{- end }}
+{{- end }}