diff --git a/chart/templates/renderer-deployment.yaml b/chart/templates/renderer-deployment.yaml
index 36f6551640544f5419ee5dba60f2ce039a3268c4..33a179535a2a724eeeec9f8b2691fd7ff6f15b00 100644
--- a/chart/templates/renderer-deployment.yaml
+++ b/chart/templates/renderer-deployment.yaml
@@ -56,6 +56,8 @@ spec:
             - name: {{ $key }}
               value: {{ $value | quote }}
             {{- end }}
+            - name: DB_HOST
+              value: {{ .Release.Name }}-database
             {{- range $key, $value := .Values.config.django }}
             - name: {{ $key }}
               value: {{ $value | quote }}
@@ -73,7 +75,7 @@ spec:
             - name: STARTUP_SCRIPTS
               value: /wait-initialized.sh
             - name: WAIT_SERVICES
-              value: {{ .Values.config.database.DB_HOST }}:{{ .Values.config.database.DB_PORT }}
+              value: {{ .Release.Name }}-database:{{ .Values.config.database.DB_PORT }}
           volumeMounts:
             - mountPath: /init-db.sh
               name: init-db
diff --git a/chart/values.yaml b/chart/values.yaml
index a779f6cab0367a040436ab3bf7957931844aaaa5..77a4950cfb86114dd0053af0fb4b9276e6eb2022 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -5,7 +5,6 @@ config:
     GDAL_DISABLE_READDIR_ON_OPEN: "TRUE"
     COLLECT_STATIC: "false"
   database:
-    DB_HOST: database
     DB_NAME: dbname
     DB_PORT: "5432"
     DB_PW: dbpw