diff --git a/charts/stable/fireflyiii/Chart.yaml b/charts/stable/fireflyiii/Chart.yaml
index b4b10ffe7e6..2f42f023b8d 100644
--- a/charts/stable/fireflyiii/Chart.yaml
+++ b/charts/stable/fireflyiii/Chart.yaml
@@ -27,4 +27,4 @@ name: fireflyiii
 sources:
 - https://github.com/firefly-iii/firefly-iii/
 type: application
-version: 6.0.11
+version: 6.0.12
diff --git a/charts/stable/fireflyiii/templates/_secrets.tpl b/charts/stable/fireflyiii/templates/_secrets.tpl
index 092b9c75ee0..3ca64a6b313 100644
--- a/charts/stable/fireflyiii/templates/_secrets.tpl
+++ b/charts/stable/fireflyiii/templates/_secrets.tpl
@@ -8,16 +8,25 @@ metadata:
   {{- $dbcredsname := ( printf "%v-%v"  .Release.Name "dbcreds" ) }}
   name: {{ $dbcredsname }}
 data:
+  {{- $dbPass := "" }}
+  {{ $rootPass := "" }}
+  {{ $urlPass := "" }}
+
   {{- if .Release.IsInstall }}
-  postgresql-password: {{ randAlphaNum 50 | b64enc | quote }}
-  postgresql-postgres-password: {{ randAlphaNum 50 | b64enc | quote }}
+  {{ $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.
-  postgresql-password: {{ index (lookup "v1" "Secret" .Release.Namespace ( $dbcredsname | quote ) ).data "postgresql-password" }}
-  postgresql-postgres-password: {{ index (lookup "v1" "Secret" .Release.Namespace ( $dbcredsname | quote ) ).data "postgresql-postgres-password" }}
+  {{ $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 }}
-  url: {{ ( printf "%v%v:%v@%v-%v:%v/%v" "postgresql://" .Values.postgresql.postgresqlUsername $dbPass .Release.Name "postgresql" "5432" .Values.postgresql.postgresqlDatabase  ) | b64enc | quote }}
+
+  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
 
diff --git a/charts/stable/vaultwarden/Chart.yaml b/charts/stable/vaultwarden/Chart.yaml
index 6148781086b..3d6cb8b902a 100644
--- a/charts/stable/vaultwarden/Chart.yaml
+++ b/charts/stable/vaultwarden/Chart.yaml
@@ -31,4 +31,4 @@ name: vaultwarden
 sources:
 - https://github.com/dani-garcia/vaultwarden
 type: application
-version: 5.0.11
+version: 5.0.12
diff --git a/charts/stable/vaultwarden/templates/_secrets.tpl b/charts/stable/vaultwarden/templates/_secrets.tpl
index 4c9967f09cc..ac78c473f4e 100644
--- a/charts/stable/vaultwarden/templates/_secrets.tpl
+++ b/charts/stable/vaultwarden/templates/_secrets.tpl
@@ -44,15 +44,25 @@ metadata:
   {{- $dbcredsname := ( printf "%v-%v"  .Release.Name "dbcreds" ) }}
   name: {{ $dbcredsname }}
 data:
+  {{- $dbPass := "" }}
+  {{ $rootPass := "" }}
+  {{ $urlPass := "" }}
+
   {{- if .Release.IsInstall }}
-  postgresql-password: {{ randAlphaNum 50 | b64enc | quote }}
-  postgresql-postgres-password: {{ randAlphaNum 50 | b64enc | quote }}
+  {{ $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.
-  postgresql-password: {{ index (lookup "v1" "Secret" .Release.Namespace ( $dbcredsname | quote ) ).data "postgresql-password" }}
-  postgresql-postgres-password: {{ index (lookup "v1" "Secret" .Release.Namespace ( $dbcredsname | quote ) ).data "postgresql-postgres-password" }}
+  {{ $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 }}
-  url: {{ ( printf "%v%v:%v@%v-%v:%v/%v" "postgresql://" .Values.postgresql.postgresqlUsername $dbPass .Release.Name "postgresql" "5432" .Values.postgresql.postgresqlDatabase  ) | b64enc | quote }}
+
+  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 -}}