diff --git a/charts/penpot/Chart.yaml b/charts/penpot/Chart.yaml
index 627d18a..17fa8bc 100644
--- a/charts/penpot/Chart.yaml
+++ b/charts/penpot/Chart.yaml
@@ -4,7 +4,7 @@ maintainers:
   email: tommy@skaug.me
 apiVersion: v2
 appVersion: 1.19.3
-version: 2.0.2
+version: 2.0.3
 description: Penpot is a design and prototyping platform for teams and individuals.
 home: https://github.com/tommy-skaug/charts
 icon: https://avatars.githubusercontent.com/u/30179644?s=200&v=4
diff --git a/charts/penpot/templates/db-init.yaml b/charts/penpot/templates/db-init.yaml
new file mode 100644
index 0000000..b28e977
--- /dev/null
+++ b/charts/penpot/templates/db-init.yaml
@@ -0,0 +1,20 @@
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ include "penpot.fullname" . }}-db-init
+  labels:
+    {{- include "penpot.labels" . | nindent 4 }}
+  annotations:
+    "helm.sh/hook": pre-install
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+spec:
+  template:
+    spec:
+      restartPolicy: Never
+      containers:
+        - name: penpot-db-init
+          image: "{{ .Values.postgres.dbInit.image.repository }}:{{ .Values.postgres.dbInit.image.tag }}"
+          envFrom:
+            - secretRef:
+                name: {{ .Values.postgres.secretName }}
+  backoffLimit: 3
\ No newline at end of file
diff --git a/charts/penpot/templates/deployment-backend.yaml b/charts/penpot/templates/deployment-backend.yaml
index 8daafe9..f1464cd 100644
--- a/charts/penpot/templates/deployment-backend.yaml
+++ b/charts/penpot/templates/deployment-backend.yaml
@@ -21,7 +21,7 @@ spec:
 
       containers:
         - name: {{ .Chart.Name }}-backend
-          image: "penpotapp/backend:{{ .Values.penpotVersion }}"
+          image: "{{ .Values.image.repositoryBackend }}:{{ .Values.penpotVersion }}"
           imagePullPolicy: IfNotPresent
           # securityContext:
           #   runAsUser: 1001
diff --git a/charts/penpot/templates/deployment-exporter.yaml b/charts/penpot/templates/deployment-exporter.yaml
index 7668f0f..f230c21 100644
--- a/charts/penpot/templates/deployment-exporter.yaml
+++ b/charts/penpot/templates/deployment-exporter.yaml
@@ -21,7 +21,7 @@ spec:
 
       containers:
         - name: {{ .Chart.Name }}-exporter
-          image: "penpotapp/exporter:{{ .Values.penpotVersion }}"
+          image: "{{ .Values.image.repositoryExporter }}:{{ .Values.penpotVersion }}"
           imagePullPolicy: IfNotPresent
           # securityContext:
           #   runAsUser: 1001
diff --git a/charts/penpot/templates/deployment-frontend.yaml b/charts/penpot/templates/deployment-frontend.yaml
index 25dd4c3..3606480 100644
--- a/charts/penpot/templates/deployment-frontend.yaml
+++ b/charts/penpot/templates/deployment-frontend.yaml
@@ -20,7 +20,7 @@ spec:
       #   fsGroup: 1001
       containers:
         - name: {{ .Chart.Name }}-frontend
-          image: "penpotapp/frontend:{{ .Values.penpotVersion }}"
+          image: "{{ .Values.image.repositoryFrontend }}:{{ .Values.penpotVersion }}"
           imagePullPolicy: IfNotPresent
           # securityContext:
           #   runAsUser: 1001
diff --git a/charts/penpot/values.yaml b/charts/penpot/values.yaml
index d16b79e..c1276a4 100644
--- a/charts/penpot/values.yaml
+++ b/charts/penpot/values.yaml
@@ -25,3 +25,18 @@ exporter:
   resources:
     limits: {}
     requests: {}
+
+image:
+  imagePullPolicy: IfNotPresent
+  repositoryBackend: penpotapp/backend
+  repositoryFrontend: penpotapp/frontend
+  repositoryExporter: penpotapp/exporter
+
+postgres:
+  dbInit:
+    repository: ghcr.io/onedr0p/postgres-init
+    tag: "16"
+  hostname: "postgres-rw.databases.svc.cluster.local"
+  database_name: "penpot"
+  port: "5432"
+  secretName: penpot-secret