diff --git a/HelmChart/Public/oneuptime/templates/postgresql-configmap.yaml b/HelmChart/Public/oneuptime/templates/postgresql-configmap.yaml
new file mode 100644
index 0000000000..f59e67e448
--- /dev/null
+++ b/HelmChart/Public/oneuptime/templates/postgresql-configmap.yaml
@@ -0,0 +1,16 @@
+{{- if and .Values.postgresql.enabled .Values.postgresql.configuration }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Release.Name }}-postgresql-config
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app: {{ .Release.Name }}-postgresql
+    app.kubernetes.io/part-of: oneuptime
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: postgresql
+    appname: oneuptime
+data:
+  postgresql.conf: |
+{{ .Values.postgresql.configuration | indent 4 }}
+{{- end }}
\ No newline at end of file
diff --git a/HelmChart/Public/oneuptime/templates/postgresql-service.yaml b/HelmChart/Public/oneuptime/templates/postgresql-service.yaml
new file mode 100644
index 0000000000..122d4c0f88
--- /dev/null
+++ b/HelmChart/Public/oneuptime/templates/postgresql-service.yaml
@@ -0,0 +1,48 @@
+{{- if .Values.postgresql.enabled }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Release.Name }}-postgresql
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app: {{ .Release.Name }}-postgresql
+    app.kubernetes.io/part-of: oneuptime
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: postgresql
+    appname: oneuptime
+spec:
+  type: {{ .Values.postgresql.primary.service.type | default "ClusterIP" }}
+  ports:
+  - port: {{ .Values.postgresql.primary.service.ports.postgresql | int }}
+    targetPort: postgresql
+    protocol: TCP
+    name: postgresql
+  selector:
+    app: {{ .Release.Name }}-postgresql
+    app.kubernetes.io/component: postgresql
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Release.Name }}-postgresql-headless
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app: {{ .Release.Name }}-postgresql
+    app.kubernetes.io/part-of: oneuptime
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: postgresql
+    appname: oneuptime
+spec:
+  type: ClusterIP
+  clusterIP: None
+  ports:
+  - port: {{ .Values.postgresql.primary.service.ports.postgresql | int }}
+    targetPort: postgresql
+    protocol: TCP
+    name: postgresql
+  selector:
+    app: {{ .Release.Name }}-postgresql
+    app.kubernetes.io/component: postgresql
+{{- end }}
\ No newline at end of file