diff --git a/odoo-argocd-apps/Chart.yaml b/odoo-argocd-apps/Chart.yaml
index b52861c..31ac7e3 100644
--- a/odoo-argocd-apps/Chart.yaml
+++ b/odoo-argocd-apps/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v2
 name: odoo-argocd-apps
 description: A Helm chart for deploying the requirements, main charts and postinstall as ArgoCD apps for Odoo
 type: application
-version: 0.1.0
+version: 0.1.1
diff --git a/odoo-argocd-apps/templates/odoo-chart.yaml b/odoo-argocd-apps/templates/odoo-chart.yaml
index d2c5d72..8b8e436 100644
--- a/odoo-argocd-apps/templates/odoo-chart.yaml
+++ b/odoo-argocd-apps/templates/odoo-chart.yaml
@@ -13,7 +13,7 @@ spec:
     chart: odoo
     targetRevision: 28.x
     helm:
-      releaseName: odoo
+      releaseName: {{ .Values.argocd.prefix }}odoo
       valuesObject:
         odooEmail: {{ .Values.odoo.odooEmail }}
         replicaCount: {{ .Values.odoo.replicaCount }}
@@ -23,13 +23,13 @@ spec:
         postgresql:
           enabled: false
         externalDatabase:
-          host: odoo-db-rw
-          port: 5432
-          user: app
-          database: app
-          create: false
-          existingSecret: odoo-db-app
-          existingSecretPasswordKey: password
+          host: {{ .Values.odoo.externalDatabase.host }}
+          port: {{ .Values.odoo.externalDatabase.port }}
+          user: {{ .Values.odoo.externalDatabase.user }}
+          database: {{ .Values.odoo.externalDatabase.database }}
+          create: {{ .Values.odoo.externalDatabase.create }}
+          existingSecret: {{ .Values.odoo.externalDatabase.passwordSecret.name }}
+          existingSecretPasswordKey: {{ .Values.odoo.externalDatabase.passwordSecret.key }}
   destination:
     server: {{ .Values.destination.server }}
     namespace: {{ .Values.destination.namespace }}
diff --git a/odoo-argocd-apps/templates/odoo-postinstall.yaml b/odoo-argocd-apps/templates/odoo-postinstall.yaml
index 983385e..24ef51e 100644
--- a/odoo-argocd-apps/templates/odoo-postinstall.yaml
+++ b/odoo-argocd-apps/templates/odoo-postinstall.yaml
@@ -15,6 +15,7 @@ spec:
     helm:
       releaseName: odoo-postinstall
       valuesObject:
+        prefix: {{ .Values.argocd.prefix }}
         tailscaleIngresses:
           odooHostname: {{ .Values.tailscaleIngresses.odooHostname }}
   destination:
diff --git a/odoo-argocd-apps/templates/odoo-requirements-app.yaml b/odoo-argocd-apps/templates/odoo-requirements-app.yaml
index e9226e2..8036ad9 100644
--- a/odoo-argocd-apps/templates/odoo-requirements-app.yaml
+++ b/odoo-argocd-apps/templates/odoo-requirements-app.yaml
@@ -15,8 +15,10 @@ spec:
     helm:
       releaseName: odoo-requirements
       valuesObject:
+        prefix: {{ .Values.argocd.prefix }}
         odoo:
           dbCluster:
+            enable: {{ .Values.odoo.dbCluster.enable }}
             numInstances: {{ .Values.odoo.dbCluster.numInstances }}
             size: {{ .Values.odoo.dbCluster.size }}
           dataPvc:
diff --git a/odoo-argocd-apps/values.yaml b/odoo-argocd-apps/values.yaml
index 93dce8f..7fd46a3 100644
--- a/odoo-argocd-apps/values.yaml
+++ b/odoo-argocd-apps/values.yaml
@@ -1,6 +1,7 @@
 argocd:
   namespace: argocd 
   project: default
+  prefix: null
   requirements:
     repoURL: "https://git.blarre.net/thomas/helm-charts.git"
     targetRevision: HEAD
@@ -16,6 +17,7 @@ destination:
 
 odoo:
   dbCluster:
+    enable: true
     numInstances: 3
     size: 10Gi
   dataPvc:
@@ -25,6 +27,15 @@ odoo:
   odooEmail: "admin@domain.net"
   resourcesPreset: "large"
   replicaCount: 1
+  externalDatabase:
+    host: odoo-db-rw
+    port: 5432
+    user: app
+    database: app
+    create: false
+    passwordSecret:
+      name: odoo-db-secret
+      key: password
 
 tailscaleIngresses:
   odooHostname: odoo
\ No newline at end of file
diff --git a/odoo-postinstall/Chart.yaml b/odoo-postinstall/Chart.yaml
index 7c8f65b..8df1555 100644
--- a/odoo-postinstall/Chart.yaml
+++ b/odoo-postinstall/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v2
 name: odoo-postinstall
 description: A Helm chart for deploying the postinall stuff for odoo, mainly the ingress
 type: application
-version: 0.1.0
+version: 0.1.1
diff --git a/odoo-postinstall/templates/odoo-ingress.yaml b/odoo-postinstall/templates/odoo-ingress.yaml
index fe13a21..c37c722 100644
--- a/odoo-postinstall/templates/odoo-ingress.yaml
+++ b/odoo-postinstall/templates/odoo-ingress.yaml
@@ -1,13 +1,13 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: ts-odoo
+  name: {{ .Values.prefix}}ts-odoo
   annotations:
     tailscale.com/funnel: "true"
 spec:
   defaultBackend:
     service:
-      name: odoo
+      name: {{ .Values.prefix }}odoo
       port:
         name: http
   ingressClassName: tailscale
diff --git a/odoo-postinstall/values.yaml b/odoo-postinstall/values.yaml
index 9f214a8..cf176df 100644
--- a/odoo-postinstall/values.yaml
+++ b/odoo-postinstall/values.yaml
@@ -1,2 +1,3 @@
+prefix: null
 tailcaleIngresses:
   odooHostname: odoo
\ No newline at end of file
diff --git a/odoo-requirements/Chart.yaml b/odoo-requirements/Chart.yaml
index 7f476c0..ab5ce61 100644
--- a/odoo-requirements/Chart.yaml
+++ b/odoo-requirements/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v2
 name: odoo-requirements
 description: A Helm chart for the requirements for Odoo
 type: application
-version: 0.1.0
+version: 0.1.1
diff --git a/odoo-requirements/templates/db-cluster.yaml b/odoo-requirements/templates/db-cluster.yaml
index d8753a3..2aceca2 100644
--- a/odoo-requirements/templates/db-cluster.yaml
+++ b/odoo-requirements/templates/db-cluster.yaml
@@ -1,8 +1,10 @@
-apiVersion: postgresql.cnpg.io/v1
+{{- if .Values.odoo.dbCluster.enabled -}}
+: postgresql.cnpg.io/v1
 kind: Cluster
 metadata:
-  name: odoo-db
+  name: {{ .Values.prefix }}odoo-db
 spec:
   instances: {{ .Values.odoo.dbCluster.numInstances }}
   storage:
-    size: {{ .Values.odoo.dbCluster.size }}
\ No newline at end of file
+    size: {{ .Values.odoo.dbCluster.size }}
+{{- end }}
\ No newline at end of file
diff --git a/odoo-requirements/templates/odoo-data.yaml b/odoo-requirements/templates/odoo-data.yaml
index 91d58d7..0b149c2 100644
--- a/odoo-requirements/templates/odoo-data.yaml
+++ b/odoo-requirements/templates/odoo-data.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{ .Values.odoo.dataPvc.name }}
+  name: {{ .Values.prefix }}{{ .Values.odoo.dataPvc.name }}
 spec:
   storageClassName: {{ .Values.odoo.dataPvc.storageClassName }}
   accessModes:
diff --git a/odoo-requirements/values.yaml b/odoo-requirements/values.yaml
index d09f541..e804888 100644
--- a/odoo-requirements/values.yaml
+++ b/odoo-requirements/values.yaml
@@ -1,5 +1,7 @@
+prefix: null
 odoo:
   dbCluster:
+    enable: true
     numInstances: 3
     size: 10Gi
   dataPvc: