diff --git a/charts/commento/Chart.lock b/charts/commento/Chart.lock
index 72beb76a496e381eb4b61801753fac5cea676966..420226c490aa676dfbfe3a44328a7876095e1c50 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.0
-digest: sha256:ea7a4e0f6f074b375e53f34d5aaf383139c67d288fa769ae8eb83f917754a981
-generated: "2020-12-11T17:52:50.0684521+01:00"
+  version: 0.2.3
+digest: sha256:4ee5b68d6e6e4d1e4d84b2e9eaf2badec3dbccf86bbd753ae684f4cefeeb5ca1
+generated: "2020-12-13T19:24:13.9972159+01:00"
diff --git a/charts/commento/Chart.yaml b/charts/commento/Chart.yaml
index 836a4085304fc89064de865f8d2680fd55869997..24b5cc6f8dc15fadd7339c2650fbbfdf43a84443 100644
--- a/charts/commento/Chart.yaml
+++ b/charts/commento/Chart.yaml
@@ -7,14 +7,12 @@ type: application
 maintainers:
   - name: groundhog2k
 
-# This is the chart version
-version: 0.1.5
+version: 0.1.6
 
-# This is the version number of the application being deployed.
 appVersion: v1.8.0
 
 dependencies:
   - name: postgres
-    version: 0.2.0
+    version: 0.2.3
     repository: "https://groundhog2k.github.io/helm-charts"
     condition: postgres.enabled
diff --git a/charts/commento/README.md b/charts/commento/README.md
index a11396ee00d748ff1364456ccaae7932fa054c21..2a498eff2520eac830fc88f9c77e2deb29d3e22d 100644
--- a/charts/commento/README.md
+++ b/charts/commento/README.md
@@ -1,6 +1,6 @@
 # Commento
 
-![Version: 0.1.5](https://img.shields.io/badge/Version-0.1.5-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.6](https://img.shields.io/badge/Version-0.1.6-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
 
@@ -43,7 +43,7 @@ $ helm uninstall my-release
 
 | Repository | Name | Version |
 |------------|------|---------|
-| @groundhog2k | postgres | 0.2.0 |
+| @groundhog2k | postgres | 0.2.3 |
 
 ## Common parameters
 
@@ -82,6 +82,8 @@ $ helm uninstall my-release
 |-----|------|---------|-------------|
 | service.port | int | `80` | Commento HTTP service port |
 | service.type | string | `"ClusterIP"` | Service type |
+| service.nodePort | int | `nil` | Service node port (only relevant for type NodePort) |
+| service.clusterIP | string | `nil` | Service cluster IP (only relevant for type LoadBalancer) |
 
 ## Ingress parameters
 
diff --git a/charts/commento/charts/postgres-0.2.0.tgz b/charts/commento/charts/postgres-0.2.0.tgz
deleted file mode 100644
index ccce0d3997efb7a31825fd3000bf796a32ca13b1..0000000000000000000000000000000000000000
Binary files a/charts/commento/charts/postgres-0.2.0.tgz and /dev/null differ
diff --git a/charts/commento/charts/postgres-0.2.3.tgz b/charts/commento/charts/postgres-0.2.3.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..1783107f72fd9c78f58787afe4018f3d95bd2cb9
Binary files /dev/null and b/charts/commento/charts/postgres-0.2.3.tgz differ
diff --git a/charts/commento/templates/deployment.yaml b/charts/commento/templates/deployment.yaml
index e18ff597e36b0a552c0651d43f1f36e3aed8cbf7..cea432227691f874f289fca55898c12a2524951b 100644
--- a/charts/commento/templates/deployment.yaml
+++ b/charts/commento/templates/deployment.yaml
@@ -23,12 +23,16 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       serviceAccountName: {{ include "commento.serviceAccountName" . }}
+      {{- with .Values.podSecurityContext }}
       securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
         - name: {{ .Chart.Name }}
+          {{- with .Values.securityContext }}
           securityContext:
-            {{- toYaml .Values.securityContext | nindent 12 }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
@@ -67,8 +71,10 @@ spec:
             periodSeconds: {{ .periodSeconds }}
           {{- end }}
           {{- end }}
+          {{- with .Values.resources }}
           resources:
-            {{- toYaml .Values.resources | nindent 12 }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           envFrom:
             - secretRef:
                 name: {{ include "commento.fullname" . }}
diff --git a/charts/commento/templates/service.yaml b/charts/commento/templates/service.yaml
index cf2d3f36e02e5350c25ccce7e20b22034fa18d7d..099942bdb5852cc8789ea3d330b8e73b30d8ee98 100644
--- a/charts/commento/templates/service.yaml
+++ b/charts/commento/templates/service.yaml
@@ -11,5 +11,11 @@ spec:
       targetPort: http
       protocol: TCP
       name: http
+      {{- if and (eq .Values.service.type "NodePort") (.Values.service.nodePort) }}
+      nodePort: {{ .Values.service.nodePort }}
+      {{- end }}
+  {{- if and (eq .Values.service.type "LoadBalancer") (.Values.service.clusterIP) }}
+  clusterIP: {{ .Values.service.clusterIP }}
+  {{- end }}
   selector:
     {{- include "commento.selectorLabels" . | nindent 4 }}
diff --git a/charts/commento/values.yaml b/charts/commento/values.yaml
index 29ff9aa7d6bcc27d3690af3382a2c370835e9036..8b5212cbdafdcd8d61b18cdb703791e6db071c59 100644
--- a/charts/commento/values.yaml
+++ b/charts/commento/values.yaml
@@ -44,6 +44,10 @@ replicaCount: 1
 service:
   type: ClusterIP
   port: 80
+  ## The node port (only relevant for type NodePort)
+  nodePort: {}
+  ## The cluster ip address (only relevant for type LoadBalancer)
+  clusterIP: {}
 
 ingress:
   enabled: false
@@ -193,10 +197,10 @@ postgres:
   # Storage parameters
   storage:
     ## Set persistentVolumenClaimName to reference an existing PVC
-    # persistentVolumeClaimName: <own-pvc-name>
+    persistentVolumeClaimName: {}
 
     ## Alternative set requestedSize to define a size for a dynmaically created PVC
-    # requestedSize: <volume-size>
+    requestedSize: {}
 
     ## the storage class name
-    # className:
+    className: {}