diff --git a/charts/stable/fireflyiii/Chart.yaml b/charts/stable/fireflyiii/Chart.yaml
index 2f42f023b8d..cd4e0b2bf04 100644
--- a/charts/stable/fireflyiii/Chart.yaml
+++ b/charts/stable/fireflyiii/Chart.yaml
@@ -3,11 +3,11 @@ appVersion: auto
 dependencies:
 - name: common
   repository: https://truecharts.org/
-  version: 6.12.2
+  version: 6.12.1
 - condition: postgresql.enabled
   name: postgresql
   repository: https://truecharts.org/
-  version: 1.5.7
+  version: 1.5.1
 deprecated: false
 description: A free and open source personal finance manager
 home: https://github.com/firefly-iii/firefly-iii/
@@ -27,4 +27,4 @@ name: fireflyiii
 sources:
 - https://github.com/firefly-iii/firefly-iii/
 type: application
-version: 6.0.12
+version: 6.0.0
diff --git a/charts/stable/fireflyiii/README.md b/charts/stable/fireflyiii/README.md
index 39e91b1d7b1..b701eb77722 100644
--- a/charts/stable/fireflyiii/README.md
+++ b/charts/stable/fireflyiii/README.md
@@ -1,5 +1,7 @@
 # Introduction
 
+![Version: 5.4.4](https://img.shields.io/badge/Version-5.4.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: auto](https://img.shields.io/badge/AppVersion-auto-informational?style=flat-square)
+
 A free and open source personal finance manager
 
 TrueCharts are designed to be installed as TrueNAS SCALE app only. We can not guarantee this charts works as a stand-alone helm installation.
@@ -17,8 +19,8 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://truecharts.org/ | common | 6.12.1 |
-| https://truecharts.org/ | postgresql | 1.5.2 |
+| https://truecharts.org/ | common | 6.10.7 |
+| https://truecharts.org/ | postgresql | 1.2.4 |
 
 ## Installing the Chart
 
@@ -34,5 +36,8 @@ To remove this App from TrueNAS SCALE check our [Quick-Start Guide](https://true
 - See the [Wiki](https://truecharts.org)
 - Check our [Discord](https://discord.gg/tVsPTHWTtr)
 - Open a [issue](https://github.com/truecharts/apps/issues/new/choose)
----
+- Ask a [question](https://github.com/truecharts/apps/discussions)
+
+----------------------------------------------
+Autogenerated from chart metadata using [helm-docs v1.5.0](https://github.com/norwoodj/helm-docs/releases/v1.5.0)
 All Rights Reserved - The TrueCharts Project
diff --git a/charts/stable/fireflyiii/SCALE/ix_values.yaml b/charts/stable/fireflyiii/SCALE/ix_values.yaml
index e6c0856ca89..a94de5b58ef 100644
--- a/charts/stable/fireflyiii/SCALE/ix_values.yaml
+++ b/charts/stable/fireflyiii/SCALE/ix_values.yaml
@@ -28,11 +28,11 @@ env:
 envValueFrom:
   DB_HOST:
     secretKeyRef:
-      name: "{{ .Release.Name }}-dbcreds"
+      name: dbcreds
       key: postgresql_host
   DB_PASSWORD:
     secretKeyRef:
-      name: "{{ .Release.Name }}-dbcreds"
+      name: dbcreds
       key: postgresql-password
 
 # Enabled postgres
@@ -40,7 +40,7 @@ postgresql:
   enabled: true
   postgresqlUsername: fireflyiii
   postgresqlDatabase: fireflyiii
-  existingSecret: "{{ .Release.Name }}-dbcreds"
+  existingSecret: dbcreds
   persistence:
     db:
       storageClass: "SCALE-ZFS"
diff --git a/charts/stable/fireflyiii/helm-values.md b/charts/stable/fireflyiii/helm-values.md
deleted file mode 100644
index 75f5f5915ae..00000000000
--- a/charts/stable/fireflyiii/helm-values.md
+++ /dev/null
@@ -1,50 +0,0 @@
-# Default Helm-Values
-
-TrueCharts is primarily build to supply TrueNAS SCALE Apps.
-However, we also supply all Apps as standard Helm-Charts. In this document we aim to document the default values in our values.yaml file.
-
-Most of our Apps also consume our "common" Helm Chart.
-If this is the case, this means that all values.yaml values are set to the common chart values.yaml by default. This values.yaml file will only contain values that deviate from the common chart.
-You will, however, be able to use all values referenced in the common chart here, besides the values listed in this document.
-
-## Values
-
-| Key | Type | Default | Description |
-|-----|------|---------|-------------|
-| env.APP_KEY | string | `"AGcfkCUS233ZWmBXztYbdyCs2u7kkz55"` |  |
-| env.DB_CONNECTION | string | `"pgsql"` |  |
-| env.DB_DATABASE | string | `"firefly"` |  |
-| env.DB_PORT | int | `5432` |  |
-| env.DB_USERNAME | string | `"firefly"` |  |
-| envValueFrom.DB_HOST.secretKeyRef.key | string | `"postgresql_host"` |  |
-| envValueFrom.DB_HOST.secretKeyRef.name | string | `"{{ .Release.Name }}-dbcreds"` |  |
-| envValueFrom.DB_PASSWORD.secretKeyRef.key | string | `"postgresql-password"` |  |
-| envValueFrom.DB_PASSWORD.secretKeyRef.name | string | `"{{ .Release.Name }}-dbcreds"` |  |
-| image.pullPolicy | string | `"IfNotPresent"` |  |
-| image.repository | string | `"fireflyiii/core"` |  |
-| image.tag | string | `"version-5.5.12"` |  |
-| persistence.data.accessMode | string | `"ReadWriteOnce"` |  |
-| persistence.data.enabled | bool | `true` |  |
-| persistence.data.mountPath | string | `"/var/www/html/storage/upload"` |  |
-| persistence.data.size | string | `"100Gi"` |  |
-| persistence.data.type | string | `"pvc"` |  |
-| podSecurityContext.fsGroup | int | `0` |  |
-| podSecurityContext.runAsGroup | int | `0` |  |
-| podSecurityContext.runAsNonRoot | bool | `false` |  |
-| podSecurityContext.runAsUser | int | `0` |  |
-| postgresql.enabled | bool | `true` |  |
-| postgresql.existingSecret | string | `"{{ .Release.Name }}-dbcreds"` |  |
-| postgresql.postgresqlDatabase | string | `"firefly"` |  |
-| postgresql.postgresqlUsername | string | `"firefly"` |  |
-| probes.liveness.path | string | `"/login"` |  |
-| probes.readiness.path | string | `"/login"` |  |
-| probes.startup.path | string | `"/login"` |  |
-| service.main.ports.main.port | int | `8080` |  |
-| service.tcp.enabled | bool | `true` |  |
-| service.tcp.ports.tcp.enabled | bool | `true` |  |
-| service.tcp.ports.tcp.port | int | `51080` |  |
-| service.tcp.ports.tcp.protocol | string | `"TCP"` |  |
-| service.tcp.type | string | `"ClusterIP"` |  |
-| strategy.type | string | `"Recreate"` |  |
-
-All Rights Reserved - The TrueCharts Project
diff --git a/charts/stable/fireflyiii/templates/_secrets.tpl b/charts/stable/fireflyiii/templates/_secrets.tpl
deleted file mode 100644
index 3ca64a6b313..00000000000
--- a/charts/stable/fireflyiii/templates/_secrets.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-{{/* Define the secrets */}}
-{{- define "fireflyiii.secrets" -}}
-
----
-apiVersion: v1
-kind: Secret
-metadata:
-  {{- $dbcredsname := ( printf "%v-%v"  .Release.Name "dbcreds" ) }}
-  name: {{ $dbcredsname }}
-data:
-  {{- $dbPass := "" }}
-  {{ $rootPass := "" }}
-  {{ $urlPass := "" }}
-
-  {{- if .Release.IsInstall }}
-  {{ $dbPass = ( randAlphaNum 50 | b64enc | quote )  }}
-  {{ $rootPass = ( randAlphaNum 50 | b64enc | quote )  }}
-  {{ $urlPass = $dbPass }}
-  {{ else }}
-  # `index` function is necessary because the property name contains a dash.
-  # Otherwise (...).data.db_password would have worked too.
-  {{ $dbPass = ( index (lookup "v1" "Secret" .Release.Namespace ( $dbcredsname | quote ) ).data "postgresql-postgres-password" ) }}
-  {{ $rootPass = ( index (lookup "v1" "Secret" .Release.Namespace ( $dbcredsname | quote ) ).data "postgresql-postgres-password" ) }}
-  {{ $urlPass = ( ( index (lookup "v1" "Secret" .Release.Namespace ( $dbcredsname | quote ) ).data "postgresql-postgres-password" ) | b64dec | quote ) }}
-  {{ end }}
-
-  postgresql-password: {{ $dbPass }}
-  postgresql-postgres-password: {{ $rootPass }}
-  url: {{ ( printf "%v%v:%v@%v-%v:%v/%v" "postgresql://" .Values.postgresql.postgresqlUsername $urlPass .Release.Name "postgresql" "5432" .Values.postgresql.postgresqlDatabase  ) | b64enc | quote }}
-  postgresql_host: {{ ( printf "%v-%v" .Release.Name "postgresql" ) | b64enc | quote }}
-type: Opaque
-
-{{- end -}}
diff --git a/charts/stable/fireflyiii/templates/common.yaml b/charts/stable/fireflyiii/templates/common.yaml
index 096dd2fef91..64e027ac0fa 100644
--- a/charts/stable/fireflyiii/templates/common.yaml
+++ b/charts/stable/fireflyiii/templates/common.yaml
@@ -3,6 +3,3 @@
 
 {{/* Render the templates */}}
 {{ include "common.all" . }}
-
-{{/* Render secrets for fireflyiii */}}
-{{- include "fireflyiii.secrets" . }}
diff --git a/charts/stable/fireflyiii/templates/secrets.yaml b/charts/stable/fireflyiii/templates/secrets.yaml
new file mode 100644
index 00000000000..5d262741617
--- /dev/null
+++ b/charts/stable/fireflyiii/templates/secrets.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: dbcreds
+{{- $previous := lookup "v1" "Secret" .Release.Namespace "dbcreds" }}
+{{- $dbPass := "" }}
+data:
+{{- if $previous }}
+  {{- $dbPass = ( index $previous.data "postgresql-password" ) | b64dec  }}
+  postgresql-password: {{ ( index $previous.data "postgresql-password" ) }}
+  postgresql-postgres-password: {{ ( index $previous.data "postgresql-postgres-password" ) }}
+{{- else }}
+  {{- $dbPass = randAlphaNum 50 }}
+  postgresql-password: {{ $dbPass | b64enc | quote }}
+  postgresql-postgres-password: {{ randAlphaNum 50 | b64enc | quote }}
+{{- end }}
+  url: {{ ( printf "%v%v:%v@%v-%v:%v/%v" "postgresql://" .Values.postgresql.postgresqlUsername $dbPass .Release.Name "postgresql" "5432" .Values.postgresql.postgresqlDatabase  ) | b64enc | quote }}
+  postgresql_host: {{ ( printf "%v-%v" .Release.Name "postgresql" ) | b64enc | quote }}
+type: Opaque
diff --git a/charts/stable/fireflyiii/values.yaml b/charts/stable/fireflyiii/values.yaml
index 633c96e681d..21b500850d3 100644
--- a/charts/stable/fireflyiii/values.yaml
+++ b/charts/stable/fireflyiii/values.yaml
@@ -48,11 +48,11 @@ env:
 envValueFrom:
   DB_HOST:
     secretKeyRef:
-      name: "{{ .Release.Name }}-dbcreds"
+      name: dbcreds
       key: postgresql_host
   DB_PASSWORD:
     secretKeyRef:
-      name: "{{ .Release.Name }}-dbcreds"
+      name: dbcreds
       key: postgresql-password
 
 persistence:
@@ -69,4 +69,4 @@ postgresql:
   enabled: true
   postgresqlUsername: firefly
   postgresqlDatabase: firefly
-  existingSecret: "{{ .Release.Name }}-dbcreds"
+  existingSecret: dbcreds
diff --git a/charts/stable/vaultwarden/Chart.yaml b/charts/stable/vaultwarden/Chart.yaml
index 3d6cb8b902a..cd928e336fa 100644
--- a/charts/stable/vaultwarden/Chart.yaml
+++ b/charts/stable/vaultwarden/Chart.yaml
@@ -3,11 +3,11 @@ appVersion: auto
 dependencies:
 - name: common
   repository: https://truecharts.org/
-  version: 6.12.2
+  version: 6.12.1
 - condition: postgresql.enabled
   name: postgresql
   repository: https://truecharts.org/
-  version: 1.5.7
+  version: 1.5.1
 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: 5.0.12
+version: 6.0.0
diff --git a/charts/stable/vaultwarden/README.md b/charts/stable/vaultwarden/README.md
index 48d653c27db..7e4c76a1226 100644
--- a/charts/stable/vaultwarden/README.md
+++ b/charts/stable/vaultwarden/README.md
@@ -1,5 +1,7 @@
 # Introduction
 
+![Version: 4.4.4](https://img.shields.io/badge/Version-4.4.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: auto](https://img.shields.io/badge/AppVersion-auto-informational?style=flat-square)
+
 Unofficial Bitwarden compatible server written in Rust
 
 TrueCharts are designed to be installed as TrueNAS SCALE app only. We can not guarantee this charts works as a stand-alone helm installation.
@@ -17,8 +19,8 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://truecharts.org/ | common | 6.12.1 |
-| https://truecharts.org/ | postgresql | 1.5.2 |
+| https://truecharts.org/ | common | 6.10.7 |
+| https://truecharts.org/ | postgresql | 1.2.4 |
 
 ## Installing the Chart
 
@@ -34,5 +36,8 @@ To remove this App from TrueNAS SCALE check our [Quick-Start Guide](https://true
 - See the [Wiki](https://truecharts.org)
 - Check our [Discord](https://discord.gg/tVsPTHWTtr)
 - Open a [issue](https://github.com/truecharts/apps/issues/new/choose)
----
+- Ask a [question](https://github.com/truecharts/apps/discussions)
+
+----------------------------------------------
+Autogenerated from chart metadata using [helm-docs v1.5.0](https://github.com/norwoodj/helm-docs/releases/v1.5.0)
 All Rights Reserved - The TrueCharts Project
diff --git a/charts/stable/vaultwarden/SCALE/ix_values.yaml b/charts/stable/vaultwarden/SCALE/ix_values.yaml
index d6af750a431..8a4b54a0a32 100644
--- a/charts/stable/vaultwarden/SCALE/ix_values.yaml
+++ b/charts/stable/vaultwarden/SCALE/ix_values.yaml
@@ -14,15 +14,15 @@ envTpl:
 
 envFrom:
   - configMapRef:
-      name: "{{ .Release.Name }}-vaultwardenconfig"
+      name: vaultwardenconfig
   - secretRef:
-      name: "{{ .Release.Name }}-vaultwardensecret"
+      name: vaultwardensecret
 
 
 envValueFrom:
   DATABASE_URL:
     secretKeyRef:
-      name: "{{ .Release.Name }}-dbcreds"
+      name: dbcreds
       key: url
 
 database:
@@ -42,7 +42,7 @@ postgresql:
   enabled: true
   postgresqlUsername: vaultwarden
   postgresqlDatabase: vaultwarden
-  existingSecret: "{{ .Release.Name }}-dbcreds"
+  existingSecret: dbcreds
   persistence:
     db:
       storageClass: "SCALE-ZFS"
diff --git a/charts/stable/vaultwarden/helm-values.md b/charts/stable/vaultwarden/helm-values.md
deleted file mode 100644
index 6dc45bb049c..00000000000
--- a/charts/stable/vaultwarden/helm-values.md
+++ /dev/null
@@ -1,56 +0,0 @@
-# Default Helm-Values
-
-TrueCharts is primarily build to supply TrueNAS SCALE Apps.
-However, we also supply all Apps as standard Helm-Charts. In this document we aim to document the default values in our values.yaml file.
-
-Most of our Apps also consume our "common" Helm Chart.
-If this is the case, this means that all values.yaml values are set to the common chart values.yaml by default. This values.yaml file will only contain values that deviate from the common chart.
-You will, however, be able to use all values referenced in the common chart here, besides the values listed in this document.
-
-## Values
-
-| Key | Type | Default | Description |
-|-----|------|---------|-------------|
-| database.type | string | `"postgresql"` |  |
-| database.wal | bool | `true` |  |
-| env | object | `{}` |  |
-| envFrom[0].configMapRef.name | string | `"{{ .Release.Name }}-vaultwardenconfig"` |  |
-| envFrom[1].secretRef.name | string | `"{{ .Release.Name }}-vaultwardensecret"` |  |
-| envTpl.DOMAIN | string | `"https://{{ if .Values.ingress }}{{ if .Values.ingress.main.enabled }}{{ ( index .Values.ingress.main.hosts 0 ).host }}{{ else }}placeholder.com{{ end }}{{ else }}placeholder.com{{ end }}"` |  |
-| envValueFrom.DATABASE_URL.secretKeyRef.key | string | `"url"` |  |
-| envValueFrom.DATABASE_URL.secretKeyRef.name | string | `"{{ .Release.Name }}-dbcreds"` |  |
-| image.pullPolicy | string | `"IfNotPresent"` |  |
-| image.repository | string | `"vaultwarden/server"` |  |
-| image.tag | string | `"1.22.2"` |  |
-| persistence.data.accessMode | string | `"ReadWriteOnce"` |  |
-| persistence.data.enabled | bool | `true` |  |
-| persistence.data.mountPath | string | `"/data"` |  |
-| persistence.data.size | string | `"100Gi"` |  |
-| persistence.data.type | string | `"pvc"` |  |
-| postgresql.enabled | bool | `true` |  |
-| postgresql.existingSecret | string | `"{{ .Release.Name }}-dbcreds"` |  |
-| postgresql.postgresqlDatabase | string | `"vaultwarden"` |  |
-| postgresql.postgresqlUsername | string | `"vaultwarden"` |  |
-| service.main.ports.main.port | int | `8080` |  |
-| service.ws.ports.ws.enabled | bool | `true` |  |
-| service.ws.ports.ws.port | int | `3012` |  |
-| strategy.type | string | `"Recreate"` |  |
-| vaultwarden.admin.disableAdminToken | bool | `false` |  |
-| vaultwarden.admin.enabled | bool | `false` |  |
-| vaultwarden.allowInvitation | bool | `true` |  |
-| vaultwarden.allowSignups | bool | `true` |  |
-| vaultwarden.enableWebVault | bool | `true` |  |
-| vaultwarden.enableWebsockets | bool | `true` |  |
-| vaultwarden.icons.disableDownload | bool | `false` |  |
-| vaultwarden.log.file | string | `""` |  |
-| vaultwarden.log.level | string | `"trace"` |  |
-| vaultwarden.orgCreationUsers | string | `"all"` |  |
-| vaultwarden.requireEmail | bool | `false` |  |
-| vaultwarden.showPasswordHint | bool | `true` |  |
-| vaultwarden.smtp.enabled | bool | `false` |  |
-| vaultwarden.smtp.from | string | `""` |  |
-| vaultwarden.smtp.host | string | `""` |  |
-| vaultwarden.verifySignup | bool | `false` |  |
-| vaultwarden.yubico.enabled | bool | `false` |  |
-
-All Rights Reserved - The TrueCharts Project
diff --git a/charts/stable/vaultwarden/templates/_configmap.tpl b/charts/stable/vaultwarden/templates/_configmap.tpl
index aa7ddb01bf5..8809925abdf 100644
--- a/charts/stable/vaultwarden/templates/_configmap.tpl
+++ b/charts/stable/vaultwarden/templates/_configmap.tpl
@@ -4,7 +4,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ .Release.Name }}-vaultwardenconfig
+  name: vaultwardenconfig
 data:
   ROCKET_PORT: "8080"
   SIGNUPS_ALLOWED: {{ .Values.vaultwarden.allowSignups | quote }}
diff --git a/charts/stable/vaultwarden/templates/_secrets.tpl b/charts/stable/vaultwarden/templates/_secrets.tpl
index ac78c473f4e..6a7bf408bb8 100644
--- a/charts/stable/vaultwarden/templates/_secrets.tpl
+++ b/charts/stable/vaultwarden/templates/_secrets.tpl
@@ -20,7 +20,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ .Release.Name }}-vaultwardensecret
+  name: vaultwardensecret
 data:
   {{- if ne $adminToken "" }}
   ADMIN_TOKEN: {{ $adminToken }}
@@ -41,28 +41,19 @@ kind: Secret
 metadata:
   labels:
     {{- include "common.labels" . | nindent 4 }}
-  {{- $dbcredsname := ( printf "%v-%v"  .Release.Name "dbcreds" ) }}
-  name: {{ $dbcredsname }}
+  name: dbcreds
+{{- $previous := lookup "v1" "Secret" .Release.Namespace "dbcreds" }}
+{{- $dbPass := "" }}
 data:
-  {{- $dbPass := "" }}
-  {{ $rootPass := "" }}
-  {{ $urlPass := "" }}
-
-  {{- if .Release.IsInstall }}
-  {{ $dbPass = ( randAlphaNum 50 | b64enc | quote )  }}
-  {{ $rootPass = ( randAlphaNum 50 | b64enc | quote )  }}
-  {{ $urlPass = $dbPass }}
-  {{ else }}
-  # `index` function is necessary because the property name contains a dash.
-  # Otherwise (...).data.db_password would have worked too.
-  {{ $dbPass = ( index (lookup "v1" "Secret" .Release.Namespace ( $dbcredsname | quote ) ).data "postgresql-postgres-password" ) }}
-  {{ $rootPass = ( index (lookup "v1" "Secret" .Release.Namespace ( $dbcredsname | quote ) ).data "postgresql-postgres-password" ) }}
-  {{ $urlPass = ( ( index (lookup "v1" "Secret" .Release.Namespace ( $dbcredsname | quote ) ).data "postgresql-postgres-password" ) | b64dec | quote ) }}
-  {{ end }}
-
-  postgresql-password: {{ $dbPass }}
-  postgresql-postgres-password: {{ $rootPass }}
-  url: {{ ( printf "%v%v:%v@%v-%v:%v/%v" "postgresql://" .Values.postgresql.postgresqlUsername $urlPass .Release.Name "postgresql" "5432" .Values.postgresql.postgresqlDatabase  ) | b64enc | quote }}
-  postgresql_host: {{ ( printf "%v-%v" .Release.Name "postgresql" ) | b64enc | quote }}
+{{- if $previous }}
+  {{- $dbPass = ( index $previous.data "postgresql-password" ) | b64dec  }}
+  postgresql-password: {{ ( index $previous.data "postgresql-password" ) }}
+  postgresql-postgres-password: {{ ( index $previous.data "postgresql-postgres-password" ) }}
+{{- else }}
+  {{- $dbPass = randAlphaNum 50 }}
+  postgresql-password: {{ $dbPass | b64enc | quote }}
+  postgresql-postgres-password: {{ randAlphaNum 50 | b64enc | quote }}
+{{- end }}
+  url: {{ ( printf "%v%v:%v@%v-%v:%v/%v" "postgresql://" .Values.postgresql.postgresqlUsername $dbPass .Release.Name "postgresql" "5432" .Values.postgresql.postgresqlDatabase  ) | b64enc | quote }}
 type: Opaque
 {{- end -}}
diff --git a/charts/stable/vaultwarden/values.yaml b/charts/stable/vaultwarden/values.yaml
index 28348b1942e..9cfc0aa76a6 100644
--- a/charts/stable/vaultwarden/values.yaml
+++ b/charts/stable/vaultwarden/values.yaml
@@ -26,14 +26,14 @@ envTpl:
 
 envFrom:
   - configMapRef:
-      name: "{{ .Release.Name }}-vaultwardenconfig"
+      name: vaultwardenconfig
   - secretRef:
-      name: "{{ .Release.Name }}-vaultwardensecret"
+      name: vaultwardensecret
 
 envValueFrom:
   DATABASE_URL:
     secretKeyRef:
-      name: "{{ .Release.Name }}-dbcreds"
+      name: dbcreds
       key: url
 
 database:
@@ -158,4 +158,4 @@ postgresql:
   enabled: true
   postgresqlUsername: vaultwarden
   postgresqlDatabase: vaultwarden
-  existingSecret: "{{ .Release.Name }}-dbcreds"
+  existingSecret: dbcreds