diff --git a/charts/flagsmith/Chart.lock b/charts/flagsmith/Chart.lock
index 0296d7d..35679ac 100644
--- a/charts/flagsmith/Chart.lock
+++ b/charts/flagsmith/Chart.lock
@@ -1,12 +1,9 @@
 dependencies:
-- name: postgresql
-  repository: https://charts.bitnami.com/bitnami
-  version: 12.5.8
 - name: influxdb2
   repository: https://helm.influxdata.com/
   version: 2.1.1
 - name: graphite
   repository: https://kiwigrid.github.io
   version: 0.7.3
-digest: sha256:6ed1b4fab608bb1039a42040c445cfdf6a74a32ac80d4b1137f420e86f08e481
-generated: "2023-06-20T13:58:28.286957382+01:00"
+digest: sha256:bb4cb379afbfd0c1f4bca8a10786c9651ca0ebdc9a34c3c74efafbeb3e198c0a
+generated: "2025-08-29T09:27:19.085559+05:30"
diff --git a/charts/flagsmith/Chart.yaml b/charts/flagsmith/Chart.yaml
index 91ac6c3..dd8295c 100644
--- a/charts/flagsmith/Chart.yaml
+++ b/charts/flagsmith/Chart.yaml
@@ -5,11 +5,6 @@ type: application
 version: 0.77.1
 appVersion: 2.194.0
 dependencies:
-  - name: postgresql
-    repository: https://charts.bitnami.com/bitnami
-    version: 12.5.8
-    condition: postgresql.enabled,devPostgresql.enabled
-    alias: devPostgresql
   - name: influxdb2
     repository: https://helm.influxdata.com/
     version: 2.1.1
diff --git a/charts/flagsmith/templates/_helpers.tpl b/charts/flagsmith/templates/_helpers.tpl
index 975c346..fd0e396 100644
--- a/charts/flagsmith/templates/_helpers.tpl
+++ b/charts/flagsmith/templates/_helpers.tpl
@@ -77,28 +77,9 @@ Common annotations
 Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
-{{- define "flagsmith.postgresql.fullname" -}}
-{{- if .Values.devPostgresql.fullnameOverride -}}
-{{- .Values.devPostgresql.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.devPostgresql.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name "bulletrain-postgresql" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
 
-{{/*
-Set postgres host
-*/}}
-{{- define "flagsmith.postgresql.host" -}}
-{{- if .Values.devPostgresql.enabled -}}
-{{- template "flagsmith.postgresql.fullname" . -}}
-{{- else -}}
-{{- .Values.devPostgresql.postgresqlHost | quote -}}
-{{- end -}}
+{{- define "flagsmith.postgresql.fullname" -}}
+{{ include "flagsmith.fullname" . }}-postgres
 {{- end -}}
 
 {{/*
@@ -182,7 +163,7 @@ Set redis port
 Postgres hostname
 */}}
 {{- define "flagsmith.postgres.hostname" -}}
-{{- printf "%s-%s" .Release.Name .Values.devPostgresql.nameOverride -}}.{{ .Release.Namespace }}.svc.cluster.local
+{{ include "flagsmith.fullname" . }}-postgres
 {{- end -}}
 
 {{/*
diff --git a/charts/flagsmith/templates/postgres-service.yaml b/charts/flagsmith/templates/postgres-service.yaml
new file mode 100644
index 0000000..a8a0e2c
--- /dev/null
+++ b/charts/flagsmith/templates/postgres-service.yaml
@@ -0,0 +1,12 @@
+{{- if .Values.devPostgresql.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "flagsmith.fullname" . }}-postgres
+spec:
+  ports:
+    - port: 5432
+      targetPort: 5432
+  selector:
+    app: {{ include "flagsmith.fullname" . }}-postgres
+{{- end }}
diff --git a/charts/flagsmith/templates/postgres-statefulset.yaml b/charts/flagsmith/templates/postgres-statefulset.yaml
new file mode 100644
index 0000000..055d007
--- /dev/null
+++ b/charts/flagsmith/templates/postgres-statefulset.yaml
@@ -0,0 +1,39 @@
+{{- if .Values.devPostgresql.enabled }}
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: {{ include "flagsmith.fullname" . }}-postgres
+spec:
+  serviceName: {{ include "flagsmith.fullname" . }}-postgres
+  replicas: 1
+  selector:
+    matchLabels:
+      app: {{ include "flagsmith.fullname" . }}-postgres
+  template:
+    metadata:
+      labels:
+        app: {{ include "flagsmith.fullname" . }}-postgres
+    spec:
+      containers:
+        - name: postgres
+          image: postgres:15
+          ports:
+            - containerPort: 5432
+          env:
+            - name: POSTGRES_DB
+              value: {{ .Values.devPostgresql.auth.database}}
+            - name: POSTGRES_PASSWORD
+              value: {{ .Values.devPostgresql.auth.postgresPassword}}
+
+          volumeMounts:
+            - name: data
+              mountPath: /var/lib/postgresql/data
+  volumeClaimTemplates:
+    - metadata:
+        name: data
+      spec:
+        accessModes: ["ReadWriteOnce"]
+        resources:
+          requests:
+            storage: {{ .Values.devPostgresql.storage }}
+{{- end }}
diff --git a/charts/flagsmith/values.yaml b/charts/flagsmith/values.yaml
index e20a27e..59d4566 100644
--- a/charts/flagsmith/values.yaml
+++ b/charts/flagsmith/values.yaml
@@ -245,13 +245,8 @@ taskProcessor:
   extraSpec: {} # Will be added to `spec` for `flagsmith-task-processor` deployment.
 
 devPostgresql:
-  image:
-    repository: bitnamilegacy/postgresql
-    tag: 15.3.0-debian-11-r7
   enabled: true
-  serviceAccount:
-    create: true
-  nameOverride: dev-postgresql
+  storage: 500m
   auth:
     postgresPassword: flagsmith
     database: flagsmith
diff --git a/ct.yaml b/ct.yaml
index f5e4bdf..22b3051 100644
--- a/ct.yaml
+++ b/ct.yaml
@@ -2,7 +2,6 @@
 # See https://github.com/Flagsmith/flagsmith-charts/issues/105
 chart-repos:
   - stable=https://charts.helm.sh/stable
-  - bitnami=https://charts.bitnami.com/bitnami
   - influxdata=https://helm.influxdata.com/
   - kiwigrid=https://kiwigrid.github.io
 target-branch: main