diff --git a/charts/premium/nextcloud/templates/_configmap.tpl b/charts/premium/nextcloud/templates/_configmap.tpl
index 081cf5d71c2..fe6ef40a2bb 100644
--- a/charts/premium/nextcloud/templates/_configmap.tpl
+++ b/charts/premium/nextcloud/templates/_configmap.tpl
@@ -114,9 +114,15 @@ nextcloud-config:
     {{/* Database */}}
     POSTGRES_DB: {{ .Values.cnpg.main.database | quote }}
     POSTGRES_USER: {{ .Values.cnpg.main.user | quote }}
-    POSTGRES_PASSWORD: {{ .Values.cnpg.main.creds.password | trimAll "\"" }}
+    POSTGRES_PASSWORD: {{ .Values.cnpg.main.password | trimAll "\"" }}
     POSTGRES_HOST: {{ .Values.cnpg.main.creds.host | trimAll "\"" }}
 
+    {{/* Compatibility Layer to support database changes */}}
+    NX_POSTGRES_NAME: {{ .Values.cnpg.main.database | quote }}
+    NX_POSTGRES_USER: {{ .Values.cnpg.main.user | quote }}
+    NX_POSTGRES_PASSWORD: {{ .Values.cnpg.main.password | trimAll "\"" }}
+    NX_POSTGRES_HOST: {{ .Values.cnpg.main.creds.host | trimAll "\"" }}
+
     {{/* Redis */}}
     NX_REDIS_HOST: {{ $redisHost }}
     NX_REDIS_PASS: {{ $redisPass }}