diff --git a/charts/shlink-backend/Chart.yaml b/charts/shlink-backend/Chart.yaml
index 4cc8226d..aef8aa42 100644
--- a/charts/shlink-backend/Chart.yaml
+++ b/charts/shlink-backend/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: shlink-backend
 description: A PHP-based self-hosted URL shortener that can be used to serve shortened URLs under your own domain.
 type: application
-version: 2.12.3
-appVersion: "3.6.3"
+version: 2.12.4
+appVersion: "3.6.4"
 home: https://github.com/christianknell/helm-charts
 icon: https://shlink.io/images/shlink-logo-blue.svg
 maintainers:
@@ -36,4 +36,6 @@ dependencies:
 annotations:
   artifacthub.io/changes: |
     - kind: changed
-      description: bumped chart version of postgresql to 12.12.10
+      description: bumped image version to 3.6.4
+    - kind: fixed
+      description: postgresql includes and templates
diff --git a/charts/shlink-backend/README.md b/charts/shlink-backend/README.md
index 7be6adab..67ff9b06 100644
--- a/charts/shlink-backend/README.md
+++ b/charts/shlink-backend/README.md
@@ -58,7 +58,7 @@ The command removes all the Kubernetes components associated with the chart and
 | fullnameOverride                           | string | `""`                       | String to fully override `"shlink-backend.fullname"`                                                                   |
 | image.pullPolicy                           | string | `"Always"`                 | image pull policy                                                                                                      |
 | image.repository                           | string | `"shlinkio/shlink"`        | image repository                                                                                                       |
-| image.tag                                  | string | `"3.6.3"`                  | Overrides the image tag                                                                                                |
+| image.tag                                  | string | `"3.6.4"`                  | Overrides the image tag                                                                                                |
 | imagePullSecrets                           | list   | `[]`                       | If defined, uses a Secret to pull an image from a private Docker registry or repository.                               |
 | ingress.annotations                        | object | `{}`                       |                                                                                                                        |
 | ingress.className                          | string | `""`                       |                                                                                                                        |
diff --git a/charts/shlink-backend/templates/deployment.yaml b/charts/shlink-backend/templates/deployment.yaml
index 9410e3e5..9f4133ee 100644
--- a/charts/shlink-backend/templates/deployment.yaml
+++ b/charts/shlink-backend/templates/deployment.yaml
@@ -81,18 +81,18 @@ spec:
             - name: DB_DRIVER
               value: postgres
             - name: DB_HOST
-              value: {{ include "postgresql.primary.fullname" .Subcharts.postgresql }}
+              value: {{ include "postgresql.v1.primary.fullname" .Subcharts.postgresql }}
             - name: DB_PORT
-              value: {{ include "postgresql.service.port" .Subcharts.postgresql | quote }}
+              value: {{ include "postgresql.v1.service.port" .Subcharts.postgresql | quote }}
             - name: DB_NAME
-              value: {{ include "postgresql.database" .Subcharts.postgresql }}
+              value: {{ include "postgresql.v1.database" .Subcharts.postgresql }}
             - name: DB_USER
-              value: {{ include "postgresql.username" .Subcharts.postgresql }}
+              value: {{ include "postgresql.v1.username" .Subcharts.postgresql }}
             - name: DB_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: {{ template "postgresql.secretName" .Subcharts.postgresql }}
-                  key: {{ template "postgresql.userPasswordKey" .Subcharts.postgresql }}
+                  name: {{ template "postgresql.v1.secretName" .Subcharts.postgresql }}
+                  key: {{ template "postgresql.v1.userPasswordKey" .Subcharts.postgresql }}
             {{- end }}
             # RabbitMQ Settings
             {{- if .Values.rabbitmq.enabled }}
diff --git a/charts/shlink-backend/values.yaml b/charts/shlink-backend/values.yaml
index 07e33d7a..d393c0b8 100644
--- a/charts/shlink-backend/values.yaml
+++ b/charts/shlink-backend/values.yaml
@@ -9,7 +9,7 @@ image:
   # -- image pull policy
   pullPolicy: Always
   # -- Overrides the image tag
-  tag: "3.6.3"
+  tag: "3.6.4"
 
 # -- If defined, uses a Secret to pull an image from a private Docker registry or repository.
 imagePullSecrets: []