diff --git a/charts/enterprise/authelia/Chart.yaml b/charts/enterprise/authelia/Chart.yaml
index edc2f7769d0..5531d0e5541 100644
--- a/charts/enterprise/authelia/Chart.yaml
+++ b/charts/enterprise/authelia/Chart.yaml
@@ -35,7 +35,7 @@ sources:
   - https://github.com/authelia/chartrepo
   - https://github.com/authelia/authelia
 type: application
-version: 18.0.0
+version: 18.1.0
 annotations:
   truecharts.org/catagories: |
     - security
diff --git a/charts/enterprise/authelia/questions.yaml b/charts/enterprise/authelia/questions.yaml
index ce13acb4760..9bbc055f5ef 100644
--- a/charts/enterprise/authelia/questions.yaml
+++ b/charts/enterprise/authelia/questions.yaml
@@ -98,6 +98,95 @@ questions:
           schema:
             type: int
             default: 1
+  - variable: password_policy
+    group: "App Configuration"
+    label: "Password Policy Configuration"
+    description: "Authelia allows administrators to configure an enforced password policy."
+    schema:
+      additional_attrs: true
+      type: dict
+      attrs:
+        - variable: enabled
+          label: "Enable"
+          schema:
+            type: boolean
+            default: false
+            show_subquestions_if: true
+            subquestions:
+              - variable: standard
+                label: Standard
+                schema:
+                  additional_attrs: true
+                  type: dict
+                  attrs:
+                    - variable: enabled
+                      label: Enabled
+                      schema:
+                        type: boolean
+                        default: false
+                    - variable: min_length
+                      label: "Minimum Password Length"
+                      description: "Minimum Password Length"
+                      schema:
+                        type: int
+                        required: true
+                        show_if: [["enabled", "=", true]]
+                        default: 8
+                    - variable: max_length
+                      label: "Max Passsword Length"
+                      description: "Max Password Length"
+                      schema:
+                        type: int
+                        required: true
+                        show_if: [["enabled", "=", true]]
+                        default: 0
+                    - variable: require_uppercase
+                      label: "Require Upppercase"
+                      schema:
+                        type: boolean
+                        default: false
+                        show_if: [["enabled", "=", true]]
+                        required: true
+                    - variable: require_lowercase
+                      label: "Require Lowercase"
+                      schema:
+                        type: boolean
+                        default: false
+                        show_if: [["enabled", "=", true]]
+                        required: true
+                    - variable: require_number
+                      label: "Require Numbers"
+                      description: "Require Numbers in the password"
+                      schema:
+                        type: boolean
+                        default: false
+                        show_if: [["enabled", "=", true]]
+                        required: true
+                    - variable: require_special
+                      label: "Require Special Characters"
+                      schema:
+                        type: boolean
+                        default: false
+                        show_if: [["enabled", "=", true]]
+              - variable: zxcvbn
+                label: zxcvbn
+                schema:
+                  additional_attrs: true
+                  type: dict
+                  attrs:
+                    - variable: enabled
+                      label: Enabled
+                      schema:
+                        type: boolean
+                        default: false
+                        required: true
+                    - variable: min_score
+                      label: "Min Score"
+                      schema:
+                        type: int
+                        required: true
+                        show_if: [["enabled", "=", true]]
+                        default: 3
   - variable: duo_api
     group: "App Configuration"
     label: "DUO API Configuration"
diff --git a/charts/enterprise/authelia/templates/_configmap.tpl b/charts/enterprise/authelia/templates/_configmap.tpl
index eb6f8b19ac3..5c3ee755997 100644
--- a/charts/enterprise/authelia/templates/_configmap.tpl
+++ b/charts/enterprise/authelia/templates/_configmap.tpl
@@ -62,6 +62,20 @@ data:
       issuer: {{ .Values.totp.issuer | default .Values.domain }}
       period: {{ .Values.totp.period | default 30 }}
       skew: {{ .Values.totp.skew | default 1 }}
+    {{- if .Values.password_policy.enabled }}
+    password_policy:
+      standard:
+        enabled: {{ .Values.password_policy.standard.enabled | default false }}
+        min_length: {{ .Values.password_policy.standard.min_length | default 8 }}
+        max_length: {{ .Values.password_policy.standard.max_length | default 0 }}
+        require_uppercase: {{ .Values.password_policy.standard.require_uppercase | default false }}
+        require_lowercase: {{ .Values.password_policy.standard.require_lowercase | default false }}
+        require_number: {{ .Values.password_policy.standard.require_number | default false }}
+        require_special: {{ .Values.password_policy.standard.require_special | default false }}
+      zxcvbn:
+        enabled: {{ .Values.password_policy.zxcvbn.enabled | default false }}
+        min_score: {{ .Values.password_policy.zxcvbn.min_score | default 3 }}
+    {{- end -}}
     {{- if .Values.duo_api.enabled }}
     duo_api:
       hostname: {{ .Values.duo_api.hostname }}
diff --git a/charts/enterprise/authelia/values.yaml b/charts/enterprise/authelia/values.yaml
index 11f98471bad..e27c2e05ede 100644
--- a/charts/enterprise/authelia/values.yaml
+++ b/charts/enterprise/authelia/values.yaml
@@ -117,6 +117,25 @@ totp:
   ## See: https://www.authelia.com/docs/configuration/one-time-password.html#period-and-skew to read the documentation.
   skew: 1
 
+##
+## Password Policy Config
+##
+## Parameters used for Password Policies
+password_policy:
+  ## See: https://www.authelia.com/configuration/security/password-policy/
+  standard:
+    enabled: false
+    min_length: 8
+    max_length: 0
+    require_uppercase: false
+    require_lowercase: false
+    require_number: false
+    require_special: false
+  zxcvbn:
+    ## See https://www.authelia.com/configuration/security/password-policy/#zxcvbn for more info
+    enabled: false
+    min_score: 3
+
 ##
 ## Duo Push API Configuration
 ##