diff --git a/charts/nominatim/Chart.yaml b/charts/nominatim/Chart.yaml
index dd4d85e..de79727 100644
--- a/charts/nominatim/Chart.yaml
+++ b/charts/nominatim/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.12.0
+version: 3.12.1
 
 # 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/nominatim/templates/initJob.yaml b/charts/nominatim/templates/initJob.yaml
index 689160a..5eb93db 100644
--- a/charts/nominatim/templates/initJob.yaml
+++ b/charts/nominatim/templates/initJob.yaml
@@ -12,9 +12,12 @@ spec:
         fsGroup: 2000
       initContainers:
         - name: wait-for-db
-          image: willwill/wait-for-it
+          image: chainguard/wait-for-it:latest
           args:
-            - {{ include "nominatim.databaseHost" . }}:{{ include "nominatim.databasePort" . }}
+            - -h
+            - {{ include "nominatim.databaseHost" . | quote}}
+            - -p
+            - {{ include "nominatim.databasePort" . | quote }}
 
 {{- if .Values.nominatimInitialize.customStyleUrl }}
         - name: download-custom-style