diff --git a/charts/geoweb-opmet-backend/Chart.yaml b/charts/geoweb-opmet-backend/Chart.yaml
index fdbc6e7..627e64d 100644
--- a/charts/geoweb-opmet-backend/Chart.yaml
+++ b/charts/geoweb-opmet-backend/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 3.5.2
+version: 3.5.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/geoweb-opmet-backend/README.md b/charts/geoweb-opmet-backend/README.md
index 35dc0d4..24f8864 100644
--- a/charts/geoweb-opmet-backend/README.md
+++ b/charts/geoweb-opmet-backend/README.md
@@ -214,6 +214,7 @@ The following table lists the configurable parameters of the Opmet backend chart
 
 | Chart version | opmet version |
 |---------------|---------------|
+| 3.5.3         | 3.0.0         |
 | 3.5.2         | 3.0.0         |
 | 3.5.1         | 3.0.0         |
 | 3.5.0         | 2.12.1        |
diff --git a/charts/geoweb-opmet-backend/templates/opmet-deployment.yaml b/charts/geoweb-opmet-backend/templates/opmet-deployment.yaml
index 215a23c..85e5aa6 100644
--- a/charts/geoweb-opmet-backend/templates/opmet-deployment.yaml
+++ b/charts/geoweb-opmet-backend/templates/opmet-deployment.yaml
@@ -22,8 +22,8 @@ spec:
     {{- if eq .Values.secretProvider "aws" }}
       serviceAccountName: {{ .Values.opmet.secretServiceAccount }}
     {{- end }}
-    {{- if and .Values.opmet.useCustomConfigurationFiles (eq .Values.opmet.customConfigurationLocation "s3")}}
       initContainers:
+    {{- if and .Values.opmet.useCustomConfigurationFiles (eq .Values.opmet.customConfigurationLocation "s3")}}
       - name: init
         image: amazon/aws-cli
         command: ["/bin/sh"]
@@ -37,6 +37,11 @@ spec:
         volumeMounts:
         - mountPath: "/opmet/"
           name: {{ .Values.opmet.name }}-volume
+    {{- end }}
+    {{- if .Values.opmet.db.useZalandoOperatorDb }}
+      - name: wait-for-db
+        image: busybox
+        command: ['sh', '-c', "until nc -z -v -w30 {{ .Values.opmet.db.name }} 5432; do echo 'Waiting for database...'; sleep 5; done"]
     {{- end }}
       containers:
       - name: {{ .Values.opmet.name }}