diff --git a/doc/ci/runners/runner_fleet_dashboard.md b/doc/ci/runners/runner_fleet_dashboard.md
index bf6938759f82435534c6f87b5d15ec4ab15261e5..8e691eee11d9f31b9d7421c98b6a78406ab039cb 100644
--- a/doc/ci/runners/runner_fleet_dashboard.md
+++ b/doc/ci/runners/runner_fleet_dashboard.md
@@ -6,7 +6,10 @@ info: >-
this page, see
https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
---
-# Runner Fleet Dashboard **(ULTIMATE)**
+# Runner Fleet Dashboard
+
+DETAILS:
+**Tier:** Ultimate
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/424495) in GitLab 16.6
@@ -53,7 +56,12 @@ To export compute minutes used by instance runners:
1. Select **Fleet dashboard**.
1. Select **Export CSV**.
-## Enable more CI analytics features with ClickHouse **(ULTIMATE EXPERIMENT)**
+## Enable more CI analytics features with ClickHouse
+
+DETAILS:
+**Tier:** Ultimate
+**Offering:** SaaS, self-managed
+**Status:** Experiment
> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/11180) in GitLab 16.7 with the [flags](../../administration/feature_flags.md) named `ci_data_ingestion_to_click_house` and `clickhouse_ci_analytics`. Disabled by default.
> - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/issues/424866) in GitLab 16.8. Feature flag `clickhouse_ci_analytics` removed.
diff --git a/doc/development/documentation/versions.md b/doc/development/documentation/versions.md
index b19de915c7c88cb9b20416ad9387a41db170fb6a..be0c90bb308a965e586d6bd8d72ceb5f40aa7826 100644
--- a/doc/development/documentation/versions.md
+++ b/doc/development/documentation/versions.md
@@ -116,7 +116,11 @@ To deprecate a page or topic:
when it will be removed, and the replacement feature.
```markdown
- ## Title (deprecated) **(ULTIMATE SELF)**
+ ## Title (deprecated)
+
+ DETAILS:
+ **Tier:** Premium, Ultimate
+ **Offering:** SaaS, self-managed
WARNING:
This feature was [deprecated](<link-to-issue>) in GitLab 14.8
@@ -140,7 +144,11 @@ To deprecate a page or topic:
```markdown
<!--- start_remove The following content will be removed on remove_date: 'YYYY-MM-DD' -->
- ## Title (deprecated) **(ULTIMATE SELF)**
+ ## Title (deprecated)
+
+ DETAILS:
+ **Tier:** Premium, Ultimate
+ **Offering:** SaaS, self-managed
WARNING:
This feature was [deprecated](<link-to-issue>) in GitLab 14.8
@@ -175,7 +183,11 @@ To remove a page:
redirect_to: '../newpath/to/file/index.md'
---
- # Title (removed) **(ULTIMATE SELF)**
+ # Title (removed)
+
+ DETAILS:
+ **Tier:** Premium, Ultimate
+ **Offering:** SaaS, self-managed
This feature was [deprecated](<link-to-issue>) in GitLab X.Y
and [removed](<link-to-issue>) in X.Y.
@@ -200,7 +212,11 @@ To remove a topic:
```markdown
<!--- start_remove The following content will be removed on remove_date: 'YYYY-MM-DD' -->
- ## Title (removed) **(ULTIMATE SELF)**
+ ## Title (removed)
+
+ DETAILS:
+ **Tier:** Premium, Ultimate
+ **Offering:** SaaS, self-managed
This feature was [deprecated](<link-to-issue>) in GitLab X.Y
and [removed](<link-to-issue>) in X.Y.
diff --git a/doc/raketasks/spdx.md b/doc/raketasks/spdx.md
index ee02ef87342821a941ea646f4a37eb1d3fede87a..589282cc6c99c4f18f5643d949cef7be35e17211 100644
--- a/doc/raketasks/spdx.md
+++ b/doc/raketasks/spdx.md
@@ -4,7 +4,11 @@ group: Composition Analysis
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
---
-# SPDX license list import Rake task **(ULTIMATE SELF)**
+# SPDX license list import Rake task
+
+DETAILS:
+**Tier:** Ultimate
+**Offering:** Self-managed
GitLab provides a Rake task for uploading a fresh copy of the [SPDX license list](https://spdx.org/licenses/)
to a GitLab instance. This list is needed for matching the names of [License approval policies](../user/compliance/license_approval_policies.md).
diff --git a/doc/user/ai_features.md b/doc/user/ai_features.md
index 853ad7ab07ef84830d127a4fb0dfe76d1c227089..0da3091fa605c3b4c80f9cc3cdb39fb3aaea39eb 100644
--- a/doc/user/ai_features.md
+++ b/doc/user/ai_features.md
@@ -53,7 +53,12 @@ GitLab is creating AI-assisted features across our DevSecOps platform. These fea
The following subsections describe the experimental AI features in more detail.
-### Explain code in the Web UI with Code explanation **(ULTIMATE SAAS EXPERIMENT)**
+### Explain code in the Web UI with Code explanation
+
+DETAILS:
+**Tier:** Ultimate
+**Offering:** SaaS
+**Status:** Experiment
> - Introduced in GitLab 15.11 as an [Experiment](../policy/experiment-beta-support.md#experiment) on GitLab.com.
@@ -98,7 +103,12 @@ code in a merge request:
We cannot guarantee that the large language model produces results that are correct. Use the explanation with caution.
-### Summarize issue discussions with Discussion summary **(ULTIMATE SAAS EXPERIMENT)**
+### Summarize issue discussions with Discussion summary
+
+DETAILS:
+**Tier:** Ultimate
+**Offering:** SaaS
+**Status:** Experiment
> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/10344) in GitLab 16.0 as an [Experiment](../policy/experiment-beta-support.md#experiment).
@@ -121,7 +131,12 @@ Provide feedback on this experimental feature in [issue 407779](https://gitlab.c
**Data usage**: When you use this feature, the text of public comments on the issue are sent to the large
language model referenced above.
-### Forecast deployment frequency with Value stream forecasting **(ULTIMATE ALL EXPERIMENT)**
+### Forecast deployment frequency with Value stream forecasting
+
+DETAILS:
+**Tier:** Ultimate
+**Offering:** SaaS, self-managed
+**Status:** Experiment
> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/10228) in GitLab 16.2 as an [Experiment](../policy/experiment-beta-support.md#experiment).
@@ -146,7 +161,12 @@ For example, if you select a 30-day range, a forecast for the following 15 days
Provide feedback on this experimental feature in [issue 416833](https://gitlab.com/gitlab-org/gitlab/-/issues/416833).
-### Root cause analysis **(ULTIMATE SAAS EXPERIMENT)**
+### Root cause analysis
+
+DETAILS:
+**Tier:** Ultimate
+**Offering:** SaaS
+**Status:** Experiment
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/123692) in GitLab 16.2 as an [Experiment](../policy/experiment-beta-support.md#experiment).
@@ -160,7 +180,12 @@ When the feature is available, the "Root cause analysis" button will appears on
a failed CI/CD job. Selecting this button generates an analysis regarding the
reason for the failure.
-### Summarize an issue with Issue description generation **(ULTIMATE SAAS EXPERIMENT)**
+### Summarize an issue with Issue description generation
+
+DETAILS:
+**Tier:** Ultimate
+**Offering:** SaaS
+**Status:** Experiment
> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/10762) in GitLab 16.3 as an [Experiment](../policy/experiment-beta-support.md#experiment).
@@ -183,7 +208,12 @@ Provide feedback on this experimental feature in [issue 409844](https://gitlab.c
**Data usage**: When you use this feature, the text you enter is sent to the large
language model referenced above.
-### GitLab Duo Chat **(ULTIMATE SAAS BETA)**
+### GitLab Duo Chat
+
+DETAILS:
+**Tier:** Ultimate
+**Offering:** SaaS
+**Status:** Beta
For details about this Beta feature, see [GitLab Duo Chat](gitlab_duo_chat.md).