diff --git a/charts/postgresql/templates/configmap.yaml b/charts/postgresql/templates/configmap.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..4e4117cab86a189968bc2f0a77c299f603e6aadb
--- /dev/null
+++ b/charts/postgresql/templates/configmap.yaml
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: postgresql-config
+  namespace: {{ .Release.Namespace }}
+data:
+  POSTGRES_DB: postgres
+  POSTGRES_PASSWORD: {{ .Values.POSTGRES_PASSWORD }}
+  POSTGRES_USER: postgres
diff --git a/charts/postgresql/templates/service.yaml b/charts/postgresql/templates/service.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..cd9ee6fc9935ea57ea80ff5779007d12af3978f2
--- /dev/null
+++ b/charts/postgresql/templates/service.yaml
@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: postgresql
+  namespace: {{ .Release.Namespace }}
+spec:
+  ports:
+  - port: 5432
+    protocol: TCP
+    targetPort: 5432
+  selector:
+    app: postgresql
+  sessionAffinity: None
diff --git a/charts/postgresql/templates/statefulset.yaml b/charts/postgresql/templates/statefulset.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..5c342326eae8c7f7e116ed99ab738738c7b870a7
--- /dev/null
+++ b/charts/postgresql/templates/statefulset.yaml
@@ -0,0 +1,87 @@
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: postgresql
+  namespace: {{ .Release.Namespace }}
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: postgresql
+  serviceName: ""
+  template:
+    metadata:
+      labels:
+        app: postgresql
+    spec:
+      initContainers:
+        - name: lost-found
+          {{- if contains "/" .Values.image.repository }}
+          image: "{{ .Values.initImage.repository }}:{{ .Values.initImage.tag }}"
+          {{- else }}
+          image: "{{ .Values.global.hub }}/{{ .Values.initImage.repository }}:{{ .Values.initImage.tag }}{{ template "beagle.imageArch" . }}"
+          {{- end }}
+          command:
+            - rm
+            - '-Rf'
+            - /var/lib/postgresql/data/lost+found
+          resources: {}
+          volumeMounts:
+            - name: data
+              mountPath: /var/lib/postgresql/data
+        - name: init-data
+          {{- if contains "/" .Values.image.repository }}
+          image: "{{ .Values.initImage.repository }}:{{ .Values.initImage.tag }}"
+          {{- else }}
+          image: "{{ .Values.global.hub }}/{{ .Values.initImage.repository }}:{{ .Values.initImage.tag }}{{ template "beagle.imageArch" . }}"
+          {{- end }}
+          command:
+            - chown
+            - '-R'
+            - '999:999'
+            - /var/lib/postgresql/data
+          resources: {}
+          volumeMounts:
+            - name: data
+              mountPath: /var/lib/postgresql/data
+      containers:
+      - envFrom:
+        - configMapRef:
+            name: postgresql-config
+        {{- if contains "/" .Values.image.repository }}
+        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+        {{- else }}
+        image: "{{ .Values.global.hub }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}{{ template "beagle.imageArch" . }}"
+        {{- end }}
+        imagePullPolicy: "{{ .Values.global.imagePullPolicy }}"
+        name: data
+        ports:
+        - containerPort: 5432
+          protocol: TCP
+        volumeMounts:
+        - mountPath: /var/lib/postgresql/data
+          name: data
+        - mountPath: /etc/localtime
+          name: localtime
+      restartPolicy: Always
+      volumes:
+      - hostPath:
+          path: /etc/localtime
+          type: ""
+        name: localtime
+  volumeClaimTemplates:
+  - apiVersion: v1
+    kind: PersistentVolumeClaim
+    metadata:
+      labels:
+        app: postgresql
+      name: data
+    spec:
+      accessModes:
+      - ReadWriteOnce
+      resources:
+        requests:
+          storage: 10Gi
+      storageClassName: {{ .Values.storageClassName }}
+      volumeMode: Filesystem
+
diff --git a/charts/redis/templates/svc.yaml b/charts/redis/templates/svc.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ee6b064b9a2c21b5219f485b0e283e6e4dcc5b27
--- /dev/null
+++ b/charts/redis/templates/svc.yaml
@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: redis
+  namespace: {{ .Release.Namespace }}
+spec:
+  ports:
+  - port: 6379
+    protocol: TCP
+    targetPort: 6379
+  selector:
+    app: redis
+  sessionAffinity: None