diff --git a/production/helm/loki/scenarios/default-values.yaml b/production/helm/loki/scenarios/default-values.yaml
index a79baee503989..4cdf3fd47da21 100644
--- a/production/helm/loki/scenarios/default-values.yaml
+++ b/production/helm/loki/scenarios/default-values.yaml
@@ -4,6 +4,8 @@ loki:
     replication_factor: 1
   useTestSchema: true
   storage:
+    # Loki requires a bucket for chunks and the ruler. GEL requires a third bucket for the admin API.
+    # Please provide these values if you are using object storage.
     bucketNames:
       chunks: chunks
       ruler: ruler
diff --git a/production/helm/loki/scenarios/ingress-values.yaml b/production/helm/loki/scenarios/ingress-values.yaml
index ff5ff1efd9ce7..761ed93e6c7ce 100644
--- a/production/helm/loki/scenarios/ingress-values.yaml
+++ b/production/helm/loki/scenarios/ingress-values.yaml
@@ -13,6 +13,8 @@ loki:
     replication_factor: 1
   useTestSchema: true
   storage:
+    # Loki requires a bucket for chunks and the ruler. GEL requires a third bucket for the admin API.
+    # Please provide these values if you are using object storage.
     bucketNames:
       chunks: chunks
       ruler: ruler
diff --git a/production/helm/loki/scenarios/legacy-monitoring-values.yaml b/production/helm/loki/scenarios/legacy-monitoring-values.yaml
index ad520e57f2f44..333336d7da12f 100644
--- a/production/helm/loki/scenarios/legacy-monitoring-values.yaml
+++ b/production/helm/loki/scenarios/legacy-monitoring-values.yaml
@@ -4,6 +4,8 @@ loki:
     replication_factor: 1
   useTestSchema: true
   storage:
+    # Loki requires a bucket for chunks and the ruler. GEL requires a third bucket for the admin API.
+    # Please provide these values if you are using object storage.
     bucketNames:
       chunks: chunks
       ruler: ruler
diff --git a/production/helm/loki/templates/_helpers.tpl b/production/helm/loki/templates/_helpers.tpl
index acc66905ddc23..7d7a853ee2fb5 100644
--- a/production/helm/loki/templates/_helpers.tpl
+++ b/production/helm/loki/templates/_helpers.tpl
@@ -504,6 +504,7 @@ storage:
 Calculate the config from structured and unstructured text input
 */}}
 {{- define "loki.calculatedConfig" -}}
+{{- required ".Values.loki.storage.bucketNames is required, search for FIXME on the `values.yaml` file" .Values.loki.storage.bucketNames -}}
 {{ tpl (mergeOverwrite (tpl .Values.loki.config . | fromYaml) .Values.loki.structuredConfig | toYaml) . }}
 {{- end }}