diff --git a/docs/guides/server/all-config.adoc b/docs/guides/server/all-config.adoc
index ab1e5f3244b..9512262df68 100644
--- a/docs/guides/server/all-config.adoc
+++ b/docs/guides/server/all-config.adoc
@@ -11,7 +11,7 @@ summary="Review build options and configuration for {project_name}.">
 [#category-${category.name()?lower_case}]
 == ${category.heading}
 
-<@opts.list options=categoryOptions></@opts.list>
+<@opts.list options=categoryOptions categoryName=category.name()></@opts.list>
 </#if>
 </#list>
 </@template.guide>
diff --git a/docs/guides/templates/options.adoc b/docs/guides/templates/options.adoc
index e53dbd5f768..266c5833df2 100644
--- a/docs/guides/templates/options.adoc
+++ b/docs/guides/templates/options.adoc
@@ -16,7 +16,7 @@
 <#nested>
 </#macro>
 
-<#macro list options buildIcon=true anchor=true>
+<#macro list options buildIcon=true anchor=true categoryName="">
 [cols="12a,4",role="options"]
 |===
 | |Value
@@ -27,7 +27,7 @@
 
 [.options-description]#${option.description}#
 
-[<#if anchor>#option-extended-${option.key},</#if>role="options-extended"]
+[<#if anchor>#option-extended-${categoryName?lower_case}-${option.key},</#if>role="options-extended"]
 --
 <#if option.descriptionExtended?has_content>[.options-description-extended]#${option.descriptionExtended!}#</#if>