diff --git a/docs/values.md b/docs/values.md
index 4d3d066c249dc6f46382a3cbe8280a4a01f574b9..a8aea77ff3e3bb8ec7029a806917028b9e321c70 100644
--- a/docs/values.md
+++ b/docs/values.md
@@ -81,8 +81,8 @@ This file contains the markdown version of the default values that this chart ta
 | metrics.alertmanager.nodeSelector | Hash | `{}` | node selector configuration for the alertmanager |
 | otlp.endpoint | string | `"monit-otlp.cern.ch"` | otlp endpoint where the otlp receivers are listening |
 | otlp.port | int | `4319` | otlp port where the otlp receivers are listening |
-| tenant.name | string | `"nil"` | username used for authenitcating in the MONIT infrastructure |
-| tenant.password | string | `"nil"` | password (plain) used for authenitcating in the MONIT infrastructure |
+| tenant.name | string | - | username used for authenitcating in the MONIT infrastructure |
+| tenant.password | string | - | password (plain) used for authenitcating in the MONIT infrastructure |
 | crds.enabled | bool | `true` | whether to install Prometheus operator's CRDs |
 
 ----------------------------------------------
diff --git a/values.yaml b/values.yaml
index a755779416379ab025c632d78c8b64ee1a0e5d44..7c6e0c83301deeee9468f553b491dd53d9792fdb 100644
--- a/values.yaml
+++ b/values.yaml
@@ -10,12 +10,12 @@ otlp:
   port: 4319
 
 # Tenant configuration. Username and Password are provided via CERN Central IT
-# Monitoring service.
-tenant:
+# Monitoring service. This bit is required if fluentbit is enabled (default)
+# tenant:
   # -- username used for authenitcating in the MONIT infrastructure
-  name: nil
+  # name: example
   # -- password (plain) used for authenitcating in the MONIT infrastructure
-  password: nil
+  # password: example
 
 # Kubernetes configuration.
 kubernetes:
@@ -220,8 +220,8 @@ metrics:
         traces_uri: /v1/traces
         tls: on
         tls.verify: off
-        http_user: {{ .Values.tenant.name }}
-        http_passwd: {{ .Values.tenant.password }}
+        http_user: {{ required "Tenant name is required" (.Values.tenant).name }}
+        http_passwd: {{ required "Tenant password is required" (.Values.tenant).password }}
         storage.total_limit_size: {{ .Values.metrics.fluentbit.diskMaxCache }}
         header: User-Agent {{ .Chart.Name }}/{{ .Chart.Version }}
 
@@ -414,8 +414,8 @@ logs:
           traces_uri /v1/traces
           tls on
           tls.verify off
-          http_user {{ .Values.tenant.name }}
-          http_passwd {{ .Values.tenant.password }}
+          http_user {{ required "Tenant name is required" (.Values.tenant).name }}
+          http_passwd {{ required "Tenant password is required" (.Values.tenant).password }}
           header tag monit
           header log_type kubernetes
           header User-Agent {{ .Chart.Name }}/{{ .Chart.Version }}