diff --git a/charts/enterprise/blocky/Chart.yaml b/charts/enterprise/blocky/Chart.yaml
index 6dd8e59210f..4a151639470 100644
--- a/charts/enterprise/blocky/Chart.yaml
+++ b/charts/enterprise/blocky/Chart.yaml
@@ -44,4 +44,4 @@ sources:
   - https://hub.docker.com/r/spx01/blocky
   - https://quay.io/oriedge/k8s_gateway
 type: application
-version: 13.5.3
+version: 13.5.4
diff --git a/charts/enterprise/blocky/values.yaml b/charts/enterprise/blocky/values.yaml
index 64e1ac95f8c..a328d979715 100644
--- a/charts/enterprise/blocky/values.yaml
+++ b/charts/enterprise/blocky/values.yaml
@@ -318,7 +318,7 @@ configmap:
         - name: BlockyPostgres
           type: postgres
           uid: blockypostgres
-          url: {{ .Values.cnpg.main.creds.portHost | default "na" }}
+          url: {{ printf "%s:5432" (.Values.cnpg.main.creds.host | trimAll "\"") }}
           access: proxy
           user: {{ .Values.cnpg.main.user }}
           secureJsonData:
@@ -375,6 +375,7 @@ queryLog:
   creationAttempts: 3
   # optional: Time between the creation attempts, default: 2s
   creationCooldown: 2s
+
 cnpg:
   main:
     enabled: true