diff --git a/apps/lldap/deployment.yaml b/apps/lldap/deployment.yaml
index 4c9daef..b8b55b2 100644
--- a/apps/lldap/deployment.yaml
+++ b/apps/lldap/deployment.yaml
@@ -41,7 +41,7 @@ spec:
             - name: LLDAP_DATABASE_URL
               valueFrom:
                 secretKeyRef:
-                  name: lldap-cluster-app
+                  name: lldap-db-cluster-app
                   key: uri
             - name: TZ
               value: CET
diff --git a/apps/lldap/kustomization.yaml b/apps/lldap/kustomization.yaml
index 02031ae..b225e33 100644
--- a/apps/lldap/kustomization.yaml
+++ b/apps/lldap/kustomization.yaml
@@ -4,7 +4,8 @@ namespace: lldap
 resources:
   - ./namespace.yaml
   - ./secret.yaml
-  - ./database.yaml
   - ./deployment.yaml
   - ./service.yaml
-  - ../../secrets/b2-access-key.yaml
+
+components:
+  - ../../common/postgres
diff --git a/secrets/b2-access-key.yaml b/common/postgres/b2-access-key.yaml
similarity index 100%
rename from secrets/b2-access-key.yaml
rename to common/postgres/b2-access-key.yaml
diff --git a/common/postgres/database.yaml b/common/postgres/database.yaml
new file mode 100644
index 0000000..5fe0ba1
--- /dev/null
+++ b/common/postgres/database.yaml
@@ -0,0 +1,30 @@
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: -db
+spec:
+  chart:
+    spec:
+      chart: cluster
+      reconcileStrategy: ChartVersion
+      sourceRef:
+        kind: HelmRepository
+        name: cnpg
+        namespace: cnpg-system
+      version: 0.0.11
+  interval: 1m0s
+  values:
+    type: postgresql
+    mode: standalone
+    cluster:
+      instances: 1
+    backups:
+      enabled: true
+      provider: s3
+      endpointURL: https://s3.us-west-002.backblazeb2.com
+      s3:
+        bucket: titan-k3s-backup
+        path: /postgres
+      secret:
+        create: false
+        name: b2-access-key
diff --git a/common/postgres/kustomization.yaml b/common/postgres/kustomization.yaml
new file mode 100644
index 0000000..eaaa2b2
--- /dev/null
+++ b/common/postgres/kustomization.yaml
@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+resources:
+  - ./database.yaml
+  - ./b2-access-key.yaml
+replacements:
+  - path: replacement.yaml
diff --git a/common/postgres/replacement.yaml b/common/postgres/replacement.yaml
new file mode 100644
index 0000000..05dfdea
--- /dev/null
+++ b/common/postgres/replacement.yaml
@@ -0,0 +1,12 @@
+source:
+  kind: Namespace
+  fieldPath: metadata.name
+targets:
+  - select:
+      kind: HelmRelease
+      name: -db
+    fieldPaths:
+      - metadata.name
+    options:
+      delimiter: "-"
+      index: 0