diff --git a/charts/stable/vikunja/Chart.yaml b/charts/stable/vikunja/Chart.yaml
index 56dfadc0c38..4e714485318 100644
--- a/charts/stable/vikunja/Chart.yaml
+++ b/charts/stable/vikunja/Chart.yaml
@@ -50,5 +50,5 @@ sources:
   - https://hub.docker.com/r/vikunja/vikunja
   - https://vikunja.io/docs
 type: application
-version: 18.0.0
+version: 18.0.1
 
diff --git a/charts/stable/vikunja/templates/_secrets.tpl b/charts/stable/vikunja/templates/_secrets.tpl
index 53a5bb31bb6..6da3c58be69 100644
--- a/charts/stable/vikunja/templates/_secrets.tpl
+++ b/charts/stable/vikunja/templates/_secrets.tpl
@@ -151,14 +151,23 @@ secret:
             {{- end }}
             {{- with .Values.vikunja.auth.openid.providers }}
             providers:
-              {{- range . }}
-              - name: {{ .name | quote }}
-                authurl: {{ .authurl | quote }}
-                {{- with .logouturl }}
+              {{- range $key, $value := . }}
+              {{ $key }}:
+                name: {{ $value.name | quote }}
+                authurl: {{ $value.authurl | quote }}
+                {{- with $value.logouturl }}
                 logouturl: {{ . | quote }}
                 {{- end }}
-                clientid: {{ .clientid | quote }}
-                clientsecret: {{ .clientsecret | quote }}
+                clientid: {{ $value.clientid | quote }}
+                clientsecret: {{ $value.clientsecret | quote }}
+                {{- if hasKey $value "scope" }}
+                scope: {{ $value.scope | quote }}
+                {{- end }}
+                {{- if hasKey $value "forceuserinfo" }}
+                forceuserinfo: {{ $value.forceuserinfo }}
+                {{- else }}
+                forceuserinfo: false
+                {{- end }}
               {{- end }}
             {{- end }}
 
diff --git a/charts/stable/vikunja/values.yaml b/charts/stable/vikunja/values.yaml
index 32f42c87e01..2fd601497eb 100644
--- a/charts/stable/vikunja/values.yaml
+++ b/charts/stable/vikunja/values.yaml
@@ -103,12 +103,24 @@ vikunja:
     openid:
       enabled: false
       redirecturl: ""
-      providers: []
-      # - name: ""
-      #   authurl: ""
-      #   logouturl: ""
-      #   clientid: ""
-      #   clientsecret: ""
+      providers: {}
+      # Example configuration for multiple OpenID providers:
+      # providers:
+      #   provider-id1:
+      #     name: "Provider 1"
+      #     authurl: "https://auth.example.com"  # Used for OIDC Discovery, usually the issuer
+      #     logouturl: ""  # Optional
+      #     clientid: "vikunja-client-id"
+      #     clientsecret: "vikunja-client-secret"
+      #     scope: "openid profile email"
+      #     forceuserinfo: false  # Optional: Set to true to always use UserInfo endpoint instead of ID token claims
+      #   provider-id2:
+      #     name: "Provider 2"
+      #     authurl: "https://auth2.example.com"
+      #     clientid: "vikunja-client-id-2"
+      #     clientsecret: "vikunja-client-secret-2"
+      #     scope: "openid profile email"
+      #     forceuserinfo: false
   migration:
     todoist:
       enable: false