diff --git a/Makefile b/Makefile
index 9b44c21278..510e8bf348 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ fake-aws fake-aws-s3 fake-aws-sqs aws-ingress fluent-bit kibana backoffice		\
 calling-test demo-smtp elasticsearch-curator elasticsearch-external				\
 elasticsearch-ephemeral minio-external cassandra-external						\
 nginx-ingress-controller nginx-ingress-services reaper sftd restund coturn		\
-inbucket k8ssandra-test-cluster
+inbucket k8ssandra-test-cluster postgresql
 KIND_CLUSTER_NAME     := wire-server
 
 package ?= all
diff --git a/changelog.d/5-internal/pr-3012 b/changelog.d/5-internal/pr-3012
new file mode 100644
index 0000000000..f969c52352
--- /dev/null
+++ b/changelog.d/5-internal/pr-3012
@@ -0,0 +1 @@
+Add wrapper for bitnami/postgresql chart.
diff --git a/charts/postgresql/Chart.yaml b/charts/postgresql/Chart.yaml
new file mode 100644
index 0000000000..bff81e0d6f
--- /dev/null
+++ b/charts/postgresql/Chart.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+description: Wrapper chart for bitnami/postgresql
+name: postgresql
+version: 0.0.42
diff --git a/charts/postgresql/README.md b/charts/postgresql/README.md
new file mode 100644
index 0000000000..84f4ee02a5
--- /dev/null
+++ b/charts/postgresql/README.md
@@ -0,0 +1,4 @@
+This is the wrapper for PostgreSQL Bitnami chart.
+
+Configure the values.yaml file to create the database, username, password and other configuration.
+List of parameters available - https://artifacthub.io/packages/helm/bitnami/postgresql#parameters
diff --git a/charts/postgresql/requirements.yaml b/charts/postgresql/requirements.yaml
new file mode 100644
index 0000000000..c1d2a1f639
--- /dev/null
+++ b/charts/postgresql/requirements.yaml
@@ -0,0 +1,4 @@
+dependencies:
+- name: postgresql
+  version: 11.9.8
+  repository: https://charts.bitnami.com/bitnami
diff --git a/charts/postgresql/values.yaml b/charts/postgresql/values.yaml
new file mode 100644
index 0000000000..fa2230183f
--- /dev/null
+++ b/charts/postgresql/values.yaml
@@ -0,0 +1,5 @@
+# Configure the parent postgresql chart
+postgresql:
+  fullnameOverride: postgresql
+  volumePermissions:
+    enabled: true