diff --git a/badhouseplants/values/secrets.funkwhale.yaml b/badhouseplants/values/secrets.funkwhale.yaml
index 47cc127..fca2d0f 100644
--- a/badhouseplants/values/secrets.funkwhale.yaml
+++ b/badhouseplants/values/secrets.funkwhale.yaml
@@ -1,10 +1,7 @@
 djangoSecret: ENC[AES256_GCM,data:CxsJVhNxku3pohREaVs=,iv:KDupR8tZlPkPeRwGWzyz+eKtp1tfTdFWqXNuQW20oXo=,tag:lCHqv2CC8cXpnqTr8fGzPg==,type:str]
 postgresql:
     auth:
-        username: ENC[AES256_GCM,data:S09SpdX3ro0S,iv:QYQiF8Ozz9iLElqsoxyika+iVcHzRyo4hhaaIw8/vDM=,tag:KzorD+/Pysqwm5PneRRsyg==,type:str]
-        password: ENC[AES256_GCM,data:R6bqME1FH72K,iv:PuOIgStSM/NvwhQj06E/PMtB30aDbstypIBt84Fh1q0=,tag:gzv9S+hYW6qjgdoMhl1mTw==,type:str]
-        database: ENC[AES256_GCM,data:Ld33SGYZdlK+,iv:hZ/DlO3wNQ7Bm5L3RmNDzOp9U4QBr+nhJbDD1XYc56Y=,tag:NIgpN71+dL1jIgG66l+3VA==,type:str]
-        postgresPassword: ENC[AES256_GCM,data:AGtLRy+ujNAVpA==,iv:U19Pb6vXU/ceH3M6ZLOduqRBFaStX7JSyFnO6ODzbLs=,tag:kpbEkwMZl7c2wJrELjp4tw==,type:str]
+        password: ENC[AES256_GCM,data:IKPFpCY0Im2SQquNFM/3umvGfYOt1A==,iv:asWxkKTvez1FxxXto/ulh4CDBvPZ6SovqKnoFEQjG/s=,tag:iqyxZU+jERNgakMcAm+cnQ==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -20,8 +17,8 @@ sops:
             dWdMUFpOOVJYSXdBbzJiSzhQM0VmbWMKUqdIpfa8i7vASIga8HFurrPf1RgA+WVA
             GZiG+M0i4yc3SooTIwbDzH0orfaEHueKdNTGOXMgxNiRIt2q9BG76g==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-02-22T09:20:09Z"
-    mac: ENC[AES256_GCM,data:1Wt61yiS/8/D0IwiM1RQwV6fYZNq5yZFxOWE/1T4/eLhZY4jSLFMMDrZLA3joOv6ZeN1fWzbJpbGEzsBdPm0ZP7scz56+XwWJTjY9xlnlRB6ou35ViABE9mKCNP6/wUqqnw0d3EhnxhC5lOAPsl5koUHhGQw/8dZEDiA9PniQ20=,iv:dgkvOii83PR3cpFBQoSq9pi53g7DjTcrAXc5O5ge9nA=,tag:/RWIko/vBwFcHIZqmJdrZQ==,type:str]
+    lastmodified: "2023-07-29T16:49:07Z"
+    mac: ENC[AES256_GCM,data:Rnkc8vhUyrFUq8BveKpr1PWtZJOaw5862rU/TzvL+X9fkTz4kS2N9wkA1vK21EN0QG4U1kLL3XNImdqK4sw70ItZ+swCUGbqrc2KOFjH3msCIdcCj9xl87cFDMk4OPk2dpzI/ckyXhSco2I6qrW3LvUo60wNNTwEJrUjrUGIx38=,iv:QBFecsw554VtnCbirwPP+HlxPnnpOgwtMWlnmr4IVfo=,tag:ufkQ0lPTkZcTfI7Yrd5Mfw==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.7.3
diff --git a/badhouseplants/values/values.funkwhale.yaml b/badhouseplants/values/values.funkwhale.yaml
index 5cb7632..303a8ae 100644
--- a/badhouseplants/values/values.funkwhale.yaml
+++ b/badhouseplants/values/values.funkwhale.yaml
@@ -13,6 +13,11 @@ istio:
       service: funkwhale
       port: 80
 
+ext-database:
+  enabled: true
+  name: funkwhale-postgres
+  instance: postgres
+
 replicaCount: 1
 celery:
   worker:
@@ -37,7 +42,8 @@ s3:
 ingress:
   enabled: false
 postgresql:
-  primary:
-    resources:
-      requests:
-        cpu: 50m
+  enabled: false
+  host: postgres-postgresql.database-service.svc.cluster.local
+  auth:
+    username: funkwhale-application-funkwhale-postgres
+    database: funkwhale-application-funkwhale-postgres
diff --git a/badhouseplants/values/values.gitea.yaml b/badhouseplants/values/values.gitea.yaml
index 3920257..fa9b60e 100644
--- a/badhouseplants/values/values.gitea.yaml
+++ b/badhouseplants/values/values.gitea.yaml
@@ -20,7 +20,7 @@ istio:
       service: gitea-ssh
       port: 22
 
-database:
+ext-database:
   enabled: true
   name: gitea-postgres
   instance: postgres
diff --git a/common/values.database.yaml b/common/values.database.yaml
index 8a6a183..9680113 100644
--- a/common/values.database.yaml
+++ b/common/values.database.yaml
@@ -1,5 +1,5 @@
 ---
-database:
+ext-database:
   templates:
     - |
         ---
diff --git a/releases.yaml b/releases.yaml
index 20ed74b..df172e7 100644
--- a/releases.yaml
+++ b/releases.yaml
@@ -76,7 +76,7 @@ templates:
     dependencies:
     - chart: bedag/raw
       version: 2.0.0
-      alias: database
+      alias: ext-database
     values:
       - '{{ requiredEnv "PWD" }}/common/values.database.yaml'
   # ----------------------------
@@ -266,6 +266,7 @@ templates:
       - template: default-env-values
       - template: default-env-secrets
       - template: ext-istio-resource
+      - template: ext-database
 
   mailu: &mailu
     name: mailu