diff --git a/chart/templates/monitoring/values.yaml b/chart/templates/monitoring/values.yaml
index 7cac74ea804577b36bd00a5f75a485177b44d2d6..77a0ed4dd1f692c1918200112718c420e063b29e 100644
--- a/chart/templates/monitoring/values.yaml
+++ b/chart/templates/monitoring/values.yaml
@@ -67,7 +67,13 @@ grafana:
       api_url: {{ .Values.monitoring.sso.grafana.api_url | default (tpl "https://{{ .Values.sso.oidc.host }}/auth/realms/{{ .Values.sso.oidc.realm }}/protocol/openid-connect/userinfo" .) }}
       allow_sign_up: {{ .Values.monitoring.sso.grafana.allow_sign_up | default "True" }}
       role_attribute_path: {{ .Values.monitoring.sso.grafana.role_attribute_path | default "Viewer" }}
-      allowed_domains: {{ .Values.monitoring.sso.grafana.allowed_domains }}
+    {{- with .Values.monitoring.sso.grafana }}
+      {{- list "allowed_domains" .allowed_domains | include "bigbang.addValueIfSet" | indent 6 }}
+      {{- list "tls_client_ca" .tls_client_ca | include "bigbang.addValueIfSet" | indent 6 }}
+      {{- list "tls_skip_verify_insecure" .tls_skip_verify_insecure | include "bigbang.addValueIfSet" | indent 6 }}
+      {{- list "tls_client_cert" .tls_client_cert | include "bigbang.addValueIfSet" | indent 6 }}
+      {{- list "tls_client_key" .tls_client_key | include "bigbang.addValueIfSet" | indent 6 }}
+    {{- end }}
 
 prometheus-node-exporter:
   serviceAccount:
diff --git a/chart/values.yaml b/chart/values.yaml
index 57949d2c3ac78092ffa8751ffb2adb9f814fa9c3..9deca69ba45ab02a480f418b53d17a7a49829a20 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -347,10 +347,13 @@ monitoring:
       # -- Grafana OIDC client secret
       client_secret: ""
 
-      # -- Grafana OIDC client scopes, comma separated
+      # -- Grafana OIDC client scopes, comma separated, see https://grafana.com/docs/grafana/latest/auth/generic-oauth/
       scopes: ""
+
       allow_sign_up: "true"
+
       role_attribute_path: "Viewer"
+      # -- Other options available, see package Documentation.
 
   # -- Values to passthrough to the monitoring chart: https://repo1.dso.mil/platform-one/big-bang/apps/core/monitoring.git
   values: {}