diff --git a/apps/authelia/kustomization.yaml b/apps/authelia/kustomization.yaml
index e937e66..2b1f212 100644
--- a/apps/authelia/kustomization.yaml
+++ b/apps/authelia/kustomization.yaml
@@ -6,7 +6,5 @@ resources:
   - ./repository.yaml
   - ./release.yaml
   - ./lldap.yaml
-
-components:
   - ../../common/postgres
   - ../../common/dragonflydb
diff --git a/apps/authelia/release.yaml b/apps/authelia/release.yaml
index 83ca2f4..56eb8c7 100644
--- a/apps/authelia/release.yaml
+++ b/apps/authelia/release.yaml
@@ -27,8 +27,8 @@ spec:
 
     secret:
       additionalSecrets:
-        authelia-db-app:
-          key: authelia-db-app
+        postgres-app:
+          key: postgres-app
         authelia-lldap:
           key: authelia-lldap
 
@@ -64,11 +64,11 @@ spec:
       storage:
         postgres:
           enabled: true
-          address: tcp://authelia-db-rw.authelia:5432
+          address: tcp://postgres-rw.authelia:5432
           database: app
           username: app
           password:
-            secret_name: authelia-db-app
+            secret_name: postgres-app
             path: password
 
       notifier:
diff --git a/apps/grafana/kustomization.yaml b/apps/grafana/kustomization.yaml
index 66e9d73..8889a3e 100644
--- a/apps/grafana/kustomization.yaml
+++ b/apps/grafana/kustomization.yaml
@@ -6,8 +6,6 @@ resources:
   - ./repository.yaml
   - ./release.yaml
   - ./lldap.yaml
-
-components:
   - ../../common/postgres
   - ../../common/dragonflydb
 
diff --git a/apps/grafana/release.yaml b/apps/grafana/release.yaml
index 74a86a6..c9121d3 100644
--- a/apps/grafana/release.yaml
+++ b/apps/grafana/release.yaml
@@ -62,8 +62,8 @@ spec:
       existingSecret: grafana-ldap-toml
 
     extraSecretMounts:
-      - name: grafana-db-app-mount
-        secretName: grafana-db-app
+      - name: postgres-app-mount
+        secretName: postgres-app
         defaultMode: 0440
         mountPath: /etc/secrets/db
         readOnly: true
diff --git a/apps/lldap/deployment.yaml b/apps/lldap/deployment.yaml
index f5daa18..b7d7807 100644
--- a/apps/lldap/deployment.yaml
+++ b/apps/lldap/deployment.yaml
@@ -48,7 +48,7 @@ spec:
             - name: LLDAP_DATABASE_URL
               valueFrom:
                 secretKeyRef:
-                  name: lldap-db-app
+                  name: postgres-app
                   key: uri
             - name: TZ
               value: CET
diff --git a/apps/lldap/kustomization.yaml b/apps/lldap/kustomization.yaml
index 1ae1dab..cee71e9 100644
--- a/apps/lldap/kustomization.yaml
+++ b/apps/lldap/kustomization.yaml
@@ -8,6 +8,4 @@ resources:
   - ./service.yaml
   - ./ingress.yaml
   - ./bootstrap
-
-components:
   - ../../common/postgres
diff --git a/common/dragonflydb/kustomization.yaml b/common/dragonflydb/kustomization.yaml
index ad6a7bb..79745d2 100644
--- a/common/dragonflydb/kustomization.yaml
+++ b/common/dragonflydb/kustomization.yaml
@@ -1,4 +1,4 @@
-apiVersion: kustomize.config.k8s.io/v1alpha1
-kind: Component
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 resources:
   - ./database.yaml
diff --git a/common/postgres/cluster.yaml b/common/postgres/cluster.yaml
index 407d6d5..5a87f08 100644
--- a/common/postgres/cluster.yaml
+++ b/common/postgres/cluster.yaml
@@ -1,7 +1,7 @@
 apiVersion: postgresql.cnpg.io/v1
 kind: Cluster
 metadata:
-  name: -db
+  name: postgres
 spec:
   instances: 2
 
diff --git a/common/postgres/kustomization.yaml b/common/postgres/kustomization.yaml
index cc93b48..634320c 100644
--- a/common/postgres/kustomization.yaml
+++ b/common/postgres/kustomization.yaml
@@ -1,7 +1,4 @@
-apiVersion: kustomize.config.k8s.io/v1alpha1
-kind: Component
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 resources:
   - ./cluster.yaml
-
-replacements:
-  - path: replacement.yaml
diff --git a/common/postgres/replacement.yaml b/common/postgres/replacement.yaml
deleted file mode 100644
index d5b9b9e..0000000
--- a/common/postgres/replacement.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-source:
-  kind: Namespace
-  fieldPath: metadata.name
-targets:
-  - select:
-      kind: Cluster
-      name: -db
-    fieldPaths:
-      - metadata.name
-    options:
-      delimiter: "-"
-      index: 0