diff --git a/charts/commento/Chart.lock b/charts/commento/Chart.lock
index 89cac57a4a08fa5aac4d3a7593897581b34ef6d6..2741169d65bd83f3853826ba85379a7197387e86 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.4
-digest: sha256:6e5324471d19fc4f437266719e91163cd93dd528ff4f40e67c9694e73bccd2fd
-generated: "2020-12-14T17:50:32.7451092+01:00"
+  version: 0.2.5
+digest: sha256:1cbaca2458607369da14b57021d4823a56eed2c4a57226780abee2c7ebb4769b
+generated: "2020-12-14T23:11:24.611033+01:00"
diff --git a/charts/commento/Chart.yaml b/charts/commento/Chart.yaml
index 6ea25bc0dea6712264674b5e86de948eccb6f0fb..a56aa55f51d115c85f339ebc409c69350596d52c 100644
--- a/charts/commento/Chart.yaml
+++ b/charts/commento/Chart.yaml
@@ -7,12 +7,12 @@ type: application
 maintainers:
   - name: groundhog2k
 
-version: 0.1.7
+version: 0.1.8
 
 appVersion: v1.8.0
 
 dependencies:
   - name: postgres
-    version: 0.2.4
+    version: 0.2.5
     repository: "https://groundhog2k.github.io/helm-charts"
     condition: postgres.enabled
diff --git a/charts/commento/README.md b/charts/commento/README.md
index 370caac781b899f6be26c12c0fd5963c5a992beb..79b3f77e2090d79de129a0f682627c96ade88665 100644
--- a/charts/commento/README.md
+++ b/charts/commento/README.md
@@ -1,6 +1,6 @@
 # Commento
 
-![Version: 0.1.7](https://img.shields.io/badge/Version-0.1.7-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.8](https://img.shields.io/badge/Version-0.1.8-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.4 |
+| @groundhog2k | postgres | 0.2.5 |
 
 ## Common parameters
 
@@ -82,8 +82,9 @@ $ 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) |
+| service.nodePort | int | `nil` | The node port (only relevant for type LoadBalancer or NodePort) |
+| service.clusterIP | string | `nil` | The cluster ip address (only relevant for type LoadBalancer or NodePort) |
+| service.loadBalancerIP | string | `nil` | The load balancer ip address (only relevant for type LoadBalancer) |
 
 ## Ingress parameters
 
diff --git a/charts/commento/charts/postgres-0.2.4.tgz b/charts/commento/charts/postgres-0.2.4.tgz
deleted file mode 100644
index aee52c8fc9ea204cd6608dc57cd3869d1655fa0d..0000000000000000000000000000000000000000
Binary files a/charts/commento/charts/postgres-0.2.4.tgz and /dev/null differ
diff --git a/charts/commento/charts/postgres-0.2.5.tgz b/charts/commento/charts/postgres-0.2.5.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..c2b41d43ffbc183aa96b8e09f0f01cfb08498002
Binary files /dev/null and b/charts/commento/charts/postgres-0.2.5.tgz differ
diff --git a/charts/commento/templates/service.yaml b/charts/commento/templates/service.yaml
index 099942bdb5852cc8789ea3d330b8e73b30d8ee98..152085888bb44fd860707bab9b3728fcc2176363 100644
--- a/charts/commento/templates/service.yaml
+++ b/charts/commento/templates/service.yaml
@@ -11,10 +11,13 @@ spec:
       targetPort: http
       protocol: TCP
       name: http
-      {{- if and (eq .Values.service.type "NodePort") (.Values.service.nodePort) }}
+      {{- if and ( or (eq .Values.service.type "LoadBalancer") (eq .Values.service.type "NodePort") ) (.Values.service.nodePort) }}
       nodePort: {{ .Values.service.nodePort }}
       {{- end }}
-  {{- if and (eq .Values.service.type "LoadBalancer") (.Values.service.clusterIP) }}
+  {{- if and (eq .Values.service.type "LoadBalancer") (.Values.service.loadBalancerIP) }}
+  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
+  {{- end }}
+  {{- if .Values.service.clusterIP }}
   clusterIP: {{ .Values.service.clusterIP }}
   {{- end }}
   selector:
diff --git a/charts/commento/values.yaml b/charts/commento/values.yaml
index c7f8d151150e0595a34dc780235fd92e662a5bf3..907fd239351a2ea859b89aecfa293456c13eb747 100644
--- a/charts/commento/values.yaml
+++ b/charts/commento/values.yaml
@@ -44,10 +44,12 @@ replicaCount: 1
 service:
   type: ClusterIP
   port: 80
-  ## The node port (only relevant for type NodePort)
+  ## The node port (only relevant for type LoadBalancer or NodePort)
   nodePort:
-  ## The cluster ip address (only relevant for type LoadBalancer)
+  ## The cluster ip address (only relevant for type LoadBalancer or NodePort)
   clusterIP:
+  ## The loadbalancer ip address (only relevant for type LoadBalancer)
+  loadBalancerIP:
 
 ingress:
   enabled: false
diff --git a/charts/ghost/Chart.lock b/charts/ghost/Chart.lock
index 4c786f22bbfbbdeea73fd729d0fd064311df4312..49814b55d81f08e5f8a287c4da14823aec6cfdbb 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.3
-digest: sha256:5a8d20b3699331343825554d37bb0265ce9d90efa50f3003346de53efd7b7754
-generated: "2020-12-14T17:38:28.2726213+01:00"
+  version: 0.2.4
+digest: sha256:d379b4190f56e4158a58d67330e0f044309d6cf2fc828552df2f68b9cda19c87
+generated: "2020-12-14T23:11:40.345459+01:00"
diff --git a/charts/ghost/Chart.yaml b/charts/ghost/Chart.yaml
index 40a8d5bf7c29f8178175549067c646b73668018e..5bdc97b11238dcf386bad6000b21b07ef931ae1c 100644
--- a/charts/ghost/Chart.yaml
+++ b/charts/ghost/Chart.yaml
@@ -7,12 +7,12 @@ type: application
 maintainers:
   - name: groundhog2k
 
-version: 0.2.3
+version: 0.2.4
 
 appVersion: "3.40.1"
 
 dependencies:
   - name: mariadb
-    version: 0.2.3
+    version: 0.2.4
     repository: "https://groundhog2k.github.io/helm-charts"
     condition: mariadb.enabled
diff --git a/charts/ghost/README.md b/charts/ghost/README.md
index 23b4f261e0e8745dc5e4c6830ad75c4b3224b93a..68533428db7e75f07d0ab1b40980ce0cf26ef5e0 100644
--- a/charts/ghost/README.md
+++ b/charts/ghost/README.md
@@ -1,6 +1,6 @@
 # Ghost
 
-![Version: 0.2.3](https://img.shields.io/badge/Version-0.2.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.40.1](https://img.shields.io/badge/AppVersion-3.40.1-informational?style=flat-square)
+![Version: 0.2.4](https://img.shields.io/badge/Version-0.2.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.40.1](https://img.shields.io/badge/AppVersion-3.40.1-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.3 |
+| @groundhog2k | mariadb | 0.2.4 |
 
 ## Common parameters
 
@@ -83,8 +83,9 @@ $ helm uninstall my-release
 |-----|------|---------|-------------|
 | service.port | int | `80` | Ghost 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) |
+| service.nodePort | int | `nil` | The node port (only relevant for type LoadBalancer or NodePort) |
+| service.clusterIP | string | `nil` | The cluster ip address (only relevant for type LoadBalancer or NodePort) |
+| service.loadBalancerIP | string | `nil` | The load balancer ip address (only relevant for type LoadBalancer) |
 
 ## Ingress parameters
 
diff --git a/charts/ghost/charts/mariadb-0.2.3.tgz b/charts/ghost/charts/mariadb-0.2.3.tgz
deleted file mode 100644
index 76701c496f68c12a7fe158d48c75aff942cdfc3b..0000000000000000000000000000000000000000
Binary files a/charts/ghost/charts/mariadb-0.2.3.tgz and /dev/null differ
diff --git a/charts/ghost/charts/mariadb-0.2.4.tgz b/charts/ghost/charts/mariadb-0.2.4.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..e003dbe7968882ea91b1ce05c91aaedc5c963c80
Binary files /dev/null and b/charts/ghost/charts/mariadb-0.2.4.tgz differ
diff --git a/charts/ghost/templates/service.yaml b/charts/ghost/templates/service.yaml
index 386244a4353e67a03d4488845dca8e61c4f3f7c5..9ad9f5ad3e8908b8ad1475437cd767329284f0db 100644
--- a/charts/ghost/templates/service.yaml
+++ b/charts/ghost/templates/service.yaml
@@ -11,10 +11,13 @@ spec:
       targetPort: http
       protocol: TCP
       name: http
-      {{- if and (eq .Values.service.type "NodePort") (.Values.service.nodePort) }}
+      {{- if and ( or (eq .Values.service.type "LoadBalancer") (eq .Values.service.type "NodePort") ) (.Values.service.nodePort) }}
       nodePort: {{ .Values.service.nodePort }}
       {{- end }}
-  {{- if and (eq .Values.service.type "LoadBalancer") (.Values.service.clusterIP) }}
+  {{- if and (eq .Values.service.type "LoadBalancer") (.Values.service.loadBalancerIP) }}
+  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
+  {{- end }}
+  {{- if .Values.service.clusterIP }}
   clusterIP: {{ .Values.service.clusterIP }}
   {{- end }}
   selector:
diff --git a/charts/ghost/values.yaml b/charts/ghost/values.yaml
index 4a5c83e86701973f8da5b3dd9b1247801edea786..6460dfd628a9c19a93352fc80629be940755e499 100644
--- a/charts/ghost/values.yaml
+++ b/charts/ghost/values.yaml
@@ -43,10 +43,12 @@ securityContext:
 service:
   type: ClusterIP
   port: 80
-  ## The node port (only relevant for type NodePort)
+  ## The node port (only relevant for type LoadBalancer or NodePort)
   nodePort:
-  ## The cluster ip address (only relevant for type LoadBalancer)
+  ## The cluster ip address (only relevant for type LoadBalancer or NodePort)
   clusterIP:
+  ## The loadbalancer ip address (only relevant for type LoadBalancer)
+  loadBalancerIP:
 
 ## Ingress configuration
 ingress:
diff --git a/charts/gitea/Chart.lock b/charts/gitea/Chart.lock
index 5b2ddd1c972a57580146eafff2accb44176b6a4f..76fcfe457444f28c55fe91d00f9815dcfd491e69 100644
--- a/charts/gitea/Chart.lock
+++ b/charts/gitea/Chart.lock
@@ -1,12 +1,12 @@
 dependencies:
 - name: mariadb
   repository: https://groundhog2k.github.io/helm-charts
-  version: 0.2.3
+  version: 0.2.4
 - name: postgres
   repository: https://groundhog2k.github.io/helm-charts
-  version: 0.2.4
+  version: 0.2.5
 - name: redis
   repository: https://groundhog2k.github.io/helm-charts
-  version: 0.2.3
-digest: sha256:d362c22d5e8268611a37cc2d7b5be5ac39ff8f7a581dbb84b0633f973421014e
-generated: "2020-12-14T17:38:40.3429689+01:00"
+  version: 0.2.4
+digest: sha256:7a8a2228c50449e41c91a972df90c4580dc2cd2a6a3fff41ca33621a23c99430
+generated: "2020-12-14T23:11:54.452965+01:00"
diff --git a/charts/gitea/Chart.yaml b/charts/gitea/Chart.yaml
index 9883af2b6ad1712064e5ec46466b891b63d483db..ca58b78cd3bd992caa82751d890a8420ab2e7fd9 100644
--- a/charts/gitea/Chart.yaml
+++ b/charts/gitea/Chart.yaml
@@ -8,21 +8,21 @@ maintainers:
   - name: groundhog2k
 
 # This is the chart version
-version: 0.2.3
+version: 0.2.4
 
 # This is the version number of the application being deployed.
 appVersion: "1.13.0"
 
 dependencies:
   - name: mariadb
-    version: 0.2.3
+    version: 0.2.4
     repository: "https://groundhog2k.github.io/helm-charts"
     condition: mariadb.enabled
   - name: postgres
-    version: 0.2.4
+    version: 0.2.5
     repository: "https://groundhog2k.github.io/helm-charts"
     condition: postgres.enabled
   - name: redis
-    version: 0.2.3
+    version: 0.2.4
     repository: "https://groundhog2k.github.io/helm-charts"
     condition: redis.enabled
diff --git a/charts/gitea/README.md b/charts/gitea/README.md
index 99aff99e0e4d9386b50cbc3b19603726e7d884b2..f73a6325f13929f528bcf1a61fb666c96948b059 100644
--- a/charts/gitea/README.md
+++ b/charts/gitea/README.md
@@ -1,6 +1,6 @@
 #  Gitea
 
-![Version: 0.2.3](https://img.shields.io/badge/Version-0.2.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.13.0](https://img.shields.io/badge/AppVersion-1.13.0-informational?style=flat-square)
+![Version: 0.2.4](https://img.shields.io/badge/Version-0.2.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.13.0](https://img.shields.io/badge/AppVersion-1.13.0-informational?style=flat-square)
 
 A Helm chart for Gitea on Kubernetes
 
@@ -43,9 +43,9 @@ $ helm uninstall my-release
 
 | Repository | Name | Version |
 |------------|------|---------|
-| @groundhog2k | mariadb | 0.2.3 |
-| @groundhog2k | postgres | 0.2.4 |
-| @groundhog2k | redis | 0.2.3 |
+| @groundhog2k | mariadb | 0.2.4 |
+| @groundhog2k | postgres | 0.2.5 |
+| @groundhog2k | redis | 0.2.4 |
 
 ## Common parameters
 
@@ -86,12 +86,14 @@ $ helm uninstall my-release
 |-----|------|---------|-------------|
 | services.http.type | string | `"ClusterIP"` | Service type |
 | services.http.port | int | `80` | Gitea HTTP service port |
-| services.http.nodePort | int | `nil` | Gitea HTTP NodePort (if type NodePort is used) |
-| services.http.clusterIP | int | `nil` | Gitea HTTP ClusterIP (if type LoadBalancer is used) |
+| services.http.nodePort | int | `nil` | Gitea HTTP NodePort (only relevant for type LoadBalancer or NodePort) |
+| services.http.clusterIP | int | `nil` | Gitea HTTP ClusterIP (only relevant for type LoadBalancer or NodePort) |
+| services.http.loadBalancerIP | string | `nil` | The load balancer ip address (only relevant for type LoadBalancer) |
 | services.ssh.type | string | `"ClusterIP"` | Service type |
 | services.ssh.port | int | `22` | Gitea SSH service port |
-| services.ssh.nodePort | int | `nil` | Gitea SSH NodePort (if type NodePort is used) |
-| services.ssh.clusterIP | int | `nil` | Gitea SSH ClusterIP (if type LoadBalancer is used) |
+| services.ssh.nodePort | int | `nil` | Gitea SSH NodePort (only relevant for type LoadBalancer or NodePort) |
+| services.ssh.clusterIP | int | `nil` | Gitea SSH ClusterIP (only relevant for type LoadBalancer or NodePort)  |
+| services.ssh.loadBalancerIP | string | `nil` | The load balancer ip address (only relevant for type LoadBalancer) |
 
 ## Ingress parameters
 
diff --git a/charts/gitea/charts/mariadb-0.2.3.tgz b/charts/gitea/charts/mariadb-0.2.3.tgz
deleted file mode 100644
index 76701c496f68c12a7fe158d48c75aff942cdfc3b..0000000000000000000000000000000000000000
Binary files a/charts/gitea/charts/mariadb-0.2.3.tgz and /dev/null differ
diff --git a/charts/gitea/charts/mariadb-0.2.4.tgz b/charts/gitea/charts/mariadb-0.2.4.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..e003dbe7968882ea91b1ce05c91aaedc5c963c80
Binary files /dev/null and b/charts/gitea/charts/mariadb-0.2.4.tgz differ
diff --git a/charts/gitea/charts/postgres-0.2.4.tgz b/charts/gitea/charts/postgres-0.2.4.tgz
deleted file mode 100644
index aee52c8fc9ea204cd6608dc57cd3869d1655fa0d..0000000000000000000000000000000000000000
Binary files a/charts/gitea/charts/postgres-0.2.4.tgz and /dev/null differ
diff --git a/charts/gitea/charts/postgres-0.2.5.tgz b/charts/gitea/charts/postgres-0.2.5.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..c2b41d43ffbc183aa96b8e09f0f01cfb08498002
Binary files /dev/null and b/charts/gitea/charts/postgres-0.2.5.tgz differ
diff --git a/charts/gitea/charts/redis-0.2.3.tgz b/charts/gitea/charts/redis-0.2.3.tgz
deleted file mode 100644
index 1b79e72a4fda6496c7de435110169a184eb0d0bc..0000000000000000000000000000000000000000
Binary files a/charts/gitea/charts/redis-0.2.3.tgz and /dev/null differ
diff --git a/charts/gitea/charts/redis-0.2.4.tgz b/charts/gitea/charts/redis-0.2.4.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..20938ff1ae8320fe54a876618ca5dab73771ee72
Binary files /dev/null and b/charts/gitea/charts/redis-0.2.4.tgz differ
diff --git a/charts/gitea/templates/services.yaml b/charts/gitea/templates/services.yaml
index 0f92c8a843da816dfc63b17bfe3df88bbf0d8908..6431bd09501b0ecbaf50dc885da06ca84485105c 100644
--- a/charts/gitea/templates/services.yaml
+++ b/charts/gitea/templates/services.yaml
@@ -11,10 +11,13 @@ spec:
       targetPort: http
       protocol: TCP
       name: http
-      {{- if and (eq .Values.services.http.type "NodePort") (.Values.services.http.nodePort) }}
+      {{- if and ( or (eq .Values.services.http.type "LoadBalancer") (eq .Values.services.http.type "NodePort") ) (.Values.services.http.nodePort) }}
       nodePort: {{ .Values.services.http.nodePort }}
       {{- end }}
-  {{- if and (eq .Values.services.http.type "LoadBalancer") (.Values.services.http.clusterIP) }}
+  {{- if and (eq .Values.services.http.type "LoadBalancer") (.Values.services.http.loadBalancerIP) }}
+  loadBalancerIP: {{ .Values.services.http.loadBalancerIP }}
+  {{- end }}      
+  {{- if (.Values.services.http.clusterIP) }}
   clusterIP: {{ .Values.services.http.clusterIP }}
   {{- end }}
   selector:
@@ -33,10 +36,13 @@ spec:
       targetPort: ssh
       protocol: TCP
       name: ssh
-      {{- if and (eq .Values.services.ssh.type "NodePort") (.Values.services.ssh.nodePort) }}
+      {{- if and ( or (eq .Values.services.ssh.type "LoadBalancer") (eq .Values.services.ssh.type "NodePort") ) (.Values.services.ssh.nodePort) }}
       nodePort: {{ .Values.services.ssh.nodePort }}
       {{- end }}
-  {{- if and (eq .Values.services.ssh.type "LoadBalancer") (.Values.services.ssh.clusterIP) }}
+  {{- if and (eq .Values.services.ssh.type "LoadBalancer") (.Values.services.ssh.loadBalancerIP) }}
+  loadBalancerIP: {{ .Values.services.ssh.loadBalancerIP }}
+  {{- end }}
+  {{- if (.Values.services.ssh.clusterIP) }}
   clusterIP: {{ .Values.services.ssh.clusterIP }}
   {{- end }}
   selector:
diff --git a/charts/gitea/values.yaml b/charts/gitea/values.yaml
index 6fc7b95ad73ddcaf2d21728d05170c1760d991fe..141a5bc1886e3c35b3198e644164a739affdcbe6 100644
--- a/charts/gitea/values.yaml
+++ b/charts/gitea/values.yaml
@@ -46,13 +46,21 @@ services:
   http:
     type: ClusterIP
     port: 80
+    ## The node port (only relevant for type LoadBalancer or NodePort)
     nodePort:
+    ## The cluster ip address (only relevant for type LoadBalancer or NodePort)
     clusterIP:
+    ## The loadbalancer ip address (only relevant for type LoadBalancer)
+    loadBalancerIP:
   ssh:
     type: ClusterIP
     port: 22
+    ## The node port (only relevant for type LoadBalancer or NodePort)
     nodePort:
+    ## The cluster ip address (only relevant for type LoadBalancer or NodePort)
     clusterIP:
+    ## The loadbalancer ip address (only relevant for type LoadBalancer)
+    loadBalancerIP:
 
 ## Ingress configuration
 ingress:
diff --git a/charts/nextcloud/Chart.lock b/charts/nextcloud/Chart.lock
index bd1bcbd7c2023092eea0636eed62a340aa0f23a5..dbd5db505d7327b9a124d53a161553f887e614cb 100644
--- a/charts/nextcloud/Chart.lock
+++ b/charts/nextcloud/Chart.lock
@@ -1,12 +1,12 @@
 dependencies:
 - name: mariadb
   repository: https://groundhog2k.github.io/helm-charts
-  version: 0.2.3
+  version: 0.2.4
 - name: postgres
   repository: https://groundhog2k.github.io/helm-charts
-  version: 0.2.4
+  version: 0.2.5
 - name: redis
   repository: https://groundhog2k.github.io/helm-charts
-  version: 0.2.3
-digest: sha256:d362c22d5e8268611a37cc2d7b5be5ac39ff8f7a581dbb84b0633f973421014e
-generated: "2020-12-14T17:39:01.5845051+01:00"
+  version: 0.2.4
+digest: sha256:7a8a2228c50449e41c91a972df90c4580dc2cd2a6a3fff41ca33621a23c99430
+generated: "2020-12-14T23:12:14.230584+01:00"
diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml
index a9f6206ee6273ea0197c68aed835d18f72b5d064..15e19f6663616b2cf67256835a0a1356a6432d54 100644
--- a/charts/nextcloud/Chart.yaml
+++ b/charts/nextcloud/Chart.yaml
@@ -8,21 +8,21 @@ maintainers:
   - name: groundhog2k
 
 # This is the chart version.
-version: 0.3.3
+version: 0.3.4
 
 # This is the version number of the application being deployed.
 appVersion: "20.0.3-apache"
 
 dependencies:
   - name: mariadb
-    version: 0.2.3
+    version: 0.2.4
     repository: "https://groundhog2k.github.io/helm-charts"
     condition: mariadb.enabled
   - name: postgres
-    version: 0.2.4
+    version: 0.2.5
     repository: "https://groundhog2k.github.io/helm-charts"
     condition: postgres.enabled
   - name: redis
-    version: 0.2.3
+    version: 0.2.4
     repository: "https://groundhog2k.github.io/helm-charts"
     condition: redis.enabled
diff --git a/charts/nextcloud/README.md b/charts/nextcloud/README.md
index 4e11d032c571aca33e1802b31e133157cd4d1ea1..d939a2428c01e47205d8b7d968cfe326bf80b09b 100644
--- a/charts/nextcloud/README.md
+++ b/charts/nextcloud/README.md
@@ -1,6 +1,6 @@
 #  Nextcloud
 
-![Version: 0.3.3](https://img.shields.io/badge/Version-0.3.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 20.0.3-apache](https://img.shields.io/badge/AppVersion-20.0.3-informational?style=flat-square)
+![Version: 0.3.4](https://img.shields.io/badge/Version-0.3.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 20.0.3-apache](https://img.shields.io/badge/AppVersion-20.0.3-informational?style=flat-square)
 
 A Helm chart for Nextcloud on Kubernetes
 
@@ -43,9 +43,9 @@ $ helm uninstall my-release
 
 | Repository | Name | Version |
 |------------|------|---------|
-| @groundhog2k | mariadb | 0.2.3 |
-| @groundhog2k | postgres | 0.2.4 |
-| @groundhog2k | redis | 0.2.3 |
+| @groundhog2k | mariadb | 0.2.4 |
+| @groundhog2k | postgres | 0.2.5 |
+| @groundhog2k | redis | 0.2.4 |
 
 ## Common parameters
 
@@ -105,8 +105,9 @@ $ 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) |
+| service.nodePort | int | `nil` | The node port (only relevant for type LoadBalancer or NodePort) |
+| service.clusterIP | string | `nil` | The cluster ip address (only relevant for type LoadBalancer or NodePort) |
+| service.loadBalancerIP | string | `nil` | The load balancer ip address (only relevant for type LoadBalancer) |
 
 ## Ingress parameters
 
diff --git a/charts/nextcloud/charts/mariadb-0.2.3.tgz b/charts/nextcloud/charts/mariadb-0.2.3.tgz
deleted file mode 100644
index 76701c496f68c12a7fe158d48c75aff942cdfc3b..0000000000000000000000000000000000000000
Binary files a/charts/nextcloud/charts/mariadb-0.2.3.tgz and /dev/null differ
diff --git a/charts/nextcloud/charts/mariadb-0.2.4.tgz b/charts/nextcloud/charts/mariadb-0.2.4.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..e003dbe7968882ea91b1ce05c91aaedc5c963c80
Binary files /dev/null and b/charts/nextcloud/charts/mariadb-0.2.4.tgz differ
diff --git a/charts/nextcloud/charts/postgres-0.2.4.tgz b/charts/nextcloud/charts/postgres-0.2.4.tgz
deleted file mode 100644
index aee52c8fc9ea204cd6608dc57cd3869d1655fa0d..0000000000000000000000000000000000000000
Binary files a/charts/nextcloud/charts/postgres-0.2.4.tgz and /dev/null differ
diff --git a/charts/nextcloud/charts/postgres-0.2.5.tgz b/charts/nextcloud/charts/postgres-0.2.5.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..c2b41d43ffbc183aa96b8e09f0f01cfb08498002
Binary files /dev/null and b/charts/nextcloud/charts/postgres-0.2.5.tgz differ
diff --git a/charts/nextcloud/charts/redis-0.2.3.tgz b/charts/nextcloud/charts/redis-0.2.3.tgz
deleted file mode 100644
index 1b79e72a4fda6496c7de435110169a184eb0d0bc..0000000000000000000000000000000000000000
Binary files a/charts/nextcloud/charts/redis-0.2.3.tgz and /dev/null differ
diff --git a/charts/nextcloud/charts/redis-0.2.4.tgz b/charts/nextcloud/charts/redis-0.2.4.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..20938ff1ae8320fe54a876618ca5dab73771ee72
Binary files /dev/null and b/charts/nextcloud/charts/redis-0.2.4.tgz differ
diff --git a/charts/nextcloud/templates/service.yaml b/charts/nextcloud/templates/service.yaml
index 0e2d14a36d38d7e9ecd63ebdf3f6a85969f29106..5cd319271ffd94505f8f152954a0951110c26c25 100644
--- a/charts/nextcloud/templates/service.yaml
+++ b/charts/nextcloud/templates/service.yaml
@@ -11,10 +11,13 @@ spec:
       targetPort: http
       protocol: TCP
       name: http
-      {{- if and (eq .Values.service.type "NodePort") (.Values.service.nodePort) }}
+      {{- if and ( or (eq .Values.service.type "LoadBalancer") (eq .Values.service.type "NodePort") ) (.Values.service.nodePort) }}
       nodePort: {{ .Values.service.nodePort }}
       {{- end }}
-  {{- if and (eq .Values.service.type "LoadBalancer") (.Values.service.clusterIP) }}
+  {{- if and (eq .Values.service.type "LoadBalancer") (.Values.service.loadBalancerIP) }}
+  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
+  {{- end }}
+  {{- if .Values.service.clusterIP }}
   clusterIP: {{ .Values.service.clusterIP }}
   {{- end }}
   selector:
diff --git a/charts/nextcloud/values.yaml b/charts/nextcloud/values.yaml
index c378059a5a88410f1ece8f95ea3650d69d7cb909..17001dca2ad26fdfcb87189cf2eb3f2c92a70a38 100644
--- a/charts/nextcloud/values.yaml
+++ b/charts/nextcloud/values.yaml
@@ -73,10 +73,12 @@ securityContext:
 service:
   type: ClusterIP
   port: 80
-  ## The node port (only relevant for type NodePort)
+  ## The node port (only relevant for type LoadBalancer or NodePort)
   nodePort:
-  ## The cluster ip address (only relevant for type LoadBalancer)
+  ## The cluster ip address (only relevant for type LoadBalancer or NodePort)
   clusterIP:
+  ## The loadbalancer ip address (only relevant for type LoadBalancer)
+  loadBalancerIP:
 
 ## Ingress configuration
 ingress:
diff --git a/charts/wordpress/Chart.lock b/charts/wordpress/Chart.lock
index 3bff686621aa1fa31d410c2f96af0d64cccf0012..4cf4f0d80c39e2ffaa9f87d27803ad03d005f0dc 100644
--- a/charts/wordpress/Chart.lock
+++ b/charts/wordpress/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: mariadb
   repository: https://groundhog2k.github.io/helm-charts
-  version: 0.2.3
-digest: sha256:5a8d20b3699331343825554d37bb0265ce9d90efa50f3003346de53efd7b7754
-generated: "2020-12-14T17:39:20.350082+01:00"
+  version: 0.2.4
+digest: sha256:d379b4190f56e4158a58d67330e0f044309d6cf2fc828552df2f68b9cda19c87
+generated: "2020-12-14T23:12:33.073764+01:00"
diff --git a/charts/wordpress/Chart.yaml b/charts/wordpress/Chart.yaml
index 5cf39b5f26b53bb75c979c1e5b74d417f6cf2614..4790905c6a3c6cfb71637e0ae52fb6a6493f0bfd 100644
--- a/charts/wordpress/Chart.yaml
+++ b/charts/wordpress/Chart.yaml
@@ -8,13 +8,13 @@ maintainers:
 type: application
 
 # This is the chart version.
-version: 0.2.2
+version: 0.2.3
 
 # This is the version number of the application being deployed.
 appVersion: "5.6.0-apache"
 
 dependencies:
   - name: mariadb
-    version: 0.2.3
+    version: 0.2.4
     repository: "https://groundhog2k.github.io/helm-charts"
     condition: mariadb.enabled
diff --git a/charts/wordpress/README.md b/charts/wordpress/README.md
index b700cc113b11694db4774ddaeabbb6152b100645..24d2750c7e6fb55a01e464ed92e1784eff2b7f36 100644
--- a/charts/wordpress/README.md
+++ b/charts/wordpress/README.md
@@ -1,6 +1,6 @@
 #  Wordpress
 
-![Version: 0.2.2](https://img.shields.io/badge/Version-0.2.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 5.6.0-apache](https://img.shields.io/badge/AppVersion-5.5.3-informational?style=flat-square)
+![Version: 0.2.3](https://img.shields.io/badge/Version-0.2.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 5.6.0-apache](https://img.shields.io/badge/AppVersion-5.5.3-informational?style=flat-square)
 
 A Helm chart for Wordpress on Kubernetes
 
@@ -43,7 +43,7 @@ $ helm uninstall my-release
 
 | Repository | Name | Version |
 |------------|------|---------|
-| @groundhog2k | mariadb | 0.2.3 |
+| @groundhog2k | mariadb | 0.2.4 |
 
 ## Common parameters
 
@@ -83,8 +83,9 @@ $ helm uninstall my-release
 |-----|------|---------|-------------|
 | service.port | int | `80` | Wordpress 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) |
+| service.nodePort | int | `nil` | The node port (only relevant for type LoadBalancer or NodePort) |
+| service.clusterIP | string | `nil` | The cluster ip address (only relevant for type LoadBalancer or NodePort) |
+| service.loadBalancerIP | string | `nil` | The load balancer ip address (only relevant for type LoadBalancer) |
 
 ## Ingress parameters
 
diff --git a/charts/wordpress/charts/mariadb-0.2.3.tgz b/charts/wordpress/charts/mariadb-0.2.3.tgz
deleted file mode 100644
index 76701c496f68c12a7fe158d48c75aff942cdfc3b..0000000000000000000000000000000000000000
Binary files a/charts/wordpress/charts/mariadb-0.2.3.tgz and /dev/null differ
diff --git a/charts/wordpress/charts/mariadb-0.2.4.tgz b/charts/wordpress/charts/mariadb-0.2.4.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..e003dbe7968882ea91b1ce05c91aaedc5c963c80
Binary files /dev/null and b/charts/wordpress/charts/mariadb-0.2.4.tgz differ
diff --git a/charts/wordpress/templates/service.yaml b/charts/wordpress/templates/service.yaml
index 360779106c2b22ac49a623714f448d910568ae69..af5a99397a25b15b553f33ac89ba3f437c01dfc0 100644
--- a/charts/wordpress/templates/service.yaml
+++ b/charts/wordpress/templates/service.yaml
@@ -11,10 +11,13 @@ spec:
       targetPort: http
       protocol: TCP
       name: http
-      {{- if and (eq .Values.service.type "NodePort") (.Values.service.nodePort) }}
+      {{- if and ( or (eq .Values.service.type "LoadBalancer") (eq .Values.service.type "NodePort") ) (.Values.service.nodePort) }}
       nodePort: {{ .Values.service.nodePort }}
       {{- end }}
-  {{- if and (eq .Values.service.type "LoadBalancer") (.Values.service.clusterIP) }}
+  {{- if and (eq .Values.service.type "LoadBalancer") (.Values.service.loadBalancerIP) }}
+  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
+  {{- end }}
+  {{- if .Values.service.clusterIP }}
   clusterIP: {{ .Values.service.clusterIP }}
   {{- end }}
   selector:
diff --git a/charts/wordpress/values.yaml b/charts/wordpress/values.yaml
index de78adbf340bebf6dbff6088a23b7b90ca616f0e..d3712f66503916fe658deace3cf6bcee83096979 100644
--- a/charts/wordpress/values.yaml
+++ b/charts/wordpress/values.yaml
@@ -46,10 +46,12 @@ securityContext:
 service:
   type: ClusterIP
   port: 80
-  ## The node port (only relevant for type NodePort)
+  ## The node port (only relevant for type LoadBalancer or NodePort)
   nodePort:
-  ## The cluster ip address (only relevant for type LoadBalancer)
+  ## The cluster ip address (only relevant for type LoadBalancer or NodePort)
   clusterIP:
+  ## The loadbalancer ip address (only relevant for type LoadBalancer)
+  loadBalancerIP:
 
 ## Ingress configuration
 ingress: