diff --git a/charts/monica/templates/_helpers.tpl b/charts/monica/templates/_helpers.tpl
index 2458e49..1c055cf 100644
--- a/charts/monica/templates/_helpers.tpl
+++ b/charts/monica/templates/_helpers.tpl
@@ -67,3 +67,11 @@ Create the name for the MySQL service to use.
 {{- define "monica.mysql.fullname" -}}
 {{- printf "%s-%s" .Release.Name "mysql" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+{{/*
+Define MySQL host and port env vars.
+*/}}
+{{- define "monica.mysql.env" -}}
+DB_HOST: {{- include "monica.mysql.fullname" . }}
+DB_PORT: {{ 3306 | quote }}
+{{- end }}
diff --git a/charts/monica/templates/configmap-env.yaml b/charts/monica/templates/configmap-env.yaml
index db7f431..8319c80 100644
--- a/charts/monica/templates/configmap-env.yaml
+++ b/charts/monica/templates/configmap-env.yaml
@@ -8,3 +8,6 @@ data:
 {{- range $envKey, $envVal := .Values.env }}
   {{ $envKey | upper }}: {{ $envVal | quote }}
 {{- end }}
+{{- if .Values.mysql.enabled }}
+{{- include "monica.mysql.env" . | nindent 2 }}
+{{- end }}
diff --git a/charts/monica/templates/deployment.yaml b/charts/monica/templates/deployment.yaml
index c891df6..16bc378 100644
--- a/charts/monica/templates/deployment.yaml
+++ b/charts/monica/templates/deployment.yaml
@@ -33,13 +33,6 @@ spec:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
-          {{- if .Values.mysql.enabled }} 
-          env:
-            - name: DB_HOST
-              value: {{- include "monica.mysql.fullname" . }}
-            - name: DB_PORT
-              value: {{ 3306 | quote }}
-          {{- end }}
           envFrom:
             - configMapRef:
                 name: {{ include "monica.fullname" . }}-env