diff --git a/config/feature_flags/gitlab_com_derisk/duo_chat_docs_qa_claude_3_7.yml b/config/feature_flags/gitlab_com_derisk/duo_chat_docs_qa_claude_3_7.yml
new file mode 100644
index 0000000000000000000000000000000000000000..7071d4f42f3d4266a830adfc1d54f251b2d29e8f
--- /dev/null
+++ b/config/feature_flags/gitlab_com_derisk/duo_chat_docs_qa_claude_3_7.yml
@@ -0,0 +1,9 @@
+---
+name: duo_chat_docs_qa_claude_3_7
+feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/521058
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/182991
+rollout_issue_url:  https://gitlab.com/gitlab-org/gitlab/-/issues/521833
+milestone: '17.10'
+group: group::duo chat
+type: gitlab_com_derisk
+default_enabled: false
diff --git a/ee/lib/gitlab/llm/completions/chat.rb b/ee/lib/gitlab/llm/completions/chat.rb
index ef7eb65ebc8596f488109752def60e8189df5815..81618a1418710023cdc98f16b6de9eea858597d1 100644
--- a/ee/lib/gitlab/llm/completions/chat.rb
+++ b/ee/lib/gitlab/llm/completions/chat.rb
@@ -161,6 +161,7 @@ def push_feature_flags
           end
 
           Gitlab::AiGateway.push_feature_flag(:duo_chat_react_agent_claude_3_7, user)
+          Gitlab::AiGateway.push_feature_flag(:duo_chat_docs_qa_claude_3_7, user)
 
           return if ::CloudConnector.self_managed_cloud_connected?