diff --git a/doc/user/product_analytics/index.md b/doc/user/product_analytics/index.md
index 6676a28dfdbfa09d5b1673547f42c91383363eb2..00e48e5d5d34c63ca210d16a0e52ee7da6ba458d 100644
--- a/doc/user/product_analytics/index.md
+++ b/doc/user/product_analytics/index.md
@@ -53,10 +53,10 @@ Product Analytics uses several tools:
 > - Introduced in GitLab 15.6 behind the [feature flag](../../administration/feature_flags.md) named `cube_api_proxy`. Disabled by default.
 > - Moved to be behind the [feature flag](../../administration/feature_flags.md) named `product_analytics_admin_settings` in GitLab 15.7. Disabled by default.
 > - `cube_api_proxy` removed and replaced with `product_analytics_internal_preview` in GitLab 15.10.
-> - `product_analytics_admin_settings` and `product_analytics_internal_preview` consolidated and replaced with `product_analytics_dashboards` in GitLab 15.11.
+> - `product_analytics_internal_preview` replaced with `product_analytics_dashboards` in GitLab 15.11.
 
 FLAG:
-On self-managed GitLab, by default this feature is not available. To make it available per project or for your entire instance, ask an administrator to [enable the feature flag](../../administration/feature_flags.md) named `product_analytics_dashboards`.
+On self-managed GitLab, by default this feature is not available. To make it available per project or for your entire instance, ask an administrator to [enable the feature flags](../../administration/feature_flags.md) named `product_analytics_dashboards` and `product_analytics_admin_settings`.
 On GitLab.com, this feature is not available.
 This feature is not ready for production use.
 
diff --git a/ee/app/views/admin/application_settings/_product_analytics.html.haml b/ee/app/views/admin/application_settings/_product_analytics.html.haml
index aacf2e7e6414aa4dbdcdea5a4710b5dc4993aa1c..753166be05ac7c01094fb008ae2624140b4d4d10 100644
--- a/ee/app/views/admin/application_settings/_product_analytics.html.haml
+++ b/ee/app/views/admin/application_settings/_product_analytics.html.haml
@@ -1,4 +1,4 @@
-- return unless License.feature_available?(:product_analytics) && Feature.enabled?(:product_analytics_dashboards)
+- return unless License.feature_available?(:product_analytics) && Feature.enabled?(:product_analytics_admin_settings)
 - expanded = integration_expanded?('product_analytics_')
 
 %section.settings.as-product-analytics.no-animate#js-product-analytics-settings{ class: ('expanded' if expanded) }
diff --git a/ee/config/feature_flags/development/product_analytics_admin_settings.yml b/ee/config/feature_flags/development/product_analytics_admin_settings.yml
new file mode 100644
index 0000000000000000000000000000000000000000..8dbe9c8be6564662f1d7fbc3db71405b047432fb
--- /dev/null
+++ b/ee/config/feature_flags/development/product_analytics_admin_settings.yml
@@ -0,0 +1,7 @@
+name: product_analytics_admin_settings
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106847
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385602
+milestone: '15.7'
+type: development
+group: group::product analytics
+default_enabled: false
diff --git a/ee/spec/views/admin/application_settings/general.html.haml_spec.rb b/ee/spec/views/admin/application_settings/general.html.haml_spec.rb
index 4f0080e4b63fb1c29d3190154a303a4f731b081c..33c6392362777da0a9b96b3bb28fd6143bdd5148 100644
--- a/ee/spec/views/admin/application_settings/general.html.haml_spec.rb
+++ b/ee/spec/views/admin/application_settings/general.html.haml_spec.rb
@@ -140,7 +140,7 @@
     with_them do
       before do
         stub_licensed_features(product_analytics: licensed)
-        stub_feature_flags(product_analytics_dashboards: flag_enabled)
+        stub_feature_flags(product_analytics_admin_settings: flag_enabled)
       end
 
       it_behaves_like params[:examples_to_run]