diff --git a/charts/commento/Chart.lock b/charts/commento/Chart.lock
index 9492e2a05afb283ce57daa2d07333dfe4e9b8f4c..e2dfcfdf5d90e3e9703a50dede040d930d04606a 100644
--- a/charts/commento/Chart.lock
+++ b/charts/commento/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: postgres
   repository: https://groundhog2k.github.io/helm-charts
-  version: 0.2.7
-digest: sha256:97ed1617bdb942a568743f608d7bbb9a6a9cd77278e6283670c1ab54b828d4fb
-generated: "2021-01-24T18:56:05.9746959+01:00"
+  version: 0.2.8
+digest: sha256:b401bb27daff914d4fed3bc41872e36b2c1ff1e40bb7358a952d166673c44b0a
+generated: "2021-02-04T12:42:30.9437886+01:00"
diff --git a/charts/commento/Chart.yaml b/charts/commento/Chart.yaml
index e3ea676a63f9df9592c1a964f6126fcb98720e8f..fcaf54dfaa7b75513253a2afd17d0251beb8d46d 100644
--- a/charts/commento/Chart.yaml
+++ b/charts/commento/Chart.yaml
@@ -7,12 +7,12 @@ type: application
 maintainers:
   - name: groundhog2k
 
-version: 0.1.10
+version: 0.1.11
 
 appVersion: "v1.8.0"
 
 dependencies:
   - name: postgres
-    version: 0.2.7
+    version: 0.2.8
     repository: "https://groundhog2k.github.io/helm-charts"
     condition: postgres.enabled
diff --git a/charts/commento/README.md b/charts/commento/README.md
index 2855311f0621a5989f687600c735f9db00ae8a90..65dc0ecad323616583a686a4a50f49cd64f6ae75 100644
--- a/charts/commento/README.md
+++ b/charts/commento/README.md
@@ -1,6 +1,6 @@
 # Commento
 
-![Version: 0.1.10](https://img.shields.io/badge/Version-0.1.10-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.8.0](https://img.shields.io/badge/AppVersion-v1.8.0-informational?style=flat-square)
+![Version: 0.1.11](https://img.shields.io/badge/Version-0.1.11-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.8.0](https://img.shields.io/badge/AppVersion-v1.8.0-informational?style=flat-square)
 
 A Helm chart for Commento on Kubernetes
 
@@ -45,7 +45,7 @@ $ helm uninstall my-release
 
 | Repository | Name | Version |
 |------------|------|---------|
-| @groundhog2k | postgres | 0.2.7 |
+| @groundhog2k | postgres | 0.2.8 |
 
 ## Common parameters
 
diff --git a/charts/commento/charts/postgres-0.2.7.tgz b/charts/commento/charts/postgres-0.2.7.tgz
deleted file mode 100644
index a8a63a1a22cfb6b9817154979215a15069d38d84..0000000000000000000000000000000000000000
Binary files a/charts/commento/charts/postgres-0.2.7.tgz and /dev/null differ
diff --git a/charts/commento/charts/postgres-0.2.8.tgz b/charts/commento/charts/postgres-0.2.8.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..935ddc1aa72cafc5562090b8cccec588bfc21869
Binary files /dev/null and b/charts/commento/charts/postgres-0.2.8.tgz differ
diff --git a/charts/commento/templates/_helpers.tpl b/charts/commento/templates/_helpers.tpl
index c40570258a2be974df78ffe9d32877064757c021..295a107a466ecf8c760cbee1e828ee7ec07a1a55 100644
--- a/charts/commento/templates/_helpers.tpl
+++ b/charts/commento/templates/_helpers.tpl
@@ -88,12 +88,12 @@ Commento settings via environment variables
   value: {{ (printf "%s://%s" .Values.settings.protocol .Values.ingress.host) | quote }}
 {{- with .Values.settings.smtp }}
   {{- if .enabled }}
- - name: COMMENTO_SMTP_HOST
-   value: {{ .host | quote }}
- - name: COMMENTO_SMTP_PORT
-   value: {{ .port | quote }}
- - name: COMMENTO_SMTP_FROM_ADDRESS
-   value: {{ .from | quote }}
+- name: COMMENTO_SMTP_HOST
+  value: {{ .host | quote }}
+- name: COMMENTO_SMTP_PORT
+  value: {{ .port | quote }}
+- name: COMMENTO_SMTP_FROM_ADDRESS
+  value: {{ .from | quote }}
   {{- end }}
 {{- end }}
 {{- end }}
diff --git a/charts/commento/templates/deployment.yaml b/charts/commento/templates/deployment.yaml
index 6ceedef86a7cd5ba8b34145fbfa6f2c9c0d058fa..4b150a691533869526f71e5f35ae8c31a87abc75 100644
--- a/charts/commento/templates/deployment.yaml
+++ b/charts/commento/templates/deployment.yaml
@@ -44,6 +44,10 @@ spec:
             - name: http
               containerPort: {{ .Values.containerPort }}
               protocol: TCP
+          {{- if .Values.customLivenessProbe }}
+          livenessProbe:
+            {{- toYaml .Values.customLivenessProbe | nindent 12 }}
+          {{- else }}
           {{- if .Values.livenessProbe.enabled }}
           livenessProbe:
             httpGet:
@@ -52,10 +56,6 @@ spec:
               httpHeaders:
                 - name: Host
                   value: localhost:{{ .Values.containerPort  }}
-          {{- if .Values.customLivenessProbe }}
-          livenessProbe:
-            {{- toYaml .Values.customLivenessProbe | nindent 12 }}
-          {{- else }}
           {{- with .Values.livenessProbe }}
             initialDelaySeconds: {{ .initialDelaySeconds }}
             timeoutSeconds: {{ .timeoutSeconds }}
diff --git a/charts/commento/templates/secureconfig.yaml b/charts/commento/templates/secureconfig.yaml
index 2dea83e8792f9fbf242ed44440242ece0ba39943..609febad912ced2eeff6e23bded83e0f1e9682a4 100644
--- a/charts/commento/templates/secureconfig.yaml
+++ b/charts/commento/templates/secureconfig.yaml
@@ -7,10 +7,19 @@ metadata:
 type: Opaque
 data:
 {{- if .Values.postgres.enabled }}
+  {{- $_ := required "Values: postgres.userDatabase.name is mandatory if postgres.userDatabase is enabled." .Values.postgres.userDatabase.name }}
+  {{- $_ := required "Values: postgres.userDatabase.user is mandatory if postgres.userDatabase is enabled." .Values.postgres.userDatabase.user }}
+  {{- $_ := required "Values: postgres.userDatabase.password is mandatory if postgres.userDatabase is enabled." .Values.postgres.userDatabase.password }}
+  {{- $_ := required "Values: postgres.service.port is mandatory if postgres.userDatabase is enabled." .Values.postgres.service.port }}
   COMMENTO_POSTGRES: {{ (printf "postgres://%s:%s@%s:%s/%s?sslmode=disable" .Values.postgres.userDatabase.user .Values.postgres.userDatabase.password (include "postgres.servicename" .) (.Values.postgres.service.port | toString) .Values.postgres.userDatabase.name) | b64enc }}
 {{- else }}
 {{- with .Values.externalDatabase }}
-  COMMENTO_POSTGRES: {{ (printf "mongodb://%s:%s@%s/%s?sslmode=disable" .user .password .host (.port | toString) .name) | b64enc }}
+  {{- $_ := required "Values: externalDatabase.name is mandatory if externalDatabase is specified." .name }}
+  {{- $_ := required "Values: externalDatabase.user is mandatory if externalDatabase is specified." .user }}
+  {{- $_ := required "Values: externalDatabase.password is mandatory if externalDatabase is specified." .password }}
+  {{- $_ := required "Values: externalDatabase.host is mandatory if externalDatabase is specified." .host }}
+  {{- $_ := required "Values: externalDatabase.port is mandatory if externalDatabase is specified." .port }}
+  COMMENTO_POSTGRES: {{ (printf "mongodb://%s:%s@%s:%s/%s?sslmode=disable" .user .password .host (.port | toString) .name) | b64enc }}
 {{- end }}
 {{- end }}
 {{- with .Values.settings.smtp }}