diff --git a/charts/dolibarr/Chart.yaml b/charts/dolibarr/Chart.yaml
index 0aad6bdd..d31f2252 100644
--- a/charts/dolibarr/Chart.yaml
+++ b/charts/dolibarr/Chart.yaml
@@ -10,13 +10,13 @@ name: dolibarr
 sources:
   - https://github.com/Dolibarr/dolibarr
   - https://github.com/cowboysysop/charts/tree/master/charts/dolibarr
-version: 4.1.0
+version: 5.0.0
 dependencies:
   - name: common
-    version: 2.9.0
+    version: 2.19.0
     repository: https://charts.bitnami.com/bitnami/
   - name: mariadb
-    version: 11.5.7
+    version: 17.0.0
     repository: https://charts.bitnami.com/bitnami/
     condition: mariadb.enabled
 annotations:
diff --git a/charts/dolibarr/README.md b/charts/dolibarr/README.md
index d39f81e3..f9529351 100644
--- a/charts/dolibarr/README.md
+++ b/charts/dolibarr/README.md
@@ -43,6 +43,15 @@ The command upgrades the existing `my-release` deployment with the most latest r
 
 **TIP**: Use `helm repo update` to update information on available charts in the chart repositories.
 
+### Upgrading to version 5.0.0
+
+The MariaDB subchart has been updated to a major release, see these upgrade instructions:
+
+- https://github.com/bitnami/charts/tree/master/bitnami/mariadb#to-1700
+- https://github.com/bitnami/charts/tree/master/bitnami/mariadb#to-1600
+- https://github.com/bitnami/charts/tree/master/bitnami/mariadb#to-1400
+- https://github.com/bitnami/charts/tree/master/bitnami/mariadb#to-1300
+
 ### Upgrading to version 4.0.0
 
 The chart is now tested with Kubernetes >= 1.24 and Helm >= 3.9.
@@ -97,105 +106,124 @@ The command deletes the release named `my-release` and frees all the kubernetes
 
 ### Parameters
 
-| Name                                 | Description                                                                                           | Default                      |
-| ------------------------------------ | ----------------------------------------------------------------------------------------------------- | ---------------------------- |
-| `replicaCount`                       | Number of replicas (do not change it)                                                                 | `1`                          |
-| `updateStrategy.type`                | Update strategy type (do not change it)                                                               | `Recreate`                   |
-| `image.registry`                     | Image registry                                                                                        | `docker.io`                  |
-| `image.repository`                   | Image repository                                                                                      | `tuxgasy/dolibarr`           |
-| `image.tag`                          | Image tag                                                                                             | `17.0.2`                     |
-| `image.digest`                       | Image digest                                                                                          | `""`                         |
-| `image.pullPolicy`                   | Image pull policy                                                                                     | `IfNotPresent`               |
-| `pdb.create`                         | Specifies whether a pod disruption budget should be created                                           | `false`                      |
-| `pdb.minAvailable`                   | Minimum number/percentage of pods that should remain scheduled                                        | `1`                          |
-| `pdb.maxUnavailable`                 | Maximum number/percentage of pods that may be made unavailable                                        | `nil`                        |
-| `serviceAccount.create`              | Specifies whether a service account should be created                                                 | `true`                       |
-| `serviceAccount.annotations`         | Service account annotations                                                                           | `{}`                         |
-| `serviceAccount.name`                | The name of the service account to use (Generated using the `dolibarr.fullname` template if not set)  | `nil`                        |
-| `podAnnotations`                     | Additional pod annotations                                                                            | `{}`                         |
-| `podLabels`                          | Additional pod labels                                                                                 | `{}`                         |
-| `podSecurityContext`                 | Pod security context                                                                                  | `{}`                         |
-| `priorityClassName`                  | Priority class name                                                                                   | `nil`                        |
-| `securityContext`                    | Container security context                                                                            | `{}`                         |
-| `containerPorts.http`                | Container port for HTTP                                                                               | `80`                         |
-| `livenessProbe.enabled`              | Enable liveness probe                                                                                 | `true`                       |
-| `livenessProbe.initialDelaySeconds`  | Delay before the liveness probe is initiated                                                          | `180`                        |
-| `livenessProbe.periodSeconds`        | How often to perform the liveness probe                                                               | `10`                         |
-| `livenessProbe.timeoutSeconds`       | When the liveness probe times out                                                                     | `1`                          |
-| `livenessProbe.failureThreshold`     | Minimum consecutive failures for the liveness probe to be considered failed after having succeeded    | `3`                          |
-| `livenessProbe.successThreshold`     | Minimum consecutive successes for the liveness probe to be considered successful after having failed  | `1`                          |
-| `readinessProbe.enabled`             | Enable readiness probe                                                                                | `true`                       |
-| `readinessProbe.initialDelaySeconds` | Delay before the readiness probe is initiated                                                         | `0`                          |
-| `readinessProbe.periodSeconds`       | How often to perform the readiness probe                                                              | `10`                         |
-| `readinessProbe.timeoutSeconds`      | When the readiness probe times out                                                                    | `1`                          |
-| `readinessProbe.failureThreshold`    | Minimum consecutive failures for the readiness probe to be considered failed after having succeeded   | `3`                          |
-| `readinessProbe.successThreshold`    | Minimum consecutive successes for the readiness probe to be considered successful after having failed | `1`                          |
-| `startupProbe.enabled`               | Enable startup probe                                                                                  | `false`                      |
-| `startupProbe.initialDelaySeconds`   | Delay before the startup probe is initiated                                                           | `0`                          |
-| `startupProbe.periodSeconds`         | How often to perform the startup probe                                                                | `10`                         |
-| `startupProbe.timeoutSeconds`        | When the startup probe times out                                                                      | `1`                          |
-| `startupProbe.failureThreshold`      | Minimum consecutive failures for the startup probe to be considered failed after having succeeded     | `3`                          |
-| `startupProbe.successThreshold`      | Minimum consecutive successes for the startup probe to be considered successful after having failed   | `1`                          |
-| `service.annotations`                | Service annotations                                                                                   | `{}`                         |
-| `service.type`                       | Service type                                                                                          | `ClusterIP`                  |
-| `service.clusterIP`                  | Static cluster IP address or None for headless service when service type is ClusterIP                 | `nil`                        |
-| `service.loadBalancerIP`             | Static load balancer IP address when service type is LoadBalancer                                     | `nil`                        |
-| `service.loadBalancerSourceRanges`   | Source IP address ranges when service type is LoadBalancer                                            | `nil`                        |
-| `service.externalTrafficPolicy`      | External traffic routing policy when service type is LoadBalancer or NodePort                         | `Cluster`                    |
-| `service.ports.http`                 | Service port for HTTP                                                                                 | `80`                         |
-| `service.nodePorts.http`             | Service node port for HTTP when service type is LoadBalancer or NodePort                              | `nil`                        |
-| `ingress.enabled`                    | Enable ingress controller resource                                                                    | `false`                      |
-| `ingress.ingressClassName`           | IngressClass that will be be used to implement the Ingress                                            | `""`                         |
-| `ingress.pathType`                   | Ingress path type                                                                                     | `ImplementationSpecific`     |
-| `ingress.annotations`                | Ingress annotations                                                                                   | `{}`                         |
-| `ingress.hosts[0].host`              | Hostname to your Dolibarr installation                                                                | `dolibarr.local`             |
-| `ingress.hosts[0].paths`             | Paths within the url structure                                                                        | `["/"]`                      |
-| `ingress.tls`                        | TLS configuration                                                                                     | `[]`                         |
-| `resources`                          | CPU/Memory resource requests/limits                                                                   | `{}`                         |
-| `nodeSelector`                       | Node labels for pod assignment                                                                        | `{}`                         |
-| `tolerations`                        | Tolerations for pod assignment                                                                        | `[]`                         |
-| `affinity`                           | Map of node/pod affinities                                                                            | `{}`                         |
-| `extraArgs`                          | Additional container arguments                                                                        | `{}`                         |
-| `extraEnvVars`                       | Additional container environment variables                                                            | `[]`                         |
-| `extraEnvVarsCM`                     | Name of existing ConfigMap containing additional container environment variables                      | `nil`                        |
-| `extraEnvVarsSecret`                 | Name of existing Secret containing additional container environment variables                         | `nil`                        |
-| `init.securityContext`               | Init security context                                                                                 | `{}`                         |
-| `init.resources`                     | Init CPU/Memory resource requests/limits                                                              | `{}`                         |
-| `persistence.enabled`                | Enable persistence using PVC                                                                          | `false`                      |
-| `persistence.existingClaim`          | Name of an existing PVC to use                                                                        | `nil`                        |
-| `persistence.accessMode`             | PVC access mode                                                                                       | `ReadWriteOnce`              |
-| `persistence.annotations`            | PVC annotations                                                                                       | `{}`                         |
-| `persistence.size`                   | PVC size                                                                                              | `1Gi`                        |
-| `persistence.storageClass`           | PVC storage class                                                                                     | `nil`                        |
-| `dolibarr.admin.username`            | Administrator username                                                                                | `admin`                      |
-| `dolibarr.admin.password`            | Administrator password                                                                                | `admin`                      |
-| `dolibarr.externalUrl`               | External URL                                                                                          | `http://dolibarr.local`      |
-| `dolibarr.cron.enabled`              | Enable cron for scheduled jobs                                                                        | `false`                      |
-| `dolibarr.cron.username`             | Cron username                                                                                         | `admin`                      |
-| `dolibarr.cron.securityKey`          | Cron security key                                                                                     | `""`                         |
-| `existingSecret`                     | Name of existing Secret to use                                                                        | `""`                         |
-| `existingSecretKeyAdminPassword`     | Name of the key in existing Secret that contains administrator password                               | `dolibarr-admin-password`    |
-| `existingSecretKeyCronSecurityKey`   | Name of the key in existing Secret that contains cron security key                                    | `dolibarr-cron-security-key` |
+| Name                                 | Description                                                                                           | Default                  |
+| ------------------------------------ | ----------------------------------------------------------------------------------------------------- | ------------------------ |
+| `replicaCount`                       | Number of replicas (do not change it)                                                                 | `1`                      |
+| `updateStrategy.type`                | Update strategy type (do not change it)                                                               | `Recreate`               |
+| `image.registry`                     | Image registry                                                                                        | `docker.io`              |
+| `image.repository`                   | Image repository                                                                                      | `tuxgasy/dolibarr`       |
+| `image.tag`                          | Image tag                                                                                             | `17.0.2`                 |
+| `image.digest`                       | Image digest                                                                                          | `""`                     |
+| `image.pullPolicy`                   | Image pull policy                                                                                     | `IfNotPresent`           |
+| `pdb.create`                         | Specifies whether a pod disruption budget should be created                                           | `false`                  |
+| `pdb.minAvailable`                   | Minimum number/percentage of pods that should remain scheduled                                        | `1`                      |
+| `pdb.maxUnavailable`                 | Maximum number/percentage of pods that may be made unavailable                                        | `nil`                    |
+| `serviceAccount.create`              | Specifies whether a service account should be created                                                 | `true`                   |
+| `serviceAccount.annotations`         | Service account annotations                                                                           | `{}`                     |
+| `serviceAccount.name`                | The name of the service account to use (Generated using the `dolibarr.fullname` template if not set)  | `nil`                    |
+| `podAnnotations`                     | Additional pod annotations                                                                            | `{}`                     |
+| `podLabels`                          | Additional pod labels                                                                                 | `{}`                     |
+| `podSecurityContext`                 | Pod security context                                                                                  | `{}`                     |
+| `priorityClassName`                  | Priority class name                                                                                   | `nil`                    |
+| `runtimeClassName`                   | Runtime class name                                                                                    | `""`                     |
+| `topologySpreadConstraints`          | Topology Spread Constraints for pod assignment                                                        | `[]`                     |
+| `securityContext`                    | Container security context                                                                            | `{}`                     |
+| `containerPorts.http`                | Container port for HTTP                                                                               | `80`                     |
+| `livenessProbe.enabled`              | Enable liveness probe                                                                                 | `true`                   |
+| `livenessProbe.initialDelaySeconds`  | Delay before the liveness probe is initiated                                                          | `180`                    |
+| `livenessProbe.periodSeconds`        | How often to perform the liveness probe                                                               | `10`                     |
+| `livenessProbe.timeoutSeconds`       | When the liveness probe times out                                                                     | `1`                      |
+| `livenessProbe.failureThreshold`     | Minimum consecutive failures for the liveness probe to be considered failed after having succeeded    | `3`                      |
+| `livenessProbe.successThreshold`     | Minimum consecutive successes for the liveness probe to be considered successful after having failed  | `1`                      |
+| `readinessProbe.enabled`             | Enable readiness probe                                                                                | `true`                   |
+| `readinessProbe.initialDelaySeconds` | Delay before the readiness probe is initiated                                                         | `0`                      |
+| `readinessProbe.periodSeconds`       | How often to perform the readiness probe                                                              | `10`                     |
+| `readinessProbe.timeoutSeconds`      | When the readiness probe times out                                                                    | `1`                      |
+| `readinessProbe.failureThreshold`    | Minimum consecutive failures for the readiness probe to be considered failed after having succeeded   | `3`                      |
+| `readinessProbe.successThreshold`    | Minimum consecutive successes for the readiness probe to be considered successful after having failed | `1`                      |
+| `startupProbe.enabled`               | Enable startup probe                                                                                  | `false`                  |
+| `startupProbe.initialDelaySeconds`   | Delay before the startup probe is initiated                                                           | `0`                      |
+| `startupProbe.periodSeconds`         | How often to perform the startup probe                                                                | `10`                     |
+| `startupProbe.timeoutSeconds`        | When the startup probe times out                                                                      | `1`                      |
+| `startupProbe.failureThreshold`      | Minimum consecutive failures for the startup probe to be considered failed after having succeeded     | `3`                      |
+| `startupProbe.successThreshold`      | Minimum consecutive successes for the startup probe to be considered successful after having failed   | `1`                      |
+| `service.annotations`                | Service annotations                                                                                   | `{}`                     |
+| `service.type`                       | Service type                                                                                          | `ClusterIP`              |
+| `service.clusterIP`                  | Static cluster IP address or None for headless service when service type is ClusterIP                 | `nil`                    |
+| `service.loadBalancerIP`             | Static load balancer IP address when service type is LoadBalancer                                     | `nil`                    |
+| `service.loadBalancerSourceRanges`   | Source IP address ranges when service type is LoadBalancer                                            | `nil`                    |
+| `service.externalTrafficPolicy`      | External traffic routing policy when service type is LoadBalancer or NodePort                         | `Cluster`                |
+| `service.ports.http`                 | Service port for HTTP                                                                                 | `80`                     |
+| `service.nodePorts.http`             | Service node port for HTTP when service type is LoadBalancer or NodePort                              | `nil`                    |
+| `ingress.enabled`                    | Enable ingress controller resource                                                                    | `false`                  |
+| `ingress.ingressClassName`           | IngressClass that will be be used to implement the Ingress                                            | `""`                     |
+| `ingress.pathType`                   | Ingress path type                                                                                     | `ImplementationSpecific` |
+| `ingress.annotations`                | Ingress annotations                                                                                   | `{}`                     |
+| `ingress.hosts[0].host`              | Hostname to your Dolibarr installation                                                                | `dolibarr.local`         |
+| `ingress.hosts[0].paths`             | Paths within the url structure                                                                        | `["/"]`                  |
+| `ingress.tls`                        | TLS configuration                                                                                     | `[]`                     |
+| `resources`                          | CPU/Memory resource requests/limits                                                                   | `{}`                     |
+| `nodeSelector`                       | Node labels for pod assignment                                                                        | `{}`                     |
+| `tolerations`                        | Tolerations for pod assignment                                                                        | `[]`                     |
+| `affinity`                           | Map of node/pod affinities                                                                            | `{}`                     |
+| `extraArgs`                          | Additional container arguments                                                                        | `{}`                     |
+| `extraEnvVars`                       | Additional container environment variables                                                            | `[]`                     |
+| `extraEnvVarsCM`                     | Name of existing ConfigMap containing additional container environment variables                      | `nil`                    |
+| `extraEnvVarsSecret`                 | Name of existing Secret containing additional container environment variables                         | `nil`                    |
+| `init.securityContext`               | Init security context                                                                                 | `{}`                     |
+| `init.resources`                     | Init CPU/Memory resource requests/limits                                                              | `{}`                     |
+| `persistence.enabled`                | Enable persistence using PVC                                                                          | `false`                  |
+| `persistence.existingClaim`          | Name of an existing PVC to use                                                                        | `nil`                    |
+| `persistence.accessMode`             | PVC access mode                                                                                       | `ReadWriteOnce`          |
+| `persistence.annotations`            | PVC annotations                                                                                       | `{}`                     |
+| `persistence.size`                   | PVC size                                                                                              | `1Gi`                    |
+| `persistence.storageClass`           | PVC storage class                                                                                     | `nil`                    |
+
+### Config parameters
+
+| Name                               | Description                                                 | Default                      |
+| ---------------------------------- | ----------------------------------------------------------- | ---------------------------- |
+| `dolibarr.admin.username`          | Administrator username                                      | `admin`                      |
+| `dolibarr.admin.password`          | Administrator password                                      | `admin`                      |
+| `dolibarr.externalUrl`             | External URL                                                | `http://dolibarr.local`      |
+| `dolibarr.cron.enabled`            | Enable cron for scheduled jobs                              | `false`                      |
+| `dolibarr.cron.username`           | Cron username                                               | `admin`                      |
+| `dolibarr.cron.securityKey`        | Cron security key                                           | `""`                         |
+| `existingSecret`                   | Name of existing Secret to use                              | `""`                         |
+| `existingSecretKeyAdminPassword`   | Key in existing Secret that contains administrator password | `dolibarr-admin-password`    |
+| `existingSecretKeyCronSecurityKey` | Key in existing Secret that contains cron security key      | `dolibarr-cron-security-key` |
 
 ### MariaDB parameters
 
-| Name                                        | Description                                                       | Default            |
-| ------------------------------------------- | ----------------------------------------------------------------- | ------------------ |
-| `mariadb.enabled`                           | Whether to use the MariaDB chart                                  | `true`             |
-| `mariadb.architecture`                      | MariaDB architecture                                              | `standalone`       |
-| `mariadb.auth.database`                     | MariaDB database                                                  | `dolibarr`         |
-| `mariadb.auth.username`                     | MariaDB user                                                      | `dolibarr`         |
-| `mariadb.auth.password`                     | MariaDB password                                                  | `dolibarr`         |
-| `mariadb.auth.existingSecret`               | Name of existing Secret to use                                    | `""`               |
-| `mariadb.primary.service.ports.mysql`       | MariaDB port                                                      | `3306`             |
-| `externalMariadb.enabled`                   | Whether to use an external MariaDB                                | `false`            |
-| `externalMariadb.host`                      | External MariaDB host                                             | `mariadb`          |
-| `externalMariadb.port`                      | External MariaDB port                                             | `3306`             |
-| `externalMariadb.username`                  | External MariaDB user                                             | `dolibarr`         |
-| `externalMariadb.password`                  | External MariaDB password                                         | `dolibarr`         |
-| `externalMariadb.existingSecret`            | Name of existing Secret to use                                    | `""`               |
-| `externalMariadb.existingSecretKeyPassword` | Name of the key in existing Secret that contains MariaDB password | `mariadb-password` |
-| `externalMariadb.database`                  | External MariaDB database                                         | `dolibarr`         |
+| Name                                        | Description                                           | Default            |
+| ------------------------------------------- | ----------------------------------------------------- | ------------------ |
+| `mariadb.enabled`                           | Whether to use the MariaDB chart                      | `true`             |
+| `mariadb.architecture`                      | MariaDB architecture                                  | `standalone`       |
+| `mariadb.auth.database`                     | MariaDB database                                      | `dolibarr`         |
+| `mariadb.auth.username`                     | MariaDB user                                          | `dolibarr`         |
+| `mariadb.auth.password`                     | MariaDB password                                      | `dolibarr`         |
+| `mariadb.auth.existingSecret`               | Name of existing Secret to use                        | `""`               |
+| `mariadb.primary.service.ports.mysql`       | MariaDB port                                          | `3306`             |
+| `externalMariadb.enabled`                   | Whether to use an external MariaDB                    | `false`            |
+| `externalMariadb.host`                      | External MariaDB host                                 | `mariadb`          |
+| `externalMariadb.port`                      | External MariaDB port                                 | `3306`             |
+| `externalMariadb.username`                  | External MariaDB user                                 | `dolibarr`         |
+| `externalMariadb.password`                  | External MariaDB password                             | `dolibarr`         |
+| `externalMariadb.existingSecret`            | Name of existing Secret to use                        | `""`               |
+| `externalMariadb.existingSecretKeyPassword` | Key in existing Secret that contains MariaDB password | `mariadb-password` |
+| `externalMariadb.database`                  | External MariaDB database                             | `dolibarr`         |
+
+### Wait parameters
+
+| Name                    | Description                         | Default         |
+| ----------------------- | ----------------------------------- | --------------- |
+| `wait.image.registry`   | Image registry                      | `docker.io`     |
+| `wait.image.repository` | Image repository                    | `atkrad/wait4x` |
+| `wait.image.tag`        | Image tag                           | `2.14.0`        |
+| `wait.image.digest`     | Image digest                        | `""`            |
+| `wait.image.pullPolicy` | Image pull policy                   | `IfNotPresent`  |
+| `wait.securityContext`  | Container security context          | `{}`            |
+| `wait.resources`        | CPU/Memory resource requests/limits | `{}`            |
 
 ### Tests parameters
 
diff --git a/charts/dolibarr/templates/_helpers.tpl b/charts/dolibarr/templates/_helpers.tpl
index 35502645..2b06ffb3 100644
--- a/charts/dolibarr/templates/_helpers.tpl
+++ b/charts/dolibarr/templates/_helpers.tpl
@@ -74,7 +74,7 @@ Create the name of the secret to use
 {{- end -}}
 
 {{/*
-Administrator password secret key name
+Key in Secret that contains administrator password
 */}}
 {{- define "dolibarr.secretKeyAdminPassword" -}}
 {{- if .Values.existingSecret -}}
@@ -85,7 +85,7 @@ Administrator password secret key name
 {{- end -}}
 
 {{/*
-Cron security key secret key name
+Key in Secret that contains cron security key
 */}}
 {{- define "dolibarr.secretKeyCronSecurityKey" -}}
 {{- if .Values.existingSecret -}}
@@ -163,9 +163,9 @@ MariaDB secret name
 {{- end -}}
 
 {{/*
-MariaDB password secret key name
+Key in Secret that contains MariaDB password
 */}}
-{{- define "dolibarr.mariadb.secretKeyNamePassword" -}}
+{{- define "dolibarr.mariadb.secretKeyPassword" -}}
 {{- if .Values.externalMariadb.existingSecret -}}
     {{ .Values.externalMariadb.existingSecretKeyPassword }}
 {{- else -}}
diff --git a/charts/dolibarr/templates/deployment.yaml b/charts/dolibarr/templates/deployment.yaml
index 7ff33de9..964e8329 100644
--- a/charts/dolibarr/templates/deployment.yaml
+++ b/charts/dolibarr/templates/deployment.yaml
@@ -30,7 +30,7 @@ spec:
         {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 8 }}
         {{- end }}
       annotations:
-        {{- if (not .Values.existingSecret) }}
+        {{- if not .Values.existingSecret }}
         checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
         {{- end }}
         {{- if .Values.podAnnotations }}
@@ -44,7 +44,13 @@ spec:
       {{- if .Values.priorityClassName }}
       priorityClassName: {{ .Values.priorityClassName | quote }}
       {{- end }}
+      {{- if .Values.runtimeClassName }}
+      runtimeClassName: {{ .Values.runtimeClassName | quote }}
+      {{- end }}
       serviceAccountName: {{ include "dolibarr.serviceAccountName" . }}
+      {{- if .Values.topologySpreadConstraints }}
+      topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.topologySpreadConstraints "context" .) | nindent 8 }}
+      {{- end }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       initContainers:
@@ -93,7 +99,7 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: {{ include "dolibarr.mariadb.secretName" . }}
-                  key: {{ include "dolibarr.mariadb.secretKeyNamePassword" . }}
+                  key: {{ include "dolibarr.mariadb.secretKeyPassword" . }}
             - name: DOLI_DB_NAME
               value: {{ include "dolibarr.mariadb.database" . | quote }}
             - name: DOLI_URL_ROOT
@@ -186,7 +192,7 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: {{ include "dolibarr.mariadb.secretName" . }}
-                  key: {{ include "dolibarr.mariadb.secretKeyNamePassword" . }}
+                  key: {{ include "dolibarr.mariadb.secretKeyPassword" . }}
             - name: DOLI_DB_NAME
               value: {{ include "dolibarr.mariadb.database" . | quote }}
             {{- if .Values.extraEnvVars }}
diff --git a/charts/dolibarr/templates/secret.yaml b/charts/dolibarr/templates/secret.yaml
index 9334b91b..a7ccb91b 100644
--- a/charts/dolibarr/templates/secret.yaml
+++ b/charts/dolibarr/templates/secret.yaml
@@ -1,4 +1,4 @@
-{{- if (not .Values.existingSecret) }}
+{{- if not .Values.existingSecret }}
 apiVersion: v1
 kind: Secret
 metadata:
diff --git a/charts/dolibarr/values.yaml b/charts/dolibarr/values.yaml
index d2f6f619..d784fc0e 100644
--- a/charts/dolibarr/values.yaml
+++ b/charts/dolibarr/values.yaml
@@ -91,6 +91,12 @@ podSecurityContext: {}
 priorityClassName:
 # priorityClassName : high-priority
 
+## @param runtimeClassName Runtime class name
+runtimeClassName: ""
+
+## @param topologySpreadConstraints Topology Spread Constraints for pod assignment
+topologySpreadConstraints: []
+
 ## @param securityContext Container security context
 securityContext: {}
   # capabilities:
@@ -293,6 +299,8 @@ persistence:
   storageClass:
   # storageClass: -
 
+## @section Config parameters
+
 dolibarr:
   admin:
     ## @param dolibarr.admin.username Administrator username
@@ -317,10 +325,10 @@ dolibarr:
 ## @param existingSecret Name of existing Secret to use
 existingSecret: ""
 
-## @param existingSecretKeyAdminPassword Name of the key in existing Secret that contains administrator password
+## @param existingSecretKeyAdminPassword Key in existing Secret that contains administrator password
 existingSecretKeyAdminPassword: dolibarr-admin-password
 
-## @param existingSecretKeyCronSecurityKey Name of the key in existing Secret that contains cron security key
+## @param existingSecretKeyCronSecurityKey Key in existing Secret that contains cron security key
 existingSecretKeyCronSecurityKey: dolibarr-cron-security-key
 
 ## @section MariaDB parameters
@@ -370,12 +378,49 @@ externalMariadb:
   ## @param externalMariadb.existingSecret Name of existing Secret to use
   existingSecret: ""
 
-  ## @param externalMariadb.existingSecretKeyPassword Name of the key in existing Secret that contains MariaDB password
+  ## @param externalMariadb.existingSecretKeyPassword Key in existing Secret that contains MariaDB password
   existingSecretKeyPassword: mariadb-password
 
   ## @param externalMariadb.database External MariaDB database
   database: dolibarr
 
+## @section Wait parameters
+
+wait:
+  image:
+    ## @param wait.image.registry Image registry
+    registry: docker.io
+
+    ## @param wait.image.repository Image repository
+    repository: atkrad/wait4x
+
+    ## @param wait.image.tag Image tag
+    tag: 2.14.0
+
+    ## @param wait.image.digest Image digest
+    digest: ""
+
+    ## @param wait.image.pullPolicy Image pull policy
+    pullPolicy: IfNotPresent
+
+  ## @param wait.securityContext Container security context
+  securityContext: {}
+    # capabilities:
+    #   drop:
+    #   - ALL
+    # readOnlyRootFilesystem: true
+    # runAsNonRoot: true
+    # runAsUser: 1000
+
+  ## @param wait.resources CPU/Memory resource requests/limits
+  resources: {}
+    # limits:
+    #   cpu: 100m
+    #   memory: 128Mi
+    # requests:
+    #   cpu: 100m
+    #   memory: 128Mi
+
 ## @section Tests parameters
 
 tests:
diff --git a/charts/flowise/Chart.yaml b/charts/flowise/Chart.yaml
index f66797fb..a76de692 100644
--- a/charts/flowise/Chart.yaml
+++ b/charts/flowise/Chart.yaml
@@ -10,17 +10,17 @@ name: flowise
 sources:
   - https://github.com/FlowiseAI/Flowise
   - https://github.com/cowboysysop/charts/tree/master/charts/flowise
-version: 2.6.0
+version: 3.0.0
 dependencies:
   - name: common
-    version: 2.9.0
+    version: 2.19.0
     repository: https://charts.bitnami.com/bitnami/
   - name: mariadb
-    version: 11.5.7
+    version: 17.0.0
     repository: https://charts.bitnami.com/bitnami/
     condition: mariadb.enabled
   - name: postgresql
-    version: 12.11.1
+    version: 15.0.0
     repository: https://charts.bitnami.com/bitnami/
     condition: postgresql.enabled
 annotations:
diff --git a/charts/flowise/README.md b/charts/flowise/README.md
index eca74720..4d21af94 100644
--- a/charts/flowise/README.md
+++ b/charts/flowise/README.md
@@ -43,6 +43,21 @@ The command upgrades the existing `my-release` deployment with the most latest r
 
 **TIP**: Use `helm repo update` to update information on available charts in the chart repositories.
 
+### Upgrading to version 3.0.0
+
+The MariaDB subchart has been updated to a major release, see these upgrade instructions:
+
+- https://github.com/bitnami/charts/tree/master/bitnami/mariadb#to-1700
+- https://github.com/bitnami/charts/tree/master/bitnami/mariadb#to-1600
+- https://github.com/bitnami/charts/tree/master/bitnami/mariadb#to-1400
+- https://github.com/bitnami/charts/tree/master/bitnami/mariadb#to-1300
+
+The PostgreSQL subchart has been updated to a major release, see these upgrade instructions:
+
+- https://github.com/bitnami/charts/tree/main/bitnami/postgresql#to-1500
+- https://github.com/bitnami/charts/tree/main/bitnami/postgresql#to-1400
+- https://github.com/bitnami/charts/tree/main/bitnami/postgresql#to-1300
+
 ### Upgrading to version 2.0.0
 
 The chart is now tested with Kubernetes >= 1.24 and Helm >= 3.9.
@@ -209,7 +224,7 @@ The command deletes the release named `my-release` and frees all the kubernetes
 | ----------------------- | ----------------------------------- | --------------- |
 | `wait.image.registry`   | Image registry                      | `docker.io`     |
 | `wait.image.repository` | Image repository                    | `atkrad/wait4x` |
-| `wait.image.tag`        | Image tag                           | `2.13.0`        |
+| `wait.image.tag`        | Image tag                           | `2.14.0`        |
 | `wait.image.digest`     | Image digest                        | `""`            |
 | `wait.image.pullPolicy` | Image pull policy                   | `IfNotPresent`  |
 | `wait.securityContext`  | Container security context          | `{}`            |
diff --git a/charts/flowise/values.yaml b/charts/flowise/values.yaml
index 6186d62c..b8378921 100644
--- a/charts/flowise/values.yaml
+++ b/charts/flowise/values.yaml
@@ -412,7 +412,7 @@ wait:
     repository: atkrad/wait4x
 
     ## @param wait.image.tag Image tag
-    tag: 2.13.0
+    tag: 2.14.0
 
     ## @param wait.image.digest Image digest
     digest: ""
diff --git a/charts/lighthouse-ci/Chart.yaml b/charts/lighthouse-ci/Chart.yaml
index 4b18295a..e597e678 100644
--- a/charts/lighthouse-ci/Chart.yaml
+++ b/charts/lighthouse-ci/Chart.yaml
@@ -10,17 +10,17 @@ name: lighthouse-ci
 sources:
   - https://github.com/GoogleChrome/lighthouse-ci
   - https://github.com/cowboysysop/charts/tree/master/charts/lighthouse-ci
-version: 7.4.0
+version: 8.0.0
 dependencies:
   - name: common
-    version: 2.9.0
+    version: 2.19.0
     repository: https://charts.bitnami.com/bitnami/
   - name: mariadb
-    version: 11.5.7
+    version: 17.0.0
     repository: https://charts.bitnami.com/bitnami/
     condition: mariadb.enabled
   - name: postgresql
-    version: 12.11.1
+    version: 15.0.0
     repository: https://charts.bitnami.com/bitnami/
     condition: postgresql.enabled
 annotations:
diff --git a/charts/lighthouse-ci/README.md b/charts/lighthouse-ci/README.md
index 89edb642..2c7bd97c 100644
--- a/charts/lighthouse-ci/README.md
+++ b/charts/lighthouse-ci/README.md
@@ -43,6 +43,21 @@ The command upgrades the existing `my-release` deployment with the most latest r
 
 **TIP**: Use `helm repo update` to update information on available charts in the chart repositories.
 
+### Upgrading to version 8.0.0
+
+The MariaDB subchart has been updated to a major release, see these upgrade instructions:
+
+- https://github.com/bitnami/charts/tree/master/bitnami/mariadb#to-1700
+- https://github.com/bitnami/charts/tree/master/bitnami/mariadb#to-1600
+- https://github.com/bitnami/charts/tree/master/bitnami/mariadb#to-1400
+- https://github.com/bitnami/charts/tree/master/bitnami/mariadb#to-1300
+
+The PostgreSQL subchart has been updated to a major release, see these upgrade instructions:
+
+- https://github.com/bitnami/charts/tree/main/bitnami/postgresql#to-1500
+- https://github.com/bitnami/charts/tree/main/bitnami/postgresql#to-1400
+- https://github.com/bitnami/charts/tree/main/bitnami/postgresql#to-1300
+
 ### Upgrading to version 7.0.0
 
 The chart is now tested with Kubernetes >= 1.24 and Helm >= 3.9.
@@ -68,7 +83,7 @@ Some parameters related to image management have been modified:
 The PostgreSQL subchart has been updated to a major release, see these upgrade instructions:
 
 - https://github.com/bitnami/charts/tree/main/bitnami/postgresql#to-1200
-- https://docs.bitnami.com/kubernetes/infrastructure/postgresql/administration/upgrade/#to-1100
+- https://github.com/bitnami/charts/tree/main/bitnami/postgresql#to-1100
 
 ### Upgrading to version 3.0.0
 
@@ -136,6 +151,8 @@ The command deletes the release named `my-release` and frees all the kubernetes
 | `podLabels`                          | Additional pod labels                                                                                     | `{}`                       |
 | `podSecurityContext`                 | Pod security context                                                                                      | `{}`                       |
 | `priorityClassName`                  | Priority class name                                                                                       | `nil`                      |
+| `runtimeClassName`                   | Runtime class name                                                                                        | `""`                       |
+| `topologySpreadConstraints`          | Topology Spread Constraints for pod assignment                                                            | `[]`                       |
 | `securityContext`                    | Container security context                                                                                | `{}`                       |
 | `containerPorts.http`                | Container port for HTTP                                                                                   | `9001`                     |
 | `livenessProbe.enabled`              | Enable liveness probe                                                                                     | `true`                     |
@@ -185,55 +202,72 @@ The command deletes the release named `my-release` and frees all the kubernetes
 | `persistence.annotations`            | PVC annotations                                                                                           | `{}`                       |
 | `persistence.size`                   | PVC size                                                                                                  | `1Gi`                      |
 | `persistence.storageClass`           | PVC storage class                                                                                         | `nil`                      |
-| `logLevel`                           | Log level                                                                                                 | `verbose`                  |
-| `basicAuthUsername`                  | The username to protect the server with HTTP Basic Authentication                                         | `""`                       |
-| `basicAuthPassword`                  | The password to protect the server with HTTP Basic Authentication                                         | `""`                       |
-| `psiCollectCron`                     | The configuration to automatically collect results using the PageSpeed Insights API                       |                            |
-| `psiCollectCron.psiApiKey`           | The API key to use with the PageSpeed Insights API                                                        | `""`                       |
-| `psiCollectCron.sites`               | The array of sites to collect results for                                                                 | `[]`                       |
-| `deleteOldBuildsCron`                | The configuration to automatically delete old records                                                     | `[]`                       |
-| `existingSecret`                     | Name of existing Secret to use                                                                            | `""`                       |
-| `existingSecretKeyBasicAuthPassword` | Name of the key in existing Secret that contains HTTP Basic Authentication password                       | `basic-auth-password`      |
+
+### Config parameters
+
+| Name                                 | Description                                                                         | Default               |
+| ------------------------------------ | ----------------------------------------------------------------------------------- | --------------------- |
+| `logLevel`                           | Log level                                                                           | `verbose`             |
+| `basicAuthUsername`                  | The username to protect the server with HTTP Basic Authentication                   | `""`                  |
+| `basicAuthPassword`                  | The password to protect the server with HTTP Basic Authentication                   | `""`                  |
+| `psiCollectCron`                     | The configuration to automatically collect results using the PageSpeed Insights API |                       |
+| `psiCollectCron.psiApiKey`           | The API key to use with the PageSpeed Insights API                                  | `""`                  |
+| `psiCollectCron.sites`               | The array of sites to collect results for                                           | `[]`                  |
+| `deleteOldBuildsCron`                | The configuration to automatically delete old records                               | `[]`                  |
+| `existingSecret`                     | Name of existing Secret to use                                                      | `""`                  |
+| `existingSecretKeyBasicAuthPassword` | Key in existing Secret that contains HTTP Basic Authentication password             | `basic-auth-password` |
 
 ### MariaDB parameters
 
-| Name                                        | Description                                                       | Default            |
-| ------------------------------------------- | ----------------------------------------------------------------- | ------------------ |
-| `mariadb.enabled`                           | Whether to use the MariaDB chart                                  | `false`            |
-| `mariadb.architecture`                      | MariaDB architecture                                              | `standalone`       |
-| `mariadb.auth.database`                     | MariaDB database                                                  | `lighthouse-ci`    |
-| `mariadb.auth.username`                     | MariaDB user                                                      | `lighthouse-ci`    |
-| `mariadb.auth.password`                     | MariaDB password                                                  | `lighthouse-ci`    |
-| `mariadb.auth.existingSecret`               | Name of existing Secret to use                                    | `""`               |
-| `mariadb.primary.service.ports.mysql`       | MariaDB port                                                      | `3306`             |
-| `externalMariadb.enabled`                   | Whether to use an external MariaDB                                | `false`            |
-| `externalMariadb.host`                      | External MariaDB host                                             | `mariadb`          |
-| `externalMariadb.port`                      | External MariaDB port                                             | `3306`             |
-| `externalMariadb.username`                  | External MariaDB user                                             | `lighthouse-ci`    |
-| `externalMariadb.password`                  | External MariaDB password                                         | `lighthouse-ci`    |
-| `externalMariadb.existingSecret`            | Name of existing Secret to use                                    | `""`               |
-| `externalMariadb.existingSecretKeyPassword` | Name of the key in existing Secret that contains MariaDB password | `mariadb-password` |
-| `externalMariadb.database`                  | External MariaDB database                                         | `lighthouse-ci`    |
+| Name                                        | Description                                           | Default            |
+| ------------------------------------------- | ----------------------------------------------------- | ------------------ |
+| `mariadb.enabled`                           | Whether to use the MariaDB chart                      | `false`            |
+| `mariadb.architecture`                      | MariaDB architecture                                  | `standalone`       |
+| `mariadb.auth.database`                     | MariaDB database                                      | `lighthouse-ci`    |
+| `mariadb.auth.username`                     | MariaDB user                                          | `lighthouse-ci`    |
+| `mariadb.auth.password`                     | MariaDB password                                      | `lighthouse-ci`    |
+| `mariadb.auth.existingSecret`               | Name of existing Secret to use                        | `""`               |
+| `mariadb.primary.service.ports.mysql`       | MariaDB port                                          | `3306`             |
+| `externalMariadb.enabled`                   | Whether to use an external MariaDB                    | `false`            |
+| `externalMariadb.host`                      | External MariaDB host                                 | `mariadb`          |
+| `externalMariadb.port`                      | External MariaDB port                                 | `3306`             |
+| `externalMariadb.username`                  | External MariaDB user                                 | `lighthouse-ci`    |
+| `externalMariadb.password`                  | External MariaDB password                             | `lighthouse-ci`    |
+| `externalMariadb.existingSecret`            | Name of existing Secret to use                        | `""`               |
+| `externalMariadb.existingSecretKeyPassword` | Key in existing Secret that contains MariaDB password | `mariadb-password` |
+| `externalMariadb.database`                  | External MariaDB database                             | `lighthouse-ci`    |
 
 ### PostgreSQL parameters
 
-| Name                                           | Description                                                          | Default         |
-| ---------------------------------------------- | -------------------------------------------------------------------- | --------------- |
-| `postgresql.enabled`                           | Whether to use the PostgreSQL chart                                  | `false`         |
-| `postgresql.auth.username`                     | PostgreSQL user                                                      | `lighthouse-ci` |
-| `postgresql.auth.password`                     | PostgreSQL password                                                  | `lighthouse-ci` |
-| `postgresql.auth.database`                     | PostgreSQL database                                                  | `lighthouse-ci` |
-| `postgresql.auth.existingSecret`               | Name of existing Secret to use                                       | `""`            |
-| `postgresql.architecture`                      | PostgreSQL architecture                                              | `standalone`    |
-| `postgresql.primary.service.ports.postgresql`  | PostgreSQL port                                                      | `5432`          |
-| `externalPostgresql.enabled`                   | Whether to use an external PostgreSQL                                | `false`         |
-| `externalPostgresql.host`                      | External PostgreSQL host                                             | `postgresql`    |
-| `externalPostgresql.port`                      | External PostgreSQL port                                             | `5432`          |
-| `externalPostgresql.username`                  | External PostgreSQL user                                             | `lighthouse-ci` |
-| `externalPostgresql.password`                  | External PostgreSQL password                                         | `lighthouse-ci` |
-| `externalPostgresql.existingSecret`            | Name of existing Secret to use                                       | `""`            |
-| `externalPostgresql.existingSecretKeyPassword` | Name of the key in existing Secret that contains PostgreSQL password | `password`      |
-| `externalPostgresql.database`                  | External PostgreSQL database                                         | `lighthouse-ci` |
+| Name                                           | Description                                              | Default         |
+| ---------------------------------------------- | -------------------------------------------------------- | --------------- |
+| `postgresql.enabled`                           | Whether to use the PostgreSQL chart                      | `false`         |
+| `postgresql.auth.username`                     | PostgreSQL user                                          | `lighthouse-ci` |
+| `postgresql.auth.password`                     | PostgreSQL password                                      | `lighthouse-ci` |
+| `postgresql.auth.database`                     | PostgreSQL database                                      | `lighthouse-ci` |
+| `postgresql.auth.existingSecret`               | Name of existing Secret to use                           | `""`            |
+| `postgresql.architecture`                      | PostgreSQL architecture                                  | `standalone`    |
+| `postgresql.primary.service.ports.postgresql`  | PostgreSQL port                                          | `5432`          |
+| `externalPostgresql.enabled`                   | Whether to use an external PostgreSQL                    | `false`         |
+| `externalPostgresql.host`                      | External PostgreSQL host                                 | `postgresql`    |
+| `externalPostgresql.port`                      | External PostgreSQL port                                 | `5432`          |
+| `externalPostgresql.username`                  | External PostgreSQL user                                 | `lighthouse-ci` |
+| `externalPostgresql.password`                  | External PostgreSQL password                             | `lighthouse-ci` |
+| `externalPostgresql.existingSecret`            | Name of existing Secret to use                           | `""`            |
+| `externalPostgresql.existingSecretKeyPassword` | Key in existing Secret that contains PostgreSQL password | `password`      |
+| `externalPostgresql.database`                  | External PostgreSQL database                             | `lighthouse-ci` |
+
+### Wait parameters
+
+| Name                    | Description                         | Default         |
+| ----------------------- | ----------------------------------- | --------------- |
+| `wait.image.registry`   | Image registry                      | `docker.io`     |
+| `wait.image.repository` | Image repository                    | `atkrad/wait4x` |
+| `wait.image.tag`        | Image tag                           | `2.14.0`        |
+| `wait.image.digest`     | Image digest                        | `""`            |
+| `wait.image.pullPolicy` | Image pull policy                   | `IfNotPresent`  |
+| `wait.securityContext`  | Container security context          | `{}`            |
+| `wait.resources`        | CPU/Memory resource requests/limits | `{}`            |
 
 ### Tests parameters
 
diff --git a/charts/lighthouse-ci/templates/_helpers.tpl b/charts/lighthouse-ci/templates/_helpers.tpl
index 428d6634..9a205b1b 100644
--- a/charts/lighthouse-ci/templates/_helpers.tpl
+++ b/charts/lighthouse-ci/templates/_helpers.tpl
@@ -74,9 +74,9 @@ Create the name of the secret to use
 {{- end -}}
 
 {{/*
-HTTP Basic Authentication password secret key name
+Key in Secret that contains HTTP Basic Authentication password
 */}}
-{{- define "lighthouse-ci.secretKeyNameBasicAuthPassword" -}}
+{{- define "lighthouse-ci.secretKeyBasicAuthPassword" -}}
 {{- if .Values.existingSecret -}}
     {{ .Values.existingSecretKeyBasicAuthPassword }}
 {{- else -}}
@@ -152,9 +152,9 @@ MariaDB secret name
 {{- end -}}
 
 {{/*
-MariaDB password secret key name
+Key in Secret that contains MariaDB password
 */}}
-{{- define "lighthouse-ci.mariadb.secretKeyNamePassword" -}}
+{{- define "lighthouse-ci.mariadb.secretKeyPassword" -}}
 {{- if .Values.externalMariadb.existingSecret -}}
     {{ .Values.externalMariadb.existingSecretKeyPassword }}
 {{- else -}}
@@ -241,9 +241,9 @@ PostgreSQL secret name
 {{- end -}}
 
 {{/*
-PostgreSQL password secret key name
+Key in Secret that contains PostgreSQL password
 */}}
-{{- define "lighthouse-ci.postgresql.secretKeyNamePassword" -}}
+{{- define "lighthouse-ci.postgresql.secretKeyPassword" -}}
 {{- if .Values.externalPostgresql.existingSecret -}}
     {{ .Values.externalPostgresql.existingSecretKeyPassword }}
 {{- else -}}
diff --git a/charts/lighthouse-ci/templates/deployment.yaml b/charts/lighthouse-ci/templates/deployment.yaml
index 3cb473be..261a2c9d 100644
--- a/charts/lighthouse-ci/templates/deployment.yaml
+++ b/charts/lighthouse-ci/templates/deployment.yaml
@@ -31,7 +31,7 @@ spec:
         {{- end }}
       annotations:
         checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
-        {{- if (not .Values.existingSecret) }}
+        {{- if not .Values.existingSecret }}
         checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
         {{- end }}
         {{- if .Values.podAnnotations }}
@@ -45,7 +45,13 @@ spec:
       {{- if .Values.priorityClassName }}
       priorityClassName: {{ .Values.priorityClassName | quote }}
       {{- end }}
+      {{- if .Values.runtimeClassName }}
+      runtimeClassName: {{ .Values.runtimeClassName | quote }}
+      {{- end }}
       serviceAccountName: {{ include "lighthouse-ci.serviceAccountName" . }}
+      {{- if .Values.topologySpreadConstraints }}
+      topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.topologySpreadConstraints "context" .) | nindent 8 }}
+      {{- end }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:
@@ -70,7 +76,7 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: {{ include "lighthouse-ci.secretName" . }}
-                  key: {{ include "lighthouse-ci.secretKeyNameBasicAuthPassword" . }}
+                  key: {{ include "lighthouse-ci.secretKeyBasicAuthPassword" . }}
             {{- end }}
             {{- if or .Values.mariadb.enabled .Values.externalMariadb.enabled }}
             - name: LHCI_STORAGE__SQL_DIALECT
@@ -85,7 +91,7 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: {{ include "lighthouse-ci.mariadb.secretName" . }}
-                  key: {{ include "lighthouse-ci.mariadb.secretKeyNamePassword" . }}
+                  key: {{ include "lighthouse-ci.mariadb.secretKeyPassword" . }}
             - name: MARIADB_DATABASE
               value: {{ include "lighthouse-ci.mariadb.database" . | quote }}
             - name: LHCI_STORAGE__SQL_CONNECTION_URL
@@ -104,7 +110,7 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: {{ include "lighthouse-ci.postgresql.secretName" . }}
-                  key: {{ include "lighthouse-ci.postgresql.secretKeyNamePassword" . }}
+                  key: {{ include "lighthouse-ci.postgresql.secretKeyPassword" . }}
             - name: POSTGRESQL_DATABASE
               value: {{ include "lighthouse-ci.postgresql.database" . | quote }}
             - name: LHCI_STORAGE__SQL_CONNECTION_URL
diff --git a/charts/lighthouse-ci/templates/secret.yaml b/charts/lighthouse-ci/templates/secret.yaml
index 56e2d8cb..72a5f7d1 100644
--- a/charts/lighthouse-ci/templates/secret.yaml
+++ b/charts/lighthouse-ci/templates/secret.yaml
@@ -1,4 +1,4 @@
-{{- if (not .Values.existingSecret) }}
+{{- if not .Values.existingSecret }}
 apiVersion: v1
 kind: Secret
 metadata:
diff --git a/charts/lighthouse-ci/values.yaml b/charts/lighthouse-ci/values.yaml
index a40ca505..55740e1a 100644
--- a/charts/lighthouse-ci/values.yaml
+++ b/charts/lighthouse-ci/values.yaml
@@ -91,6 +91,12 @@ podSecurityContext: {}
 priorityClassName:
 # priorityClassName : high-priority
 
+## @param runtimeClassName Runtime class name
+runtimeClassName: ""
+
+## @param topologySpreadConstraints Topology Spread Constraints for pod assignment
+topologySpreadConstraints: []
+
 ## @param securityContext Container security context
 securityContext: {}
   # capabilities:
@@ -274,6 +280,8 @@ persistence:
   storageClass:
   # storageClass: -
 
+## @section Config parameters
+
 ## @param logLevel Log level
 logLevel: verbose
 
@@ -303,7 +311,7 @@ deleteOldBuildsCron: []
 ## @param existingSecret Name of existing Secret to use
 existingSecret: ""
 
-## @param existingSecretKeyBasicAuthPassword Name of the key in existing Secret that contains HTTP Basic Authentication password
+## @param existingSecretKeyBasicAuthPassword Key in existing Secret that contains HTTP Basic Authentication password
 existingSecretKeyBasicAuthPassword: basic-auth-password
 
 ## @section MariaDB parameters
@@ -353,7 +361,7 @@ externalMariadb:
   ## @param externalMariadb.existingSecret Name of existing Secret to use
   existingSecret: ""
 
-  ## @param externalMariadb.existingSecretKeyPassword Name of the key in existing Secret that contains MariaDB password
+  ## @param externalMariadb.existingSecretKeyPassword Key in existing Secret that contains MariaDB password
   existingSecretKeyPassword: mariadb-password
 
   ## @param externalMariadb.database External MariaDB database
@@ -406,12 +414,49 @@ externalPostgresql:
   ## @param externalPostgresql.existingSecret Name of existing Secret to use
   existingSecret: ""
 
-  ## @param externalPostgresql.existingSecretKeyPassword Name of the key in existing Secret that contains PostgreSQL password
+  ## @param externalPostgresql.existingSecretKeyPassword Key in existing Secret that contains PostgreSQL password
   existingSecretKeyPassword: password
 
   ## @param externalPostgresql.database External PostgreSQL database
   database: lighthouse-ci
 
+## @section Wait parameters
+
+wait:
+  image:
+    ## @param wait.image.registry Image registry
+    registry: docker.io
+
+    ## @param wait.image.repository Image repository
+    repository: atkrad/wait4x
+
+    ## @param wait.image.tag Image tag
+    tag: 2.14.0
+
+    ## @param wait.image.digest Image digest
+    digest: ""
+
+    ## @param wait.image.pullPolicy Image pull policy
+    pullPolicy: IfNotPresent
+
+  ## @param wait.securityContext Container security context
+  securityContext: {}
+    # capabilities:
+    #   drop:
+    #   - ALL
+    # readOnlyRootFilesystem: true
+    # runAsNonRoot: true
+    # runAsUser: 1000
+
+  ## @param wait.resources CPU/Memory resource requests/limits
+  resources: {}
+    # limits:
+    #   cpu: 100m
+    #   memory: 128Mi
+    # requests:
+    #   cpu: 100m
+    #   memory: 128Mi
+
 ## @section Tests parameters
 
 tests: