diff --git a/kubernetes/apps/database/crunchy-postgres-operator/cluster/cluster.yaml b/kubernetes/apps/database/crunchy-postgres-operator/cluster/cluster.yaml
index 4720a093b..b3af3c287 100644
--- a/kubernetes/apps/database/crunchy-postgres-operator/cluster/cluster.yaml
+++ b/kubernetes/apps/database/crunchy-postgres-operator/cluster/cluster.yaml
@@ -119,6 +119,10 @@ spec:
       databases:
         - tandoor
       password: *password
+    - name: vaultwarden
+      databases:
+        - vaultwarden
+      password: *password
     - name: vikunja
       databases:
         - vikunja
diff --git a/kubernetes/apps/default/sharry/app/externalsecret.yaml b/kubernetes/apps/default/sharry/app/externalsecret.yaml
index 0c114948a..a9c159449 100644
--- a/kubernetes/apps/default/sharry/app/externalsecret.yaml
+++ b/kubernetes/apps/default/sharry/app/externalsecret.yaml
@@ -13,8 +13,8 @@ spec:
     template:
       engineVersion: v2
       data:
-        SHARRY_BACKEND_JDBC_USER: &dbUser "{{ .POSTGRES_USER }}"
-        SHARRY_BACKEND_JDBC_PASSWORD: &dbPass "{{ .POSTGRES_PASS }}"
+        SHARRY_BACKEND_JDBC_USER: "{{ .POSTGRES_USER }}"
+        SHARRY_BACKEND_JDBC_PASSWORD: "{{ .POSTGRES_PASS }}"
   dataFrom:
     - extract:
         key: sharry
diff --git a/kubernetes/apps/default/sonarr/app/externalsecret.yaml b/kubernetes/apps/default/sonarr/app/externalsecret.yaml
index 796c9de25..b873993d8 100644
--- a/kubernetes/apps/default/sonarr/app/externalsecret.yaml
+++ b/kubernetes/apps/default/sonarr/app/externalsecret.yaml
@@ -13,21 +13,9 @@ spec:
     name: sonarr-secret
     template:
       data:
-        # App
         SONARR__AUTH__APIKEY: "{{ .SONARR__API_KEY }}"
-        SONARR__POSTGRES__HOST: &dbHost postgres17-rw.database.svc.cluster.local
-        SONARR__POSTGRES__PORT: "5432"
-        SONARR__POSTGRES__USER: &dbUser "{{ .SONARR__POSTGRES_USER }}"
-        SONARR__POSTGRES__PASSWORD: &dbPass "{{ .SONARR__POSTGRES_PASSWORD }}"
-        SONARR__POSTGRES__MAINDB: sonarr_main
         PUSHOVER_TOKEN: "{{ .PUSHOVER_API_TOKEN }}"
         PUSHOVER_USER_KEY: "{{ .PUSHOVER_USER_KEY }}"
-        # Postgres Init
-        INIT_POSTGRES_DBNAME: sonarr_main sonarr_log
-        INIT_POSTGRES_HOST: *dbHost
-        INIT_POSTGRES_USER: *dbUser
-        INIT_POSTGRES_PASS: *dbPass
-        INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}"
   dataFrom:
     - extract:
         key: pushover