diff --git a/hirosystems/stacks-blockchain-api/Chart.yaml b/hirosystems/stacks-blockchain-api/Chart.yaml
index 22c5a09..01ea575 100644
--- a/hirosystems/stacks-blockchain-api/Chart.yaml
+++ b/hirosystems/stacks-blockchain-api/Chart.yaml
@@ -41,4 +41,4 @@ sources:
   - https://github.com/hirosystems/stacks-blockchain-api
   - https://docs.hiro.so/api
   - https://docs.hiro.so/get-started/stacks-blockchain-api
-version: 5.0.0
+version: 5.0.1
diff --git a/hirosystems/stacks-blockchain-api/templates/_helpers.tpl b/hirosystems/stacks-blockchain-api/templates/_helpers.tpl
index 8778e92..94b81ba 100644
--- a/hirosystems/stacks-blockchain-api/templates/_helpers.tpl
+++ b/hirosystems/stacks-blockchain-api/templates/_helpers.tpl
@@ -88,7 +88,7 @@ Return name of the CDN secret
 Return name of the Postgres user
 */}}
 {{- define "stacksBlockchainApi.postgresql.username" -}}
-{{ default "postgres" (include "postgresql.username" .Subcharts.postgresql) }}
+{{ default "postgres" (include "postgresql.v1.username" .Subcharts.postgresql) }}
 {{- end -}}
 
 
diff --git a/hirosystems/stacks-blockchain-api/templates/api-reader/deployment.yaml b/hirosystems/stacks-blockchain-api/templates/api-reader/deployment.yaml
index 520e907..4520392 100644
--- a/hirosystems/stacks-blockchain-api/templates/api-reader/deployment.yaml
+++ b/hirosystems/stacks-blockchain-api/templates/api-reader/deployment.yaml
@@ -125,22 +125,22 @@ spec:
             - name: STACKS_ADDRESS_CACHE_SIZE
               value: {{ default "50000" .Values.apiReader.config.stacksAddressCacheSize | quote }}
             - name: PG_DATABASE
-              value: {{ include "postgresql.database" .Subcharts.postgresql }}
+              value: {{ include "postgresql.v1.database" .Subcharts.postgresql }}
             - name: PG_SCHEMA
-              value: {{ include "postgresql.database" .Subcharts.postgresql }}
+              value: {{ include "postgresql.v1.database" .Subcharts.postgresql }}
             - name: PG_PRIMARY_HOST
-              value: {{ include "postgresql.primary.fullname" .Subcharts.postgresql }}
+              value: {{ include "postgresql.v1.primary.fullname" .Subcharts.postgresql }}
             - name: PG_HOST
               value: {{ include "common.names.fullname" .Subcharts.postgresql }}-all
             - name: PG_PORT
-              value: {{ include "postgresql.service.port" .Subcharts.postgresql | quote }}
+              value: {{ include "postgresql.v1.service.port" .Subcharts.postgresql | quote }}
             - name: PG_USER
               value: {{ include "stacksBlockchainApi.postgresql.username" . }}
             - name: PG_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  key: {{ include "postgresql.adminPasswordKey" .Subcharts.postgresql }}
-                  name: {{ include "postgresql.secretName" .Subcharts.postgresql }}
+                  key: {{ include "postgresql.v1.adminPasswordKey" .Subcharts.postgresql }}
+                  name: {{ include "postgresql.v1.secretName" .Subcharts.postgresql }}
             - name: PG_APPLICATION_NAME
               valueFrom:
                 fieldRef:
diff --git a/hirosystems/stacks-blockchain-api/templates/api-rosetta-reader/deployment.yaml b/hirosystems/stacks-blockchain-api/templates/api-rosetta-reader/deployment.yaml
index 5ea562b..94df7dc 100644
--- a/hirosystems/stacks-blockchain-api/templates/api-rosetta-reader/deployment.yaml
+++ b/hirosystems/stacks-blockchain-api/templates/api-rosetta-reader/deployment.yaml
@@ -125,22 +125,22 @@ spec:
             - name: STACKS_ADDRESS_CACHE_SIZE
               value: {{ default "50000" .Values.apiRosettaReader.config.stacksAddressCacheSize | quote }}
             - name: PG_DATABASE
-              value: {{ include "postgresql.database" .Subcharts.postgresql }}
+              value: {{ include "postgresql.v1.database" .Subcharts.postgresql }}
             - name: PG_SCHEMA
-              value: {{ include "postgresql.database" .Subcharts.postgresql }}
+              value: {{ include "postgresql.v1.database" .Subcharts.postgresql }}
             - name: PG_PRIMARY_HOST
-              value: {{ include "postgresql.primary.fullname" .Subcharts.postgresql }}
+              value: {{ include "postgresql.v1.primary.fullname" .Subcharts.postgresql }}
             - name: PG_HOST
               value: {{ include "common.names.fullname" .Subcharts.postgresql }}-all
             - name: PG_PORT
-              value: {{ include "postgresql.service.port" .Subcharts.postgresql | quote }}
+              value: {{ include "postgresql.v1.service.port" .Subcharts.postgresql | quote }}
             - name: PG_USER
               value: {{ include "stacksBlockchainApi.postgresql.username" . }}
             - name: PG_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  key: {{ include "postgresql.adminPasswordKey" .Subcharts.postgresql }}
-                  name: {{ include "postgresql.secretName" .Subcharts.postgresql }}
+                  key: {{ include "postgresql.v1.adminPasswordKey" .Subcharts.postgresql }}
+                  name: {{ include "postgresql.v1.secretName" .Subcharts.postgresql }}
             - name: PG_APPLICATION_NAME
               valueFrom:
                 fieldRef:
diff --git a/hirosystems/stacks-blockchain-api/templates/api-writer/statefulset.yaml b/hirosystems/stacks-blockchain-api/templates/api-writer/statefulset.yaml
index 565991b..a75bb85 100644
--- a/hirosystems/stacks-blockchain-api/templates/api-writer/statefulset.yaml
+++ b/hirosystems/stacks-blockchain-api/templates/api-writer/statefulset.yaml
@@ -111,20 +111,20 @@ spec:
             - name: PG_HOST
               value: {{ include "common.names.fullname" .Subcharts.postgresql }}-all
             - name: PG_PORT
-              value: {{ include "postgresql.service.port" .Subcharts.postgresql | quote }}
+              value: {{ include "postgresql.v1.service.port" .Subcharts.postgresql | quote }}
             - name: PG_USER
               value: {{ include "stacksBlockchainApi.postgresql.username" . }}
             - name: PG_DATABASE
-              value: {{ include "postgresql.database" .Subcharts.postgresql | quote }}
+              value: {{ include "postgresql.v1.database" .Subcharts.postgresql | quote }}
             - name: PG_SCHEMA
-              value: {{ include "postgresql.database" .Subcharts.postgresql }}
+              value: {{ include "postgresql.v1.database" .Subcharts.postgresql }}
             - name: PG_CONNECTION_POOL_MAX
               value: {{ .Values.apiWriter.config.pgConnectionPoolMax | quote }}
             - name: PG_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  key: {{ include "postgresql.adminPasswordKey" .Subcharts.postgresql | quote }}
-                  name: {{ include "postgresql.secretName" .Subcharts.postgresql | quote }}
+                  key: {{ include "postgresql.v1.adminPasswordKey" .Subcharts.postgresql | quote }}
+                  name: {{ include "postgresql.v1.secretName" .Subcharts.postgresql | quote }}
             - name: DATA_DIR
               value: {{ .Values.apiWriter.persistence.data.mountPath }}
           command:
@@ -249,22 +249,22 @@ spec:
             - name: STACKS_EVENTS_DIR
               value: {{ .Values.apiWriter.persistence.data.mountPath }}/events
             - name: PG_DATABASE
-              value: {{ include "postgresql.database" .Subcharts.postgresql }}
+              value: {{ include "postgresql.v1.database" .Subcharts.postgresql }}
             - name: PG_SCHEMA
-              value: {{ include "postgresql.database" .Subcharts.postgresql }}
+              value: {{ include "postgresql.v1.database" .Subcharts.postgresql }}
             - name: PG_PRIMARY_HOST
-              value: {{ include "postgresql.primary.fullname" .Subcharts.postgresql }}
+              value: {{ include "postgresql.v1.primary.fullname" .Subcharts.postgresql }}
             - name: PG_HOST
               value: {{ include "common.names.fullname" .Subcharts.postgresql }}-all
             - name: PG_PORT
-              value: {{ include "postgresql.service.port" .Subcharts.postgresql | quote }}
+              value: {{ include "postgresql.v1.service.port" .Subcharts.postgresql | quote }}
             - name: PG_USER
               value: {{ include "stacksBlockchainApi.postgresql.username" . }}
             - name: PG_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  key: {{ include "postgresql.adminPasswordKey" .Subcharts.postgresql | quote }}
-                  name: {{ include "postgresql.secretName" .Subcharts.postgresql | quote }}
+                  key: {{ include "postgresql.v1.adminPasswordKey" .Subcharts.postgresql | quote }}
+                  name: {{ include "postgresql.v1.secretName" .Subcharts.postgresql | quote }}
             - name: PG_APPLICATION_NAME
               valueFrom:
                 fieldRef:
@@ -357,22 +357,22 @@ spec:
             - name: STACKS_API_TOKEN_METADATA_STRICT_MODE
               value: {{ ternary "1" "0" .Values.apiWriter.config.enableTokenMetadataStrictMode | quote }}
             - name: PG_DATABASE
-              value: {{ include "postgresql.database" .Subcharts.postgresql }}
+              value: {{ include "postgresql.v1.database" .Subcharts.postgresql }}
             - name: PG_SCHEMA
-              value: {{ include "postgresql.database" .Subcharts.postgresql }}
+              value: {{ include "postgresql.v1.database" .Subcharts.postgresql }}
             - name: PG_PRIMARY_HOST
-              value: {{ include "postgresql.primary.fullname" .Subcharts.postgresql }}
+              value: {{ include "postgresql.v1.primary.fullname" .Subcharts.postgresql }}
             - name: PG_HOST
               value: {{ include "common.names.fullname" .Subcharts.postgresql }}-all
             - name: PG_PORT
-              value: {{ include "postgresql.service.port" .Subcharts.postgresql | quote }}
+              value: {{ include "postgresql.v1.service.port" .Subcharts.postgresql | quote }}
             - name: PG_USER
               value: {{ include "stacksBlockchainApi.postgresql.username" . }}
             - name: PG_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  key: {{ include "postgresql.adminPasswordKey" .Subcharts.postgresql }}
-                  name: {{ include "postgresql.secretName" .Subcharts.postgresql }}
+                  key: {{ include "postgresql.v1.adminPasswordKey" .Subcharts.postgresql }}
+                  name: {{ include "postgresql.v1.secretName" .Subcharts.postgresql }}
             - name: PG_APPLICATION_NAME
               valueFrom:
                 fieldRef: