diff --git a/values.yaml b/values.yaml
index e57e5c0..dd9a5f9 100644
--- a/values.yaml
+++ b/values.yaml
@@ -48,14 +48,6 @@ api:
           # service:
           #   frontendUrl: http://vikunja.local
 
-          database:
-            # You should provide your own secret outside of this helm-chart and use `postgresql.global.postgresql.auth.existingSecret` to provide credentials to the postgresql instance (https://github.com/bitnami/charts/blob/5ff8ad5f3c754e3c2423d6abf46f522e8abe0410/bitnami/postgresql/values.yaml#L35-L39)
-            # To utilize a secret in this configMap, you can do something like the following: https://github.com/bjw-s/helm-charts/blob/a081de53024d8328d1ae9ff7e4f6bc500b0f3a29/charts/library/common/values.yaml#L141-L145
-            type: postgres
-            user: "{{ .Values.postgresql.global.postgresql.auth.username }}"
-            password: "{{ .Values.postgresql.global.postgresql.auth.password }}"
-            database: "{{ .Values.postgresql.global.postgresql.auth.database }}"
-            host: "{{ .Release.Name }}-postgresql"
           typesense:
             # Typesense will only work if it is enabled below (typesense.enabled).
             url: '{{ printf "%s-typesense" .Release.Name }}'
@@ -64,6 +56,14 @@ api:
             # Redis will only work if it is enabled below (redis.enabled).
             host: '{{ printf "%s-redis-master" .Release.Name }}'
             db: "{{ .Release.Name }}"
+  env:
+    # To utilize a secret in the environment variables, you can do something like the following: https://github.com/bjw-s/helm-charts/blob/a081de53024d8328d1ae9ff7e4f6bc500b0f3a29/charts/library/common/values.yaml#L141-L145
+    # You could also use MySQL or SQLite, but we recommend PostgreSQL.
+    # https://vikunja.io/docs/config-options/#type
+    VIKUNJA_DATABASE_TYPE: "postgres"
+    VIKUNJA_DATABASE_USER: "{{ .Values.postgresql.global.postgresql.auth.username }}"
+    VIKUNJA_DATABASE_PASSWORD: "{{ .Values.postgresql.global.postgresql.auth.password }}"
+    VIKUNJA_DATABASE_NAME: "{{ .Values.postgresql.global.postgresql.auth.database }}"
 
 frontend:
   enabled: true