diff --git a/charts/vaultwarden/Chart.yaml b/charts/vaultwarden/Chart.yaml
index dff6b36..3cf0374 100644
--- a/charts/vaultwarden/Chart.yaml
+++ b/charts/vaultwarden/Chart.yaml
@@ -13,5 +13,5 @@ maintainers:
   - name: guerzon
     email: guerzon@proton.me
     url: https://github.com/guerzon
-version: 0.18.3
+version: 0.19.0
 kubeVersion: ">=1.12.0-0"
diff --git a/charts/vaultwarden/README.md b/charts/vaultwarden/README.md
index 9bf2a7d..0d1ef7f 100644
--- a/charts/vaultwarden/README.md
+++ b/charts/vaultwarden/README.md
@@ -293,6 +293,9 @@ helm -n $NAMESPACE uninstall $RELEASE_NAME
 | `serviceAccount.name`          | Name of the service account to create                                                                    | `vaultwarden-svc`                                                                                                                        |
 | `podSecurityContext`           | Pod security options                                                                                     | `{}`                                                                                                                                     |
 | `securityContext`              | Default security options to run vault as read only container without privilege escalation                | `{}`                                                                                                                                     |
+| `yubico.clientId`              | Yubico client ID                                                                                         | `""`                                                                                                                                     |
+| `yubico.secretKey`             | Yubico secret key                                                                                        | `""`                                                                                                                                     |
+| `yubico.server`                | Specify a Yubico server, otherwise the default servers will be used                                      | `""`                                                                                                                                     |
 
 ### Exposure Parameters
 
diff --git a/charts/vaultwarden/templates/configmap.yaml b/charts/vaultwarden/templates/configmap.yaml
index 038bef0..7f326ba 100644
--- a/charts/vaultwarden/templates/configmap.yaml
+++ b/charts/vaultwarden/templates/configmap.yaml
@@ -63,3 +63,10 @@ data:
   PUSH_INSTALLATION_ID: {{ .Values.pushNotifications.installationId | quote }}
   PUSH_INSTALLATION_KEY: {{ .Values.pushNotifications.installationKey | quote }}
   {{- end }}
+  {{- if and .Values.yubico.clientId .Values.yubico.secretKey }}
+  YUBICO_CLIENT_ID: {{ .Values.yubico.clientId | quote }}
+  YUBICO_SECRET_KEY: {{ .Values.yubico.secretKey | quote }}
+  {{- if .Values.yubico.server }}
+  YUBICO_SERVER: {{ .Values.yubico.server | quote }}
+  {{- end }}
+  {{- end }}
diff --git a/charts/vaultwarden/values.yaml b/charts/vaultwarden/values.yaml
index 312f086..b583fa0 100644
--- a/charts/vaultwarden/values.yaml
+++ b/charts/vaultwarden/values.yaml
@@ -148,6 +148,15 @@ securityContext: {}
   #   drop:
   #     - ALL
 
+## @param yubico.clientId Yubico client ID
+## @param yubico.secretKey Yubico secret key
+## @param yubico.server Specify a Yubico server, otherwise the default servers will be used
+##
+yubico:
+  clientId: ""
+  secretKey: ""
+  server: ""
+
 
 ## @section Exposure Parameters
 ##