diff --git a/config/feature_flags/development/generate_commit_message_flag.yml b/config/feature_flags/development/generate_commit_message_flag.yml
index b0655fd9929a48eed000394a65c337e289a5a2fe..a6403400f52acd6ed8102f2b2c6d6f50727bc8ef 100644
--- a/config/feature_flags/development/generate_commit_message_flag.yml
+++ b/config/feature_flags/development/generate_commit_message_flag.yml
@@ -1,8 +1,8 @@
---
name: generate_commit_message_flag
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/120259
-rollout_issue_url:
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/467412
milestone: '16.0'
type: development
group: group::code review
-default_enabled: false
+default_enabled: true
diff --git a/doc/user/gitlab_duo/index.md b/doc/user/gitlab_duo/index.md
index d286158c5ff7fec259d8889b198dc44a0ce50d22..baca560a7d1e7026303587a97c773444e2c97900 100644
--- a/doc/user/gitlab_duo/index.md
+++ b/doc/user/gitlab_duo/index.md
@@ -108,6 +108,16 @@ DETAILS:
- [Watch overview](https://www.youtube.com/watch?v=ivwZQgh4Rxw)
- [View documentation](../project/merge_requests/reviews/index.md#gitlab-duo-suggested-reviewers).
+### Merge commit generation
+
+DETAILS:
+**Tier:** Premium and Ultimate with [GitLab Duo Enterprise](../../subscriptions/subscription-add-ons.md).
+**Offering:** GitLab.com, Self-managed, GitLab Dedicated
+
+- Helps you merge more quickly by generating meaningful commit messages.
+- LLM: Vertex AI Codey [`text-bison`](https://console.cloud.google.com/vertex-ai/publishers/google/model-garden/text-bison).
+- [View documentation](../project/merge_requests/duo_in_merge_requests.md#generate-a-merge-commit-message).
+
## Beta features
### Merge request template population
@@ -193,17 +203,6 @@ DETAILS:
- [Watch overview](https://www.youtube.com/watch?v=Bx6Zajyuy9k&list=PLFGfElNsQthYDx0A_FaNNfUm9NHsK6zED)
- [View documentation](../project/merge_requests/duo_in_merge_requests.md#summarize-a-code-review).
-### Merge and squash commit generation
-
-DETAILS:
-**Tier:** For a limited time, Ultimate. In the future, [GitLab Duo Enterprise](../../subscriptions/subscription-add-ons.md).
-**Offering:** GitLab.com
-**Status:** Experiment
-
-- Helps you merge more quickly by generating meaningful commit messages.
-- LLM: Vertex AI Codey [`text-bison`](https://console.cloud.google.com/vertex-ai/publishers/google/model-garden/text-bison).
-- [View documentation](../project/merge_requests/duo_in_merge_requests.md#generate-a-merge-or-squash-commit-message).
-
### Root cause analysis
DETAILS:
diff --git a/doc/user/project/merge_requests/duo_in_merge_requests.md b/doc/user/project/merge_requests/duo_in_merge_requests.md
index 009072b4e1f933744d0a5c060b2c1054c0a63467..cf2c88570289fcf5e6c96ea42ba39c6c3a96656f 100644
--- a/doc/user/project/merge_requests/duo_in_merge_requests.md
+++ b/doc/user/project/merge_requests/duo_in_merge_requests.md
@@ -96,16 +96,20 @@ Provide feedback on this experimental feature in [issue 408991](https://gitlab.c
- Draft comment's text
-## Generate a merge or squash commit message
+## Generate a merge commit message
DETAILS:
-**Tier:** For a limited time, Ultimate. In the future, [GitLab Duo Enterprise](../../../subscriptions/subscription-add-ons.md).
-**Offering:** GitLab.com
-**Status:** Experiment
+**Tier:** Premium and Ultimate with [GitLab Duo Enterprise](../../../subscriptions/subscription-add-ons.md).
+**Offering:** GitLab.com, Self-managed, GitLab Dedicated
+
+> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/10453) in GitLab 16.2 as an [experiment](../../../policy/experiment-beta-support.md#experiment) [with a flag](../../../administration/feature_flags.md) named `generate_commit_message_flag`. Disabled by default.
+> - Feature flag `generate_commit_message_flag` [enabled by default](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158339) in GitLab 17.2.
-> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/10453) in GitLab 16.2 as an [experiment](../../../policy/experiment-beta-support.md#experiment).
+FLAG:
+The availability of this feature is controlled by a feature flag.
+For more information, see the history.
-When preparing to merge your merge request you might wish to edit the proposed squash or merge commit message.
+When preparing to merge your merge request you might wish to edit the proposed merge commit message.
To generate a commit message with GitLab Duo:
diff --git a/ee/app/assets/javascripts/vue_merge_request_widget/components/ai_commit_message.vue b/ee/app/assets/javascripts/vue_merge_request_widget/components/ai_commit_message.vue
index 97e0e22d2291b2a0dfdef3a77836948964827381..9f2f312d21a71ef6813ebaddafa8c875eeb0085c 100644
--- a/ee/app/assets/javascripts/vue_merge_request_widget/components/ai_commit_message.vue
+++ b/ee/app/assets/javascripts/vue_merge_request_widget/components/ai_commit_message.vue
@@ -1,5 +1,5 @@