diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc
index 8753c2d9eda5..f3b1925adb82 100644
--- a/shared/attributes.asciidoc
+++ b/shared/attributes.asciidoc
@@ -181,10 +181,13 @@ Elastic Cloud
 :ess:         Elasticsearch Service
 :ece:         Elastic Cloud Enterprise
 :eck:         Elastic Cloud on Kubernetes
-:serverless-full:  Elastic Cloud serverless
-:es-serverless: Elasticsearch on serverless
-:serverless-short: serverless
-:serverless-docs: https://docs.elastic.co/serverless
+:serverless-full:  Elastic Cloud Serverless
+:serverless-short: Serverless
+:es-serverless:    Elasticsearch Serverless
+:es3:              {es-serverless}
+:obs-serverless:   Elastic Observability Serverless
+:sec-serverless:   Elastic Security Serverless
+:serverless-docs:  https://docs.elastic.co/serverless
 :cloud:       https://www.elastic.co/guide/en/cloud/current
 :ess-utm-params: ?page=docs&placement=docs-body
 :ess-baymax:  {ess-utm-params}
@@ -259,6 +262,20 @@ Kibana app and UI names
 :data-sources-caps:  Data Views
 :data-source-cap:    Data view
 :data-sources-cap:   Data views
+:project-settings:   Project settings
+:manage-app:         Management
+:index-manage-app:   Index Management
+:data-views-app:     Data Views
+:rules-app:          Rules
+:saved-objects-app:  Saved Objects
+:tags-app:           Tags
+:api-keys-app:       API keys
+:transforms-app:     Transforms
+:connectors-app:     Connectors
+:files-app:          Files
+:reports-app:        Reports
+:maps-app:           Maps
+:alerts-app:         Alerts
 // Use data-source-cap instead of Data-source
 // Use data-sources-cap instead of Data-sources
 // Use data-sources-caps instead of Data-Sources
diff --git a/shared/versions/stack/master.asciidoc b/shared/versions/stack/master.asciidoc
index c4815f808e02..a55cf5eb69ff 100644
--- a/shared/versions/stack/master.asciidoc
+++ b/shared/versions/stack/master.asciidoc
@@ -71,4 +71,10 @@ Synthetics
 ////
 API URLs
 ////
-:api-kibana:           https://www.elastic.co/docs/api/doc/kibana
\ No newline at end of file
+:api-kibana:           https://www.elastic.co/docs/api/doc/kibana
+
+////
+Feature flags
+////
+
+:serverlessCustomRoles: true
\ No newline at end of file