diff --git a/charts/baserow/Chart.yaml b/charts/baserow/Chart.yaml
index 8caff9fc..92a9468a 100644
--- a/charts/baserow/Chart.yaml
+++ b/charts/baserow/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: baserow
 description: Baserow is an open source no-code database and Airtable alternative.
 type: application
-version: 1.25.0
+version: 1.26.0
 appVersion: "1.19.1"
 home: https://github.com/christianknell/helm-charts
 icon: https://baserow.io/img/favicon_192.png
@@ -15,7 +15,7 @@ sources:
 dependencies:
   - name: postgresql
     repository: https://charts.bitnami.com/bitnami
-    version: 12.10.0
+    version: 12.12.10
     condition: postgresql.enabled
   - name: redis
     repository: https://charts.bitnami.com/bitnami
@@ -25,7 +25,9 @@ annotations:
   artifacthub.io/category: database
   artifacthub.io/changes: |
     - kind: changed
-      description: bumped dependency of postgresql to chart version 12.10.0
+      description: bumped dependency of postgresql to chart version 12.12.10
+    - kind: fixed
+      description: wrong template name for postgresql dependency
   artifacthub.io/screenshots: |
     - title: Create your own online database without technical experience.
       url: https://baserow.io/_nuxt/img/home_intro_screenshot.194c66b.png
diff --git a/charts/baserow/templates/_helpers.tpl b/charts/baserow/templates/_helpers.tpl
index 814e9994..859a4286 100644
--- a/charts/baserow/templates/_helpers.tpl
+++ b/charts/baserow/templates/_helpers.tpl
@@ -310,7 +310,7 @@ Return the hostname of the postgresql to use
 */}}
 {{- define "baserow.postgresql.hostname" -}}
   {{- if .Values.postgresql.enabled -}}
-    {{- printf "%s" (include "postgresql.primary.fullname" .Subcharts.postgresql) -}}
+    {{- printf "%s" (include "postgresql.v1.primary.fullname" .Subcharts.postgresql) -}}
   {{- else -}}
     {{- printf "%s" (tpl .Values.externalPostgresql.hostname $) -}}
   {{- end -}}
@@ -321,7 +321,7 @@ Return postgresql service port
 */}}
 {{- define "baserow.postgresql.port" -}}
   {{- if .Values.postgresql.enabled -}}
-    {{- printf "%s" (include "postgresql.service.port" .Subcharts.postgresql) -}}
+    {{- printf "%s" (include "postgresql.v1.service.port" .Subcharts.postgresql) -}}
   {{- else -}}
     {{- printf "%s" (tpl (toString .Values.externalPostgresql.port) $) -}}
   {{- end -}}
@@ -332,7 +332,7 @@ Return the name for the database to use
 */}}
 {{- define "baserow.postgresql.database" -}}
   {{- if .Values.postgresql.enabled -}}
-    {{- printf "%s" (include "postgresql.database" .Subcharts.postgresql) -}}
+    {{- printf "%s" (include "postgresql.v1.database" .Subcharts.postgresql) -}}
   {{- else -}}
     {{- printf "%s" (tpl .Values.externalPostgresql.auth.database $) -}}
   {{- end -}}
@@ -343,7 +343,7 @@ Return the name for the user to use
 */}}
 {{- define "baserow.postgresql.username" -}}
   {{- if .Values.postgresql.enabled -}}
-    {{- printf "%s" (include "postgresql.username" .Subcharts.postgresql) -}}
+    {{- printf "%s" (include "postgresql.v1.username" .Subcharts.postgresql) -}}
   {{- else -}}
     {{- printf "%s" (tpl .Values.externalPostgresql.auth.username $) -}}
   {{- end -}}
@@ -354,7 +354,7 @@ Get the name of the secret containing the postgresql user password
 */}}
 {{- define "baserow.postgresql.secretName" -}}
   {{- if .Values.postgresql.enabled -}}
-    {{- printf "%s" (include "postgresql.secretName" .Subcharts.postgresql) -}}
+    {{- printf "%s" (include "postgresql.v1.secretName" .Subcharts.postgresql) -}}
   {{- else if .Values.externalPostgresql.auth.existingSecret -}}
     {{- printf "%s" (tpl .Values.externalPostgresql.auth.existingSecret $) -}}
   {{- else -}}
@@ -367,7 +367,7 @@ Get the user-password key for the postgresql user password
 */}}
 {{- define "baserow.postgresql.userPasswordKey" -}}
   {{- if .Values.postgresql.enabled -}}
-    {{- printf "%s" (include "postgresql.userPasswordKey" .Subcharts.postgresql) -}}
+    {{- printf "%s" (include "postgresql.v1.userPasswordKey" .Subcharts.postgresql) -}}
   {{- else if .Values.externalPostgresql.auth.userPasswordKey -}}
     {{- printf "%s" (tpl .Values.externalPostgresql.auth.userPasswordKey $) -}}
   {{- else -}}
diff --git a/charts/baserow/templates/asgi-deployment.yaml b/charts/baserow/templates/asgi/asgi-deployment.yaml
similarity index 100%
rename from charts/baserow/templates/asgi-deployment.yaml
rename to charts/baserow/templates/asgi/asgi-deployment.yaml
diff --git a/charts/baserow/templates/asgi-hpa.yaml b/charts/baserow/templates/asgi/asgi-hpa.yaml
similarity index 100%
rename from charts/baserow/templates/asgi-hpa.yaml
rename to charts/baserow/templates/asgi/asgi-hpa.yaml
diff --git a/charts/baserow/templates/asgi-service.yaml b/charts/baserow/templates/asgi/asgi-service.yaml
similarity index 100%
rename from charts/baserow/templates/asgi-service.yaml
rename to charts/baserow/templates/asgi/asgi-service.yaml
diff --git a/charts/baserow/templates/asgi-serviceaccount.yaml b/charts/baserow/templates/asgi/asgi-serviceaccount.yaml
similarity index 100%
rename from charts/baserow/templates/asgi-serviceaccount.yaml
rename to charts/baserow/templates/asgi/asgi-serviceaccount.yaml
diff --git a/charts/baserow/templates/backend-aws-secret.yaml b/charts/baserow/templates/backend/backend-aws-secret.yaml
similarity index 100%
rename from charts/baserow/templates/backend-aws-secret.yaml
rename to charts/baserow/templates/backend/backend-aws-secret.yaml
diff --git a/charts/baserow/templates/backend-configmap.yaml b/charts/baserow/templates/backend/backend-configmap.yaml
similarity index 100%
rename from charts/baserow/templates/backend-configmap.yaml
rename to charts/baserow/templates/backend/backend-configmap.yaml
diff --git a/charts/baserow/templates/backend-ingress.yaml b/charts/baserow/templates/backend/backend-ingress.yaml
similarity index 100%
rename from charts/baserow/templates/backend-ingress.yaml
rename to charts/baserow/templates/backend/backend-ingress.yaml
diff --git a/charts/baserow/templates/backend-pvc.yaml b/charts/baserow/templates/backend/backend-pvc.yaml
similarity index 100%
rename from charts/baserow/templates/backend-pvc.yaml
rename to charts/baserow/templates/backend/backend-pvc.yaml
diff --git a/charts/baserow/templates/backend-secret.yaml b/charts/baserow/templates/backend/backend-secret.yaml
similarity index 100%
rename from charts/baserow/templates/backend-secret.yaml
rename to charts/baserow/templates/backend/backend-secret.yaml
diff --git a/charts/baserow/templates/celery-deployment.yaml b/charts/baserow/templates/celery/celery-deployment.yaml
similarity index 100%
rename from charts/baserow/templates/celery-deployment.yaml
rename to charts/baserow/templates/celery/celery-deployment.yaml
diff --git a/charts/baserow/templates/celery-hpa.yaml b/charts/baserow/templates/celery/celery-hpa.yaml
similarity index 100%
rename from charts/baserow/templates/celery-hpa.yaml
rename to charts/baserow/templates/celery/celery-hpa.yaml
diff --git a/charts/baserow/templates/celery-serviceaccount.yaml b/charts/baserow/templates/celery/celery-serviceaccount.yaml
similarity index 100%
rename from charts/baserow/templates/celery-serviceaccount.yaml
rename to charts/baserow/templates/celery/celery-serviceaccount.yaml
diff --git a/charts/baserow/templates/postgresql-secret.yaml b/charts/baserow/templates/database/postgresql-secret.yaml
similarity index 100%
rename from charts/baserow/templates/postgresql-secret.yaml
rename to charts/baserow/templates/database/postgresql-secret.yaml
diff --git a/charts/baserow/templates/redis-secret.yaml b/charts/baserow/templates/database/redis-secret.yaml
similarity index 100%
rename from charts/baserow/templates/redis-secret.yaml
rename to charts/baserow/templates/database/redis-secret.yaml
diff --git a/charts/baserow/templates/frontend-configmap.yaml b/charts/baserow/templates/frontend/frontend-configmap.yaml
similarity index 100%
rename from charts/baserow/templates/frontend-configmap.yaml
rename to charts/baserow/templates/frontend/frontend-configmap.yaml
diff --git a/charts/baserow/templates/frontend-deployment.yaml b/charts/baserow/templates/frontend/frontend-deployment.yaml
similarity index 100%
rename from charts/baserow/templates/frontend-deployment.yaml
rename to charts/baserow/templates/frontend/frontend-deployment.yaml
diff --git a/charts/baserow/templates/frontend-hpa.yaml b/charts/baserow/templates/frontend/frontend-hpa.yaml
similarity index 100%
rename from charts/baserow/templates/frontend-hpa.yaml
rename to charts/baserow/templates/frontend/frontend-hpa.yaml
diff --git a/charts/baserow/templates/frontend-ingress.yaml b/charts/baserow/templates/frontend/frontend-ingress.yaml
similarity index 100%
rename from charts/baserow/templates/frontend-ingress.yaml
rename to charts/baserow/templates/frontend/frontend-ingress.yaml
diff --git a/charts/baserow/templates/frontend-service.yaml b/charts/baserow/templates/frontend/frontend-service.yaml
similarity index 100%
rename from charts/baserow/templates/frontend-service.yaml
rename to charts/baserow/templates/frontend/frontend-service.yaml
diff --git a/charts/baserow/templates/frontend-serviceaccount.yaml b/charts/baserow/templates/frontend/frontend-serviceaccount.yaml
similarity index 100%
rename from charts/baserow/templates/frontend-serviceaccount.yaml
rename to charts/baserow/templates/frontend/frontend-serviceaccount.yaml
diff --git a/charts/baserow/templates/configmap.yaml b/charts/baserow/templates/general/configmap.yaml
similarity index 100%
rename from charts/baserow/templates/configmap.yaml
rename to charts/baserow/templates/general/configmap.yaml
diff --git a/charts/baserow/templates/email-secret.yaml b/charts/baserow/templates/general/email-secret.yaml
similarity index 100%
rename from charts/baserow/templates/email-secret.yaml
rename to charts/baserow/templates/general/email-secret.yaml
diff --git a/charts/baserow/templates/wsgi-deployment.yaml b/charts/baserow/templates/wsgi/wsgi-deployment.yaml
similarity index 100%
rename from charts/baserow/templates/wsgi-deployment.yaml
rename to charts/baserow/templates/wsgi/wsgi-deployment.yaml
diff --git a/charts/baserow/templates/wsgi-hpa.yaml b/charts/baserow/templates/wsgi/wsgi-hpa.yaml
similarity index 100%
rename from charts/baserow/templates/wsgi-hpa.yaml
rename to charts/baserow/templates/wsgi/wsgi-hpa.yaml
diff --git a/charts/baserow/templates/wsgi-service.yaml b/charts/baserow/templates/wsgi/wsgi-service.yaml
similarity index 100%
rename from charts/baserow/templates/wsgi-service.yaml
rename to charts/baserow/templates/wsgi/wsgi-service.yaml
diff --git a/charts/baserow/templates/wsgi-serviceaccount.yaml b/charts/baserow/templates/wsgi/wsgi-serviceaccount.yaml
similarity index 100%
rename from charts/baserow/templates/wsgi-serviceaccount.yaml
rename to charts/baserow/templates/wsgi/wsgi-serviceaccount.yaml