diff --git a/charts/stable/vaultwarden/Chart.yaml b/charts/stable/vaultwarden/Chart.yaml
index 85fd07a3a59..4830bc74e21 100644
--- a/charts/stable/vaultwarden/Chart.yaml
+++ b/charts/stable/vaultwarden/Chart.yaml
@@ -6,8 +6,8 @@ dependencies:
   version: 6.8.0
 - condition: postgresql.enabled
   name: postgresql
-  repository: https://charts.bitnami.com/bitnami
-  version: 10.8.0
+  repository: https://truecharts.org/
+  version: 1.0.0
 deprecated: false
 description: Unofficial Bitwarden compatible server written in Rust
 home: https://github.com/truecharts/apps/tree/master/charts/stable/vaultwarden
@@ -31,4 +31,4 @@ name: vaultwarden
 sources:
 - https://github.com/dani-garcia/vaultwarden
 type: application
-version: 3.11.0
+version: 4.0.0
diff --git a/charts/stable/vaultwarden/SCALE/ix_values.yaml b/charts/stable/vaultwarden/SCALE/ix_values.yaml
index 08cdbe0e4e3..5745ee95d56 100644
--- a/charts/stable/vaultwarden/SCALE/ix_values.yaml
+++ b/charts/stable/vaultwarden/SCALE/ix_values.yaml
@@ -38,17 +38,12 @@ database:
   retries: 30
 
 # Enabled postgres
-# ... for more options see https://github.com/bitnami/charts/tree/master/bitnami/postgresql
 postgresql:
-  volumePermissions:
-    enabled: true
+
   enabled: true
   postgresqlUsername: vaultwarden
   postgresqlDatabase: vaultwarden
   existingSecret: dbcreds
-  persistence:
-    enabled: true
-    existingClaim: db
 
 ##
 # Most other defaults are set in questions.yaml
diff --git a/charts/stable/vaultwarden/SCALE/questions.yaml b/charts/stable/vaultwarden/SCALE/questions.yaml
index 5c3fe9d1ef8..ee5cf2c341e 100644
--- a/charts/stable/vaultwarden/SCALE/questions.yaml
+++ b/charts/stable/vaultwarden/SCALE/questions.yaml
@@ -746,145 +746,7 @@ questions:
                   show_if: [["type", "=", "pvc"]]
                   type: string
                   default: "100Gi"
-        - variable: db
-          label: "Database Storage"
-          description: "Stores the Application database."
-          schema:
-            type: dict
-            attrs:
-              - variable: enabled
-                label: "Enable the storage"
-                schema:
-                  type: boolean
-                  default: true
-                  hidden: true
-              - variable: forceName
-                label: "Override PVC Name (advanced)"
-                description: "Forces a certain name for the PVC"
-                schema:
-                  type: string
-                  default: "db"
-                  hidden: true
-              - variable: noMount
-                label: "Do not mount this storage inside the main pod"
-                schema:
-                  type: boolean
-                  default: true
-                  hidden: true
-              - variable: type
-                label: "(Advanced) Type of Storage"
-                description: "Sets the persistence type"
-                schema:
-                  type: string
-                  default: "pvc"
-                  hidden: true
-                  enum:
-                    - value: "pvc"
-                      description: "pvc"
-                    - value: "emptyDir"
-                      description: "emptyDir"
-                    - value: "hostPath"
-                      description: "hostPath"
-              - variable: storageClass
-                label: "(Advanced) storageClass"
-                description: " Warning: Anything other than SCALE-ZFS will break rollback!"
-                schema:
-                  show_if: [["type", "=", "pvc"]]
-                  type: string
-                  default: "SCALE-ZFS"
-              - variable: mountPath
-                label: "mountPath"
-                description: "Path inside the container the storage is mounted"
-                schema:
-                  type: string
-                  default: ""
-                  hidden: true
-              - variable: medium
-                label: "EmptyDir Medium"
-                schema:
-                  show_if: [["type", "=", "emptyDir"]]
-                  type: string
-                  default: ""
-                  enum:
-                    - value: ""
-                      description: "Default"
-                    - value: "Memory"
-                      description: "Memory"
-              - variable: accessMode
-                label: "Access Mode (Advanced)"
-                description: "Allow or disallow multiple PVC's writhing to the same PV"
-                schema:
-                  show_if: [["type", "=", "pvc"]]
-                  type: string
-                  default: "ReadWriteOnce"
-                  enum:
-                    - value: "ReadWriteOnce"
-                      description: "ReadWriteOnce"
-                    - value: "ReadOnlyMany"
-                      description: "ReadOnlyMany"
-                    - value: "ReadWriteMany"
-                      description: "ReadWriteMany"
-              - variable: size
-                label: "Size quotum of storage"
-                schema:
-                  show_if: [["type", "=", "pvc"]]
-                  type: string
-                  default: "100Gi"
-        - variable: dbbackup
-          label: "Database Backup Storage"
-          description: "Stores the Application database backups."
-          schema:
-            type: dict
-            attrs:
-              - variable: enabled
-                label: "Enable the storage"
-                schema:
-                  type: boolean
-                  default: true
-              - variable: storageClass
-                label: "Type of Storage"
-                description: " Warning: Anything other than Internal will break rollback!"
-                schema:
-                  type: string
-                  default: "SCALE-ZFS"
-              - variable: mountPath
-                label: "mountPath"
-                description: "Path inside the container the storage is mounted"
-                schema:
-                  type: string
-                  default: ""
-                  hidden: true
-              - variable: medium
-                label: "EmptyDir Medium"
-                schema:
-                  show_if: [["type", "=", "emptyDir"]]
-                  type: string
-                  default: ""
-                  enum:
-                    - value: ""
-                      description: "Default"
-                    - value: "Memory"
-                      description: "Memory"
-              - variable: accessMode
-                label: "Access Mode (Advanced)"
-                description: "Allow or disallow multiple PVC's writhing to the same PV"
-                schema:
-                  show_if: [["type", "=", "pvc"]]
-                  type: string
-                  default: "ReadWriteOnce"
-                  enum:
-                    - value: "ReadWriteOnce"
-                      description: "ReadWriteOnce"
-                    - value: "ReadOnlyMany"
-                      description: "ReadOnlyMany"
-                    - value: "ReadWriteMany"
-                      description: "ReadWriteMany"
-              - variable: size
-                label: "Size quotum of storage"
-                schema:
-                  show_if: [["type", "=", "pvc"]]
-                  type: string
-                  default: "100Gi"
+
   - variable: persistenceList
     label: "Additional app storage"
     group: "Storage and Persistence"
diff --git a/charts/stable/vaultwarden/values.yaml b/charts/stable/vaultwarden/values.yaml
index 1fd6e3bb7dc..1dd27e5a264 100644
--- a/charts/stable/vaultwarden/values.yaml
+++ b/charts/stable/vaultwarden/values.yaml
@@ -151,26 +151,9 @@ persistence:
     mountPath: "/data"
     type: emptyDir
 
-  db:
-    noMount: true
-    forceName: "db"
-    enabled: true
-    type: emptyDir
-
-  dbbackup:
-    noMount: true
-    enabled: true
-    type: emptyDir
-
 # Enabled postgres
-# ... for more options see https://github.com/bitnami/charts/tree/master/bitnami/postgresql
 postgresql:
-  volumePermissions:
-    enabled: true
   enabled: true
   postgresqlUsername: vaultwarden
   postgresqlDatabase: vaultwarden
   existingSecret: dbcreds
-  persistence:
-    enabled: false
-    existingClaim: db