diff --git a/etc/k8s/helm-chart/eventhub/charts/postgresql/templates/postgresql-persistent-volume-claim.yaml b/etc/k8s/helm-chart/eventhub/charts/postgresql/templates/postgresql-persistent-volume-claim.yaml
new file mode 100644
index 0000000..1952a3f
--- /dev/null
+++ b/etc/k8s/helm-chart/eventhub/charts/postgresql/templates/postgresql-persistent-volume-claim.yaml
@@ -0,0 +1,13 @@
+{{- if eq .Release.Name "eh-az" }}
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: {{ .Release.Name }}-{{ .Chart.Name }}-pvc
+spec:
+  accessModes:
+  - ReadWriteOnce
+  storageClassName: managed-premium-retain
+  resources:
+    requests:
+      storage: 64Gi
+{{- end }}
\ No newline at end of file
diff --git a/etc/k8s/helm-chart/eventhub/charts/postgresql/templates/postgresql.yaml b/etc/k8s/helm-chart/eventhub/charts/postgresql/templates/postgresql.yaml
index b967635..0b6eef4 100644
--- a/etc/k8s/helm-chart/eventhub/charts/postgresql/templates/postgresql.yaml
+++ b/etc/k8s/helm-chart/eventhub/charts/postgresql/templates/postgresql.yaml
@@ -15,6 +15,12 @@ spec:
       containers:
         - image: postgres
           name: {{ .Release.Name }}-{{ .Chart.Name }}
+{{- if eq .Release.Name "eh-az" }}
+          volumeMounts:
+          - mountPath: "/var/lib/postgresql/data"
+            name: {{ .Release.Name }}-{{ .Chart.Name }}-database-volume
+            subPath: postgresql-data
+{{- end }}
           ports:
             - name: postgresql
               containerPort: 5432
@@ -22,4 +28,10 @@ spec:
           - name: POSTGRES_USER
             value: "root"
           - name: POSTGRES_PASSWORD
-            value: "root"
\ No newline at end of file
+            value: "root"
+{{- if eq .Release.Name "eh-az" }}
+      volumes:
+        - name: {{ .Release.Name }}-{{ .Chart.Name }}-database-volume
+          persistentVolumeClaim:
+            claimName: {{ .Release.Name }}-{{ .Chart.Name }}-pvc
+{{- end }}
\ No newline at end of file
diff --git a/etc/k8s/helm-chart/eventhub/templates/managed-premium-retain.yaml b/etc/k8s/helm-chart/eventhub/templates/managed-premium-retain.yaml
new file mode 100644
index 0000000..3ad6d00
--- /dev/null
+++ b/etc/k8s/helm-chart/eventhub/templates/managed-premium-retain.yaml
@@ -0,0 +1,11 @@
+{{- if eq .Release.Name "eh-az" }}
+kind: StorageClass
+apiVersion: storage.k8s.io/v1
+metadata:
+  name: managed-premium-retain
+provisioner: kubernetes.io/azure-disk
+reclaimPolicy: Retain
+parameters:
+  storageaccounttype: Premium_LRS
+  kind: Managed
+{{- end }}
\ No newline at end of file