diff --git a/src/server/services/buckets/views/all.njk b/src/server/services/buckets/views/all.njk
index 965ac1f0..6ee297c0 100644
--- a/src/server/services/buckets/views/all.njk
+++ b/src/server/services/buckets/views/all.njk
@@ -12,6 +12,11 @@
#cdp-support
{% endset %}
+{% set bucketNamesInfoHtml %}
+ Why do bucket names have random characters at the end?
+ See Bucket Naming documentation for more details
+{% endset %}
{% set allEnvironmentsTables = [] %}
{% for environment, detail in bucketsByEnvironment %}
@@ -72,6 +77,11 @@
View buckets for {{ service.serviceName }} in all CDP environments
+ {{ appInfo({
+ classes: "govuk-!-margin-bottom-4",
+ html: bucketNamesInfoHtml
+ }) }}
+
{% for detail in allEnvironmentsTables %}
diff --git a/src/server/services/buckets/views/environment.njk b/src/server/services/buckets/views/environment.njk
index 2968c094..cfa2cd8e 100644
--- a/src/server/services/buckets/views/environment.njk
+++ b/src/server/services/buckets/views/environment.njk
@@ -12,6 +12,12 @@
#cdp-support
{% endset %}
+{% set bucketNamesInfoHtml %}
+ Why do bucket names have random characters at the end?
+
See Bucket Naming documentation for more details
+{% endset %}
+
{% set bucketsTableRows = [] %}
{% for bucket in buckets %}
@@ -46,6 +52,11 @@
Buckets available to your service
+ {{ appInfo({
+ classes: "govuk-!-margin-bottom-4",
+ html: bucketNamesInfoHtml
+ }) }}
+
{% call appPanel({ classes: "govuk-!-margin-bottom-6" }) %}
{% if buckets | length %}
{{ govukTable({