diff --git a/charts/stable/authelia/Chart.yaml b/charts/stable/authelia/Chart.yaml
index 5f9d1ffc340..63f7c54f40a 100644
--- a/charts/stable/authelia/Chart.yaml
+++ b/charts/stable/authelia/Chart.yaml
@@ -38,4 +38,4 @@ sources:
 - https://github.com/authelia/chartrepo
 - https://github.com/authelia/authelia
 type: application
-version: 1.6.15
+version: 1.6.16
diff --git a/charts/stable/authelia/SCALE/questions.yaml b/charts/stable/authelia/SCALE/questions.yaml
index 8898a40aa10..6aa26166286 100644
--- a/charts/stable/authelia/SCALE/questions.yaml
+++ b/charts/stable/authelia/SCALE/questions.yaml
@@ -15,7 +15,7 @@ groups:
     description: "Ingress Configuration"
   - name: "Security and Permissions"
     description: "Configure security context and permissions"
-  - name: "Resources and Devices"
+    - name: "Resources and Devices"
     description: "Specify resources/devices to be allocated to workload"
   - name: "Advanced"
     description: "Advanced Configuration"
@@ -859,12 +859,18 @@ questions:
                   type: dict
                   attrs:
                     - variable: domain
-                      label: "Domain"
+                      label: "Domains"
                       description: "defines which domain or set of domains the rule applies to."
                       schema:
-                        type: string
-                        default: ""
-                        required: true
+                        type: list
+                        default: []
+                        items:
+                          - variable: domainEntry
+                            label: "Domain"
+                            schema:
+                              type: string
+                              default: ""
+                              required: true
                     - variable: policy
                       label: "Policy"
                       description: "The policy to apply to resources. It must be either 'bypass', 'one_factor', 'two_factor' or 'deny'."
diff --git a/charts/stable/fireflyiii/Chart.yaml b/charts/stable/fireflyiii/Chart.yaml
index 14514a65699..cdf0d67be11 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.1.4
+version: 6.1.5
diff --git a/charts/stable/fireflyiii/SCALE/ix_values.yaml b/charts/stable/fireflyiii/SCALE/ix_values.yaml
index a94de5b58ef..f0a4a296214 100644
--- a/charts/stable/fireflyiii/SCALE/ix_values.yaml
+++ b/charts/stable/fireflyiii/SCALE/ix_values.yaml
@@ -9,6 +9,21 @@ image:
   pullPolicy: IfNotPresent
   tag: version-5.5.12
 
+initContainers:
+  - name: init-postgresdb
+    image: postgres:13.1
+    command:
+      - "sh"
+      - "-c"
+      - "until pg_isready -U authelia -h ${pghost} ; do sleep 2 ; done"
+    imagePullPolicy: IfNotPresent
+    env:
+      - name: pghost
+        valueFrom:
+          secretKeyRef:
+            name: dbcreds
+            key: plainhost
+
 probes:
   liveness:
     path: "/login"
diff --git a/charts/stable/fireflyiii/templates/secrets.yaml b/charts/stable/fireflyiii/templates/secrets.yaml
index 5d262741617..711b9e06d8e 100644
--- a/charts/stable/fireflyiii/templates/secrets.yaml
+++ b/charts/stable/fireflyiii/templates/secrets.yaml
@@ -16,4 +16,5 @@ data:
 {{- 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 }}
+  plainhost: {{ ( 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 21b500850d3..59a3efa08f3 100644
--- a/charts/stable/fireflyiii/values.yaml
+++ b/charts/stable/fireflyiii/values.yaml
@@ -28,6 +28,21 @@ service:
         port: 51080
         protocol: TCP
 
+initContainers:
+  - name: init-postgresdb
+    image: postgres:13.1
+    command:
+      - "sh"
+      - "-c"
+      - "until pg_isready -U authelia -h ${pghost} ; do sleep 2 ; done"
+    imagePullPolicy: IfNotPresent
+    env:
+      - name: pghost
+        valueFrom:
+          secretKeyRef:
+            name: dbcreds
+            key: plainhost
+
 probes:
   liveness:
     path: "/login"
diff --git a/charts/stable/vaultwarden/Chart.yaml b/charts/stable/vaultwarden/Chart.yaml
index 99831c6805b..36fb97e27c2 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: 6.1.4
+version: 6.1.5
diff --git a/charts/stable/vaultwarden/SCALE/ix_values.yaml b/charts/stable/vaultwarden/SCALE/ix_values.yaml
index 8a4b54a0a32..f19bf252bab 100644
--- a/charts/stable/vaultwarden/SCALE/ix_values.yaml
+++ b/charts/stable/vaultwarden/SCALE/ix_values.yaml
@@ -18,6 +18,21 @@ envFrom:
   - secretRef:
       name: vaultwardensecret
 
+initContainers:
+  - name: init-postgresdb
+    image: postgres:13.1
+    command:
+      - "sh"
+      - "-c"
+      - "until pg_isready -U authelia -h ${pghost} ; do sleep 2 ; done"
+    imagePullPolicy: IfNotPresent
+    env:
+      - name: pghost
+        valueFrom:
+          secretKeyRef:
+            name: dbcreds
+            key: plainhost
+
 
 envValueFrom:
   DATABASE_URL:
diff --git a/charts/stable/vaultwarden/templates/_secrets.tpl b/charts/stable/vaultwarden/templates/_secrets.tpl
index 6a7bf408bb8..7218b7c5cd4 100644
--- a/charts/stable/vaultwarden/templates/_secrets.tpl
+++ b/charts/stable/vaultwarden/templates/_secrets.tpl
@@ -55,5 +55,6 @@ data:
   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 }}
+  plainhost: {{ ( printf "%v-%v" .Release.Name "postgresql" ) | b64enc | quote }}
 type: Opaque
 {{- end -}}
diff --git a/charts/stable/vaultwarden/values.yaml b/charts/stable/vaultwarden/values.yaml
index 9cfc0aa76a6..36d17472fe9 100644
--- a/charts/stable/vaultwarden/values.yaml
+++ b/charts/stable/vaultwarden/values.yaml
@@ -21,6 +21,21 @@ service:
 
 env: {}
 
+initContainers:
+  - name: init-postgresdb
+    image: postgres:13.1
+    command:
+      - "sh"
+      - "-c"
+      - "until pg_isready -U authelia -h ${pghost} ; do sleep 2 ; done"
+    imagePullPolicy: IfNotPresent
+    env:
+      - name: pghost
+        valueFrom:
+          secretKeyRef:
+            name: dbcreds
+            key: plainhost
+
 envTpl:
   DOMAIN: "https://{{ if .Values.ingress }}{{ if .Values.ingress.main.enabled }}{{ ( index .Values.ingress.main.hosts 0 ).host }}{{ else }}placeholder.com{{ end }}{{ else }}placeholder.com{{ end }}"