diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml
index ed8a03ce998e612928e5875f97f8066f0d4fd804..db255f222e0ea148d0794c5028860e3a5eec0ce7 100644
--- a/app/workers/all_queues.yml
+++ b/app/workers/all_queues.yml
@@ -275,7 +275,7 @@
   :tags: []
 - :name: cronjob:ci_runners_reconcile_existing_runner_versions_cron
   :worker_name: Ci::Runners::ReconcileExistingRunnerVersionsCronWorker
-  :feature_category: :runner_fleet
+  :feature_category: :fleet_visibility
   :has_external_dependencies: false
   :urgency: :low
   :resource_boundary: :unknown
@@ -284,7 +284,7 @@
   :tags: []
 - :name: cronjob:ci_runners_stale_machines_cleanup_cron
   :worker_name: Ci::Runners::StaleMachinesCleanupCronWorker
-  :feature_category: :runner_fleet
+  :feature_category: :fleet_visibility
   :has_external_dependencies: false
   :urgency: :low
   :resource_boundary: :unknown
@@ -2741,7 +2741,7 @@
   :tags: []
 - :name: ci_runners_process_runner_version_update
   :worker_name: Ci::Runners::ProcessRunnerVersionUpdateWorker
-  :feature_category: :runner_fleet
+  :feature_category: :fleet_visibility
   :has_external_dependencies: false
   :urgency: :low
   :resource_boundary: :unknown
diff --git a/app/workers/ci/runners/process_runner_version_update_worker.rb b/app/workers/ci/runners/process_runner_version_update_worker.rb
index f1ad0c8563e193ebc48f12bd5955dcf5d6056716..acb1aac78a4dfcbeb2850c03f96c62b1b7f9e9f9 100644
--- a/app/workers/ci/runners/process_runner_version_update_worker.rb
+++ b/app/workers/ci/runners/process_runner_version_update_worker.rb
@@ -7,7 +7,7 @@ class ProcessRunnerVersionUpdateWorker
 
       data_consistency :always
 
-      feature_category :runner_fleet
+      feature_category :fleet_visibility
       urgency :low
 
       idempotent!
diff --git a/app/workers/ci/runners/reconcile_existing_runner_versions_cron_worker.rb b/app/workers/ci/runners/reconcile_existing_runner_versions_cron_worker.rb
index 722c513a4bb8c1dd681145cf12e0afa9a102665b..7bcfed1580fa7894d27eb2410847c1b7db31d184 100644
--- a/app/workers/ci/runners/reconcile_existing_runner_versions_cron_worker.rb
+++ b/app/workers/ci/runners/reconcile_existing_runner_versions_cron_worker.rb
@@ -9,7 +9,7 @@ class ReconcileExistingRunnerVersionsCronWorker
       include CronjobQueue # rubocop:disable Scalability/CronWorkerContext
 
       data_consistency :sticky
-      feature_category :runner_fleet
+      feature_category :fleet_visibility
       urgency :low
 
       deduplicate :until_executed
diff --git a/app/workers/ci/runners/stale_machines_cleanup_cron_worker.rb b/app/workers/ci/runners/stale_machines_cleanup_cron_worker.rb
index 9407e7c0e0a72e4e21a49517adaf4cad44ce1c56..9831e3e98b71fe90cc57964e37266ca3f4c5ee00 100644
--- a/app/workers/ci/runners/stale_machines_cleanup_cron_worker.rb
+++ b/app/workers/ci/runners/stale_machines_cleanup_cron_worker.rb
@@ -9,7 +9,7 @@ class StaleMachinesCleanupCronWorker
       include CronjobQueue # rubocop:disable Scalability/CronWorkerContext
 
       data_consistency :sticky
-      feature_category :runner_fleet
+      feature_category :fleet_visibility
       urgency :low
 
       idempotent!
diff --git a/config/feature_categories.yml b/config/feature_categories.yml
index 3eaf8b2b34d4a609d788459ef0902820e89eae70..c5ad97c9eb5c2cd3d86ca9e4c4b410b73f3d2484 100644
--- a/config/feature_categories.yml
+++ b/config/feature_categories.yml
@@ -24,7 +24,6 @@
 - build_artifacts
 - capacity_planning
 - cell
-- ci-cd_visibility
 - cloud_connector
 - cloud_native_installation
 - code_quality
@@ -61,6 +60,7 @@
 - error_tracking
 - feature_flags
 - five_minute_production_app
+- fleet_visibility
 - fulfillment_admin_tooling
 - fulfillment_infrastructure
 - fuzz_testing
@@ -109,7 +109,6 @@
 - requirements_management
 - review_apps
 - runner
-- runner_fleet
 - runner_saas
 - saas_provisioning
 - sbom
diff --git a/db/docs/ci_runner_machines.yml b/db/docs/ci_runner_machines.yml
index c7395907814df0c421814e5534aeff3ea47a865a..cf9e0480fe092160dff8c691f13ecdbc1dc1b0be 100644
--- a/db/docs/ci_runner_machines.yml
+++ b/db/docs/ci_runner_machines.yml
@@ -3,7 +3,7 @@ table_name: ci_runner_machines
 classes:
 - Ci::RunnerManager
 feature_categories:
-- runner_fleet
+- fleet_visibility
 description: Information about runner managers associated to Ci::Runner models
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107801
 milestone: '15.8'
diff --git a/db/docs/ci_runner_versions.yml b/db/docs/ci_runner_versions.yml
index cb983222a6e9b931a381377b79dd9b9c20e27ff1..aa8b5f24b46ecc5ca4ec3023952b8c5c15142095 100644
--- a/db/docs/ci_runner_versions.yml
+++ b/db/docs/ci_runner_versions.yml
@@ -3,7 +3,7 @@ table_name: ci_runner_versions
 classes:
 - Ci::RunnerVersion
 feature_categories:
-- runner_fleet
+- fleet_visibility
 description: Information about used Ci::Runner versions
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90982
 milestone: '15.2'
diff --git a/db/docs/ci_runners.yml b/db/docs/ci_runners.yml
index 5930adf70625f0631a5569504b945edf32db45cd..33bd6ae402f55e3fc6ffbf6d3e3afb9836bc4c75 100644
--- a/db/docs/ci_runners.yml
+++ b/db/docs/ci_runners.yml
@@ -4,7 +4,7 @@ classes:
 - Ci::Runner
 feature_categories:
 - runner
-- runner_fleet
+- fleet_visibility
 - runner_saas
 description: Registered CI runners
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/046b28312704f3131e72dcd2dbdacc5264d4aa62
diff --git a/db/docs/namespace_ci_cd_settings.yml b/db/docs/namespace_ci_cd_settings.yml
index ddfa390694c0676b41771bd3886a131af844fd78..71668b132ebe22511f6db72bb9a0f08933fe4e20 100644
--- a/db/docs/namespace_ci_cd_settings.yml
+++ b/db/docs/namespace_ci_cd_settings.yml
@@ -4,7 +4,7 @@ classes:
 - NamespaceCiCdSetting
 feature_categories:
 - continuous_integration
-- runner_fleet
+- fleet_visibility
 description: Namespace-scoped settings related to the CI/CD domain
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86477
 milestone: '15.0'
diff --git a/db/docs/p_ci_finished_build_ch_sync_events.yml b/db/docs/p_ci_finished_build_ch_sync_events.yml
index 09938f99b16702049a4a888a6a2d77daad04a6a5..c8875fd3e8b997f4cccac5c0e4460a8433429149 100644
--- a/db/docs/p_ci_finished_build_ch_sync_events.yml
+++ b/db/docs/p_ci_finished_build_ch_sync_events.yml
@@ -3,7 +3,7 @@ table_name: p_ci_finished_build_ch_sync_events
 classes:
 - Ci::FinishedBuildChSyncEvent
 feature_categories:
-- runner_fleet
+- fleet_visibility
 description: Holds references to finished CI builds ready to be synced to ClickHouse
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/
 milestone: '16.5'
diff --git a/db/docs/p_ci_runner_machine_builds.yml b/db/docs/p_ci_runner_machine_builds.yml
index 55d09963acc2733f32aa89dae814d13df6d40099..3f3b8373ac5aa9413537929de7f908dc2075a3cd 100644
--- a/db/docs/p_ci_runner_machine_builds.yml
+++ b/db/docs/p_ci_runner_machine_builds.yml
@@ -2,7 +2,7 @@ table_name: p_ci_runner_machine_builds
 classes:
 - Ci::RunnerManagerBuild
 feature_categories:
-- runner_fleet
+- fleet_visibility
 description: Relationships between builds and runner managers
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111476
 milestone: '15.9'
diff --git a/db/docs/project_ci_cd_settings.yml b/db/docs/project_ci_cd_settings.yml
index 0f7f59dbb15e1a2a8d3567728569455fdff71cec..a0643aff4b905773eb19868b21bd405005829ecb 100644
--- a/db/docs/project_ci_cd_settings.yml
+++ b/db/docs/project_ci_cd_settings.yml
@@ -5,7 +5,7 @@ classes:
 feature_categories:
 - continuous_integration
 - continuous_delivery
-- runner_fleet
+- fleet_visibility
 description: Project-scoped settings related to the CI/CD domain
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/392c411bdc16386ef42c86afaf8c4d8e4cddb955
 milestone: '10.8'
diff --git a/ee/app/workers/all_queues.yml b/ee/app/workers/all_queues.yml
index a3483cc61577465876f59c90d7ddcf8a4272427e..f1a69d51b8ab0795eb9b23d4decc702490b6d1bc 100644
--- a/ee/app/workers/all_queues.yml
+++ b/ee/app/workers/all_queues.yml
@@ -113,7 +113,7 @@
   :tags: []
 - :name: cronjob:ci_runners_stale_group_runners_prune_cron
   :worker_name: Ci::Runners::StaleGroupRunnersPruneCronWorker
-  :feature_category: :runner_fleet
+  :feature_category: :fleet_visibility
   :has_external_dependencies: false
   :urgency: :low
   :resource_boundary: :unknown
@@ -122,7 +122,7 @@
   :tags: []
 - :name: cronjob:click_house_ci_finished_builds_sync_cron
   :worker_name: ClickHouse::CiFinishedBuildsSyncCronWorker
-  :feature_category: :runner_fleet
+  :feature_category: :fleet_visibility
   :has_external_dependencies: false
   :urgency: :low
   :resource_boundary: :unknown
@@ -1202,7 +1202,7 @@
   :tags: []
 - :name: click_house_ci_finished_builds_sync
   :worker_name: ClickHouse::CiFinishedBuildsSyncWorker
-  :feature_category: :runner_fleet
+  :feature_category: :fleet_visibility
   :has_external_dependencies: false
   :urgency: :throttled
   :resource_boundary: :unknown
diff --git a/ee/app/workers/ci/runners/stale_group_runners_prune_cron_worker.rb b/ee/app/workers/ci/runners/stale_group_runners_prune_cron_worker.rb
index 694c4e52cdeaf27d9b20c971465397b5456401ef..1c9d9bc9d2d9be16c62dca9783a4339419783523 100644
--- a/ee/app/workers/ci/runners/stale_group_runners_prune_cron_worker.rb
+++ b/ee/app/workers/ci/runners/stale_group_runners_prune_cron_worker.rb
@@ -11,7 +11,7 @@ class StaleGroupRunnersPruneCronWorker
       include CronjobQueue
 
       data_consistency :sticky
-      feature_category :runner_fleet
+      feature_category :fleet_visibility
       urgency :low
 
       idempotent!
diff --git a/ee/app/workers/click_house/ci_finished_builds_sync_cron_worker.rb b/ee/app/workers/click_house/ci_finished_builds_sync_cron_worker.rb
index 46fcda0fc880361f9f76f870cf0abfe92b7606bc..48e25254ca4caac677d2e3206076abb02698179d 100644
--- a/ee/app/workers/click_house/ci_finished_builds_sync_cron_worker.rb
+++ b/ee/app/workers/click_house/ci_finished_builds_sync_cron_worker.rb
@@ -9,7 +9,7 @@ class CiFinishedBuildsSyncCronWorker
     idempotent!
     queue_namespace :cronjob
     data_consistency :delayed
-    feature_category :runner_fleet
+    feature_category :fleet_visibility
     loggable_arguments 1
 
     def perform(*args)
diff --git a/ee/app/workers/click_house/ci_finished_builds_sync_worker.rb b/ee/app/workers/click_house/ci_finished_builds_sync_worker.rb
index 2461a63e21a5edbafea3d846699e2f43bbbd9af8..a0c8f9e76a5147dcb56ecb8817430b1285c20107 100644
--- a/ee/app/workers/click_house/ci_finished_builds_sync_worker.rb
+++ b/ee/app/workers/click_house/ci_finished_builds_sync_worker.rb
@@ -7,7 +7,7 @@ class CiFinishedBuildsSyncWorker
     idempotent!
     data_consistency :delayed
     urgency :throttled
-    feature_category :runner_fleet
+    feature_category :fleet_visibility
     loggable_arguments 1, 2
 
     def perform(worker_index = 0, total_workers = 1)
diff --git a/ee/spec/controllers/admin/runners_controller_spec.rb b/ee/spec/controllers/admin/runners_controller_spec.rb
index 0758a1e42b0acbc5528194ded7006cf239901f16..9eeed6301cf37ce77e46c616716a835a90387be7 100644
--- a/ee/spec/controllers/admin/runners_controller_spec.rb
+++ b/ee/spec/controllers/admin/runners_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Admin::RunnersController, feature_category: :runner_fleet do
+RSpec.describe Admin::RunnersController, feature_category: :fleet_visibility do
   let_it_be(:runner) { create(:ci_runner) }
   let_it_be(:admin) { create(:admin) }
 
diff --git a/ee/spec/controllers/groups/runners_controller_spec.rb b/ee/spec/controllers/groups/runners_controller_spec.rb
index e1e563adbe990d8fcb03fb8bc8359332c2b9bd91..056fe83805b00caeedd1b755f769b0122275b7ca 100644
--- a/ee/spec/controllers/groups/runners_controller_spec.rb
+++ b/ee/spec/controllers/groups/runners_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Groups::RunnersController, feature_category: :runner_fleet do
+RSpec.describe Groups::RunnersController, feature_category: :fleet_visibility do
   let_it_be(:group) { create(:group) }
   let_it_be(:owner) { create(:user) }
 
diff --git a/ee/spec/controllers/projects/runners_controller_spec.rb b/ee/spec/controllers/projects/runners_controller_spec.rb
index 53d070975e913b4a944daf636fbaa71e4ec3a353..fdbdec78b55727d119f6728105c1b3f38e947b96 100644
--- a/ee/spec/controllers/projects/runners_controller_spec.rb
+++ b/ee/spec/controllers/projects/runners_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Projects::RunnersController, :saas, feature_category: :runner_fleet do
+RSpec.describe Projects::RunnersController, :saas, feature_category: :fleet_visibility do
   let_it_be(:user) { create(:user) }
   let_it_be(:namespace) { create(:namespace) }
 
diff --git a/ee/spec/features/admin/admin_runners_spec.rb b/ee/spec/features/admin/admin_runners_spec.rb
index 477627e2422e44a01c79787be3fb8bcf1870f85a..bf5ba4278140ace63f0611c6f220897f17430aa8 100644
--- a/ee/spec/features/admin/admin_runners_spec.rb
+++ b/ee/spec/features/admin/admin_runners_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe "Admin Runners", feature_category: :runner_fleet do
+RSpec.describe "Admin Runners", feature_category: :fleet_visibility do
   include RunnerReleasesHelper
   include Features::RunnersHelpers
 
diff --git a/ee/spec/features/ci_shared_runner_settings_spec.rb b/ee/spec/features/ci_shared_runner_settings_spec.rb
index e887b7be3abaec615f0307c995fca3a4a2652482..8f2cb9dc58da6982f1b8748f6db31a731699ea17 100644
--- a/ee/spec/features/ci_shared_runner_settings_spec.rb
+++ b/ee/spec/features/ci_shared_runner_settings_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'CI shared runner settings', feature_category: :runner_fleet do
+RSpec.describe 'CI shared runner settings', feature_category: :fleet_visibility do
   include StubENV
 
   let(:admin) { create(:admin) }
diff --git a/ee/spec/finders/ee/ci/jobs_finder_spec.rb b/ee/spec/finders/ee/ci/jobs_finder_spec.rb
index c4d0307c5f352b2bcdf45e90e561fd2c5a108d7d..3385376fc1e22a944116c146739a7ae35aa72b08 100644
--- a/ee/spec/finders/ee/ci/jobs_finder_spec.rb
+++ b/ee/spec/finders/ee/ci/jobs_finder_spec.rb
@@ -41,7 +41,7 @@
         end
 
         context 'with param `failure_reason` set to :runner_system_failure', :clean_gitlab_redis_shared_state,
-          feature_category: :runner_fleet do
+          feature_category: :fleet_visibility do
           let(:params) { { failure_reason: :runner_system_failure } }
 
           context 'without runner_performance_insights license' do
@@ -110,7 +110,7 @@
         end
 
         context 'with param `failure_reason` not set to :runner_system_failure', :clean_gitlab_redis_shared_state,
-          feature_category: :runner_fleet do
+          feature_category: :fleet_visibility do
           let(:params) { { failure_reason: :runner_unsupported } }
 
           context 'with runner_performance_insights license' do
diff --git a/ee/spec/finders/ee/ci/runners_finder_spec.rb b/ee/spec/finders/ee/ci/runners_finder_spec.rb
index 1265ea26efd757c2820bfa6a32db263664e39bb3..cf688bf2eca93d6d4e04094a850953ebff5a600f 100644
--- a/ee/spec/finders/ee/ci/runners_finder_spec.rb
+++ b/ee/spec/finders/ee/ci/runners_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::RunnersFinder, feature_category: :runner_fleet do
+RSpec.describe Ci::RunnersFinder, feature_category: :fleet_visibility do
   describe '#execute' do
     subject(:execute) do
       described_class.new(current_user: user, params: params).execute
diff --git a/ee/spec/frontend/fixtures/runner.rb b/ee/spec/frontend/fixtures/runner.rb
index 3c2051cdbc34a096ed76620c049535fe083679ea..783f143ac9a4fc492648765ddb438d61f7e8c125 100644
--- a/ee/spec/frontend/fixtures/runner.rb
+++ b/ee/spec/frontend/fixtures/runner.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'Runner EE (JavaScript fixtures)', feature_category: :runner_fleet do
+RSpec.describe 'Runner EE (JavaScript fixtures)', feature_category: :fleet_visibility do
   include StubVersion
   include AdminModeHelper
   include ApiHelpers
diff --git a/ee/spec/graphql/ee/mutations/ci/runner/update_spec.rb b/ee/spec/graphql/ee/mutations/ci/runner/update_spec.rb
index f88e01c4718caa274b25bf83b4063d314b1b7045..fc99e79d2cd736e573f6d673349d91e762f38cb8 100644
--- a/ee/spec/graphql/ee/mutations/ci/runner/update_spec.rb
+++ b/ee/spec/graphql/ee/mutations/ci/runner/update_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Mutations::Ci::Runner::Update, feature_category: :runner_fleet do
+RSpec.describe Mutations::Ci::Runner::Update, feature_category: :fleet_visibility do
   include GraphqlHelpers
 
   describe '#resolve' do
diff --git a/ee/spec/graphql/resolvers/ci/runners_jobs_statistics_resolver_spec.rb b/ee/spec/graphql/resolvers/ci/runners_jobs_statistics_resolver_spec.rb
index 6d9e73f22ec22ac99ceaa0aa85b428b5345bf5fb..ce59c25a60eb8738e68a8d854277037f41a8c8dc 100644
--- a/ee/spec/graphql/resolvers/ci/runners_jobs_statistics_resolver_spec.rb
+++ b/ee/spec/graphql/resolvers/ci/runners_jobs_statistics_resolver_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Resolvers::Ci::RunnersJobsStatisticsResolver, feature_category: :runner_fleet do
+RSpec.describe Resolvers::Ci::RunnersJobsStatisticsResolver, feature_category: :fleet_visibility do
   include GraphqlHelpers
 
   let_it_be(:project) { create(:project) }
diff --git a/ee/spec/graphql/types/ci/runner_countable_connection_type_spec.rb b/ee/spec/graphql/types/ci/runner_countable_connection_type_spec.rb
index c992307abde1026b94f0a08995cf9d3587551c29..9025eff6b60e6b650a8b306be647ab4f112ac8ed 100644
--- a/ee/spec/graphql/types/ci/runner_countable_connection_type_spec.rb
+++ b/ee/spec/graphql/types/ci/runner_countable_connection_type_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Types::Ci::RunnerCountableConnectionType, feature_category: :runner_fleet do
+RSpec.describe Types::Ci::RunnerCountableConnectionType, feature_category: :fleet_visibility do
   it 'includes the ee specific fields' do
     expected_fields = %w[jobs_statistics]
 
diff --git a/ee/spec/graphql/types/ci/runner_manager_type_spec.rb b/ee/spec/graphql/types/ci/runner_manager_type_spec.rb
index 58d176e86dd3032dd81f23b10381157cbc1f3648..3f42b7a980628d99b08b2935aeebd436501426e7 100644
--- a/ee/spec/graphql/types/ci/runner_manager_type_spec.rb
+++ b/ee/spec/graphql/types/ci/runner_manager_type_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe GitlabSchema.types['CiRunnerManager'], feature_category: :runner_fleet do
+RSpec.describe GitlabSchema.types['CiRunnerManager'], feature_category: :fleet_visibility do
   it { expect(described_class.graphql_name).to eq('CiRunnerManager') }
 
   it 'includes the ee specific fields' do
diff --git a/ee/spec/helpers/ee/ci/runners_helper_spec.rb b/ee/spec/helpers/ee/ci/runners_helper_spec.rb
index 2d45ab04252cb35241af9209a796945512feafdc..5a1d39e4439649f5c361ba91e933d96a08fca14a 100644
--- a/ee/spec/helpers/ee/ci/runners_helper_spec.rb
+++ b/ee/spec/helpers/ee/ci/runners_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-RSpec.describe EE::Ci::RunnersHelper, feature_category: :runner_fleet do
+RSpec.describe EE::Ci::RunnersHelper, feature_category: :fleet_visibility do
   let_it_be(:user, refind: true) { create(:user) }
   let_it_be(:namespace) { create(:namespace, owner: user) }
   let_it_be(:project) { create(:project, namespace: namespace) }
diff --git a/ee/spec/models/ci/build_spec.rb b/ee/spec/models/ci/build_spec.rb
index 5fce23af024ff39e0efd753c84febce628acb5de..426c64502b30ba6a277d6aea2faf8a95a0df6118 100644
--- a/ee/spec/models/ci/build_spec.rb
+++ b/ee/spec/models/ci/build_spec.rb
@@ -670,7 +670,7 @@
     end
   end
 
-  describe '.recently_failed_on_instance_runner', :clean_gitlab_redis_shared_state, feature_category: :runner_fleet do
+  describe '.recently_failed_on_instance_runner', :clean_gitlab_redis_shared_state, feature_category: :fleet_visibility do
     subject(:recently_failed_on_instance_runner) do
       described_class.recently_failed_on_instance_runner(failure_reason)
     end
diff --git a/ee/spec/models/ci/finished_build_ch_sync_event_spec.rb b/ee/spec/models/ci/finished_build_ch_sync_event_spec.rb
index ea7e7ab2305ba3c9128f76ab3bf5630a37786681..0a5d58a3fe63ee3dd178ed40479ae0d9ec82e53a 100644
--- a/ee/spec/models/ci/finished_build_ch_sync_event_spec.rb
+++ b/ee/spec/models/ci/finished_build_ch_sync_event_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::FinishedBuildChSyncEvent, type: :model, feature_category: :runner_fleet do
+RSpec.describe Ci::FinishedBuildChSyncEvent, type: :model, feature_category: :fleet_visibility do
   describe 'validations' do
     subject(:event) { described_class.create!(build_id: 1, build_finished_at: 2.hours.ago) }
 
diff --git a/ee/spec/models/ci/instance_runner_failed_jobs_spec.rb b/ee/spec/models/ci/instance_runner_failed_jobs_spec.rb
index 9434bb26ca56bda4301b60d5164532d318534dff..d24776ff42d75a1f7b27a3ebff8f00acfce4ba13 100644
--- a/ee/spec/models/ci/instance_runner_failed_jobs_spec.rb
+++ b/ee/spec/models/ci/instance_runner_failed_jobs_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe Ci::InstanceRunnerFailedJobs, :freeze_time, :clean_gitlab_redis_shared_state,
-  feature_category: :runner_fleet do
+  feature_category: :fleet_visibility do
   before do
     stub_licensed_features(runner_performance_insights: runner_performance_insights)
   end
diff --git a/ee/spec/requests/api/graphql/ci/jobs_spec.rb b/ee/spec/requests/api/graphql/ci/jobs_spec.rb
index 4f30cf0159d772de5844ea15b533569027cde5e1..a9443bbf4e637f403cbf69e7b7ad21dfa0779e09 100644
--- a/ee/spec/requests/api/graphql/ci/jobs_spec.rb
+++ b/ee/spec/requests/api/graphql/ci/jobs_spec.rb
@@ -33,7 +33,7 @@
   context 'when current user is an admin' do
     let_it_be(:current_user) { create(:admin) }
 
-    context "with argument `failure_reason`", feature_category: :runner_fleet do
+    context "with argument `failure_reason`", feature_category: :fleet_visibility do
       let(:query_jobs_args) do
         graphql_args(failure_reason: failure_reason)
       end
diff --git a/ee/spec/requests/api/graphql/ci/queueing_history_spec.rb b/ee/spec/requests/api/graphql/ci/queueing_history_spec.rb
index 468bd112839354b9b7a8394a6bc7090f5fec5f72..dbfe86dcd12e6ea4ce9f904495e8edc277803143 100644
--- a/ee/spec/requests/api/graphql/ci/queueing_history_spec.rb
+++ b/ee/spec/requests/api/graphql/ci/queueing_history_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'Query.ciQueueingHistory', :click_house, feature_category: :runner_fleet do
+RSpec.describe 'Query.ciQueueingHistory', :click_house, feature_category: :fleet_visibility do
   include GraphqlHelpers
   include RunnerReleasesHelper
   include ClickHouseHelpers
diff --git a/ee/spec/requests/api/graphql/ci/runner_spec.rb b/ee/spec/requests/api/graphql/ci/runner_spec.rb
index 660ae4a1cfa2b7281eaec9b095e4b41b104e944d..bead072be190ca611eec4b9bd4b13dcc51beebb2 100644
--- a/ee/spec/requests/api/graphql/ci/runner_spec.rb
+++ b/ee/spec/requests/api/graphql/ci/runner_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'Query.runner(id)', feature_category: :runner_fleet do
+RSpec.describe 'Query.runner(id)', feature_category: :fleet_visibility do
   include GraphqlHelpers
   include RunnerReleasesHelper
 
diff --git a/ee/spec/requests/api/graphql/ci/runners_spec.rb b/ee/spec/requests/api/graphql/ci/runners_spec.rb
index 2074be072cfab97f5b20450ee8db44d763b91aa8..40c06f3ae95a0da2cf8ca565071516fc34e88560 100644
--- a/ee/spec/requests/api/graphql/ci/runners_spec.rb
+++ b/ee/spec/requests/api/graphql/ci/runners_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-RSpec.describe 'Query.runners', feature_category: :runner_fleet do
+RSpec.describe 'Query.runners', feature_category: :fleet_visibility do
   include GraphqlHelpers
   include RunnerReleasesHelper
 
diff --git a/ee/spec/services/audit_events/runners_token_audit_event_service_spec.rb b/ee/spec/services/audit_events/runners_token_audit_event_service_spec.rb
index e8a2548d67189e380dc15c6b9f87f8d5b4eb5018..aa21d62da9179d8ddcc3232bce6d60cbaa000a73 100644
--- a/ee/spec/services/audit_events/runners_token_audit_event_service_spec.rb
+++ b/ee/spec/services/audit_events/runners_token_audit_event_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe AuditEvents::RunnersTokenAuditEventService, feature_category: :runner_fleet do
+RSpec.describe AuditEvents::RunnersTokenAuditEventService, feature_category: :fleet_visibility do
   describe '#security_event' do
     let(:logger) { instance_double(Gitlab::AuditJsonLogger) }
 
diff --git a/ee/spec/services/ci/collect_queueing_history_service_spec.rb b/ee/spec/services/ci/collect_queueing_history_service_spec.rb
index ef7745edb8af773f3f26ce14302d1f6d404a3176..b32af21f7bc5d663b1c3a6b7205101b46dece07a 100644
--- a/ee/spec/services/ci/collect_queueing_history_service_spec.rb
+++ b/ee/spec/services/ci/collect_queueing_history_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe ::Ci::CollectQueueingHistoryService, :click_house, :enable_admin_mode, feature_category: :runner_fleet do
+RSpec.describe ::Ci::CollectQueueingHistoryService, :click_house, :enable_admin_mode, feature_category: :fleet_visibility do
   include ClickHouseHelpers
 
   let_it_be(:project) { create(:project) }
diff --git a/ee/spec/services/ci/create_pipeline_service/runnable_builds_spec.rb b/ee/spec/services/ci/create_pipeline_service/runnable_builds_spec.rb
index f64be99ab0c201e3d78ed026ec6a449f671804cc..27ec5b8f57d4bcd48c6033fc29c036a7dc7b2487 100644
--- a/ee/spec/services/ci/create_pipeline_service/runnable_builds_spec.rb
+++ b/ee/spec/services/ci/create_pipeline_service/runnable_builds_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::CreatePipelineService, :sidekiq_inline, feature_category: :runner_fleet do
+RSpec.describe Ci::CreatePipelineService, :sidekiq_inline, feature_category: :fleet_visibility do
   let_it_be(:namespace) { create(:namespace, :with_used_build_minutes_limit) }
   let_it_be(:project) { create(:project, :repository, namespace: namespace) }
   let_it_be(:user) { project.first_owner }
diff --git a/ee/spec/services/ci/runners/assign_runner_service_spec.rb b/ee/spec/services/ci/runners/assign_runner_service_spec.rb
index 64670d61c3bf64172d25eee2b03fd36bdae556b2..2abbda8d5e80a338db675d8c46164064dc52bc11 100644
--- a/ee/spec/services/ci/runners/assign_runner_service_spec.rb
+++ b/ee/spec/services/ci/runners/assign_runner_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe ::Ci::Runners::AssignRunnerService, '#execute', feature_category: :runner_fleet do
+RSpec.describe ::Ci::Runners::AssignRunnerService, '#execute', feature_category: :fleet_visibility do
   let_it_be(:owner_project) { create(:project) }
   let_it_be(:new_project) { create(:project) }
   let_it_be(:project_runner) { create(:ci_runner, :project, projects: [owner_project]) }
diff --git a/ee/spec/services/ci/runners/register_runner_service_spec.rb b/ee/spec/services/ci/runners/register_runner_service_spec.rb
index 0c22144b8d4ec0080dbcdb2cac5926105d956aa7..806fc5c1b33ee6e44f661dba5e346362f76e8d6f 100644
--- a/ee/spec/services/ci/runners/register_runner_service_spec.rb
+++ b/ee/spec/services/ci/runners/register_runner_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe ::Ci::Runners::RegisterRunnerService, '#execute', feature_category: :runner_fleet do
+RSpec.describe ::Ci::Runners::RegisterRunnerService, '#execute', feature_category: :fleet_visibility do
   let(:registration_token) { 'abcdefg123456' }
   let(:token) {}
   let(:audit_service) { instance_double(::AuditEvents::RegisterRunnerAuditEventService) }
diff --git a/ee/spec/services/ci/runners/reset_registration_token_service_spec.rb b/ee/spec/services/ci/runners/reset_registration_token_service_spec.rb
index 86c7aca8daf7638f6bace21e7443886ecb887796..3c95255fdc51f8d94bcf17b7f2c38e1f9fa85e56 100644
--- a/ee/spec/services/ci/runners/reset_registration_token_service_spec.rb
+++ b/ee/spec/services/ci/runners/reset_registration_token_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe ::Ci::Runners::ResetRegistrationTokenService, '#execute', feature_category: :runner_fleet do
+RSpec.describe ::Ci::Runners::ResetRegistrationTokenService, '#execute', feature_category: :fleet_visibility do
   subject(:execute) { described_class.new(scope, current_user).execute }
 
   let_it_be(:user) { build(:user) }
diff --git a/ee/spec/services/ci/runners/set_runner_associated_projects_service_spec.rb b/ee/spec/services/ci/runners/set_runner_associated_projects_service_spec.rb
index 9dbdf46fd4fd7ab115a146ba534d590c1b04329b..289ced3ff6994565c4f6243874571978f0a2e901 100644
--- a/ee/spec/services/ci/runners/set_runner_associated_projects_service_spec.rb
+++ b/ee/spec/services/ci/runners/set_runner_associated_projects_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe ::Ci::Runners::SetRunnerAssociatedProjectsService, '#execute', feature_category: :runner_fleet do
+RSpec.describe ::Ci::Runners::SetRunnerAssociatedProjectsService, '#execute', feature_category: :fleet_visibility do
   subject(:execute) do
     described_class.new(runner: project_runner, current_user: user, project_ids: [new_project.id]).execute
   end
diff --git a/ee/spec/services/ci/runners/stale_group_runners_prune_service_spec.rb b/ee/spec/services/ci/runners/stale_group_runners_prune_service_spec.rb
index 27876126d1612ce3ff003a1c0f303970c054fa64..73585b7d598c67dd02edae7d6af4a240acc4e4b5 100644
--- a/ee/spec/services/ci/runners/stale_group_runners_prune_service_spec.rb
+++ b/ee/spec/services/ci/runners/stale_group_runners_prune_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::Runners::StaleGroupRunnersPruneService, feature_category: :runner_fleet do
+RSpec.describe Ci::Runners::StaleGroupRunnersPruneService, feature_category: :fleet_visibility do
   let(:service) { described_class.new }
 
   subject(:execute) { service.execute(NamespaceCiCdSetting.allowing_stale_runner_pruning.select(:namespace_id)) }
diff --git a/ee/spec/services/ci/runners/unassign_runner_service_spec.rb b/ee/spec/services/ci/runners/unassign_runner_service_spec.rb
index 444a3fb166ae19d3e7c1c92cbe165f0afadeb083..e84c73224eb4709a72e7b2a37b4ceee7c735c173 100644
--- a/ee/spec/services/ci/runners/unassign_runner_service_spec.rb
+++ b/ee/spec/services/ci/runners/unassign_runner_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe ::Ci::Runners::UnassignRunnerService, '#execute', feature_category: :runner_fleet do
+RSpec.describe ::Ci::Runners::UnassignRunnerService, '#execute', feature_category: :fleet_visibility do
   let_it_be(:owner_project) { create(:project) }
   let_it_be(:other_project) { create(:project) }
   let_it_be(:project_runner) { create(:ci_runner, :project, projects: [owner_project, other_project]) }
diff --git a/ee/spec/services/ci/runners/unregister_runner_service_spec.rb b/ee/spec/services/ci/runners/unregister_runner_service_spec.rb
index da377c23ba1224d1dc2be3bea874a7de48c643ef..f27d34dbd557ae9d0638fee1805c875465ae1947 100644
--- a/ee/spec/services/ci/runners/unregister_runner_service_spec.rb
+++ b/ee/spec/services/ci/runners/unregister_runner_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe ::Ci::Runners::UnregisterRunnerService, '#execute', feature_category: :runner_fleet do
+RSpec.describe ::Ci::Runners::UnregisterRunnerService, '#execute', feature_category: :fleet_visibility do
   let(:audit_service) { instance_double(::AuditEvents::UnregisterRunnerAuditEventService) }
   let(:current_user) { nil }
   let(:token) { 'abc123' }
diff --git a/ee/spec/services/click_house/data_ingestion/ci_finished_builds_sync_service_spec.rb b/ee/spec/services/click_house/data_ingestion/ci_finished_builds_sync_service_spec.rb
index 20e247afbcff9967f9448614ab95e74f2d560ff8..93b7253658c4bba93c2d415a346f996aea699932 100644
--- a/ee/spec/services/click_house/data_ingestion/ci_finished_builds_sync_service_spec.rb
+++ b/ee/spec/services/click_house/data_ingestion/ci_finished_builds_sync_service_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe ClickHouse::DataIngestion::CiFinishedBuildsSyncService,
-  :click_house, feature_category: :runner_fleet do
+  :click_house, feature_category: :fleet_visibility do
   subject(:execute) { service.execute }
 
   let(:service) { described_class.new }
diff --git a/ee/spec/workers/ci/runners/stale_group_runners_prune_cron_worker_spec.rb b/ee/spec/workers/ci/runners/stale_group_runners_prune_cron_worker_spec.rb
index 70980cb630285f278e3983acd1f94fa798cf70ef..2c2852cd71a6ba96ffdc8a3cdc159d3f7a8befca 100644
--- a/ee/spec/workers/ci/runners/stale_group_runners_prune_cron_worker_spec.rb
+++ b/ee/spec/workers/ci/runners/stale_group_runners_prune_cron_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::Runners::StaleGroupRunnersPruneCronWorker, feature_category: :runner_fleet do
+RSpec.describe Ci::Runners::StaleGroupRunnersPruneCronWorker, feature_category: :fleet_visibility do
   let(:worker) { described_class.new }
 
   describe '#perform' do
diff --git a/ee/spec/workers/click_house/ci_finished_builds_sync_cron_worker_spec.rb b/ee/spec/workers/click_house/ci_finished_builds_sync_cron_worker_spec.rb
index 3592e7c5968fe4c69b63cfb3b2cec2d2a9fd1258..69b0c70c7a1c7690ca32d9bab9ca2df265c2d642 100644
--- a/ee/spec/workers/click_house/ci_finished_builds_sync_cron_worker_spec.rb
+++ b/ee/spec/workers/click_house/ci_finished_builds_sync_cron_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe ClickHouse::CiFinishedBuildsSyncCronWorker, :click_house, :freeze_time, feature_category: :runner_fleet do
+RSpec.describe ClickHouse::CiFinishedBuildsSyncCronWorker, :click_house, :freeze_time, feature_category: :fleet_visibility do
   let(:worker) { described_class.new }
 
   subject(:perform) { worker.perform(*args) }
diff --git a/ee/spec/workers/click_house/ci_finished_builds_sync_worker_spec.rb b/ee/spec/workers/click_house/ci_finished_builds_sync_worker_spec.rb
index adb498a3aa3eec1555873f10aa0786e670829ceb..9843b284297aea924d488332d34b0c6dc2190376 100644
--- a/ee/spec/workers/click_house/ci_finished_builds_sync_worker_spec.rb
+++ b/ee/spec/workers/click_house/ci_finished_builds_sync_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe ClickHouse::CiFinishedBuildsSyncWorker, :click_house, :freeze_time, feature_category: :runner_fleet do
+RSpec.describe ClickHouse::CiFinishedBuildsSyncWorker, :click_house, :freeze_time, feature_category: :fleet_visibility do
   let(:worker) { described_class.new }
 
   let_it_be(:build1) { create(:ci_build, :success) }
diff --git a/ee/spec/workers/ee/ci/build_finished_worker_spec.rb b/ee/spec/workers/ee/ci/build_finished_worker_spec.rb
index 8ecd691168f54ffc309d700315a9f0140db0c762..1c7c2555da6fae619e0295baef1e8dc52375fa6d 100644
--- a/ee/spec/workers/ee/ci/build_finished_worker_spec.rb
+++ b/ee/spec/workers/ee/ci/build_finished_worker_spec.rb
@@ -160,7 +160,7 @@ def project_stats
       perform
     end
 
-    context 'when job failed', feature_category: :runner_fleet do
+    context 'when job failed', feature_category: :fleet_visibility do
       let(:build) { create(:ee_ci_build, :sast, :failed, runner: ci_runner) }
 
       it 'tracks job on InstanceRunnerFailedJobs' do
diff --git a/lib/api/ci/runner.rb b/lib/api/ci/runner.rb
index 25ac1780a368b8110461a2cd0decc88dd8865fc9..585e9f962a3ff9b6e4934a11be5922a9b910e17e 100644
--- a/lib/api/ci/runner.rb
+++ b/lib/api/ci/runner.rb
@@ -93,7 +93,7 @@ class Runner < ::API::Base
           requires :token, type: String, desc: %q(The runner's authentication token)
           requires :system_id, type: String, desc: %q(The runner's system identifier.)
         end
-        delete '/managers', urgency: :low, feature_category: :runner_fleet do
+        delete '/managers', urgency: :low, feature_category: :fleet_visibility do
           authenticate_runner!(ensure_runner_manager: false)
 
           destroy_conditionally!(current_runner) do
diff --git a/lib/api/user_runners.rb b/lib/api/user_runners.rb
index edbd0214bb81187d965f76f18c00c274c81fa377..381a1a5aab4c44ab838bdfedb70f7f992c4c70d9 100644
--- a/lib/api/user_runners.rb
+++ b/lib/api/user_runners.rb
@@ -45,7 +45,7 @@ class UserRunners < ::API::Base
         optional :maximum_timeout, type: Integer,
           desc: 'Maximum timeout that limits the amount of time (in seconds) that runners can run jobs'
       end
-      post 'runners', urgency: :low, feature_category: :runner_fleet do
+      post 'runners', urgency: :low, feature_category: :fleet_visibility do
         attributes = attributes_for_keys(
           %i[runner_type group_id project_id description maintenance_note paused locked run_untagged tag_list
             access_level maximum_timeout]
diff --git a/lib/gitlab/background_migration/fix_allow_descendants_override_disabled_shared_runners.rb b/lib/gitlab/background_migration/fix_allow_descendants_override_disabled_shared_runners.rb
index 44bda3fe2b6be972455a9a645fe47c39d285a212..618944e1653c1ab35a1bdce86b8ed226e9f6bae7 100644
--- a/lib/gitlab/background_migration/fix_allow_descendants_override_disabled_shared_runners.rb
+++ b/lib/gitlab/background_migration/fix_allow_descendants_override_disabled_shared_runners.rb
@@ -7,7 +7,7 @@ module BackgroundMigration
     # This combination fails validation and doesn't make sense:
     # we always allow descendants to disable shared runners
     class FixAllowDescendantsOverrideDisabledSharedRunners < BatchedMigrationJob
-      feature_category :runner_fleet
+      feature_category :fleet_visibility
       operation_name :fix_allow_descendants_override_disabled_shared_runners
 
       def perform
diff --git a/spec/controllers/admin/runner_projects_controller_spec.rb b/spec/controllers/admin/runner_projects_controller_spec.rb
index 06a73984ac0d99e390b5fdaf5e7a3e4f7d88bf26..5cfa1287e3b578b4d9a19dcddc993605b109a044 100644
--- a/spec/controllers/admin/runner_projects_controller_spec.rb
+++ b/spec/controllers/admin/runner_projects_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Admin::RunnerProjectsController, feature_category: :runner_fleet do
+RSpec.describe Admin::RunnerProjectsController, feature_category: :fleet_visibility do
   let_it_be(:group) { create(:group) }
   let_it_be(:project) { create(:project, group: group) }
 
diff --git a/spec/controllers/admin/runners_controller_spec.rb b/spec/controllers/admin/runners_controller_spec.rb
index 5f98004e9cf666e3d61135e66923f1067df4818e..d88fe41a8699cce95d89c3579efbaff1827d5d13 100644
--- a/spec/controllers/admin/runners_controller_spec.rb
+++ b/spec/controllers/admin/runners_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Admin::RunnersController, feature_category: :runner_fleet do
+RSpec.describe Admin::RunnersController, feature_category: :fleet_visibility do
   let_it_be(:runner) { create(:ci_runner) }
   let_it_be(:user) { create(:admin) }
 
diff --git a/spec/controllers/groups/runners_controller_spec.rb b/spec/controllers/groups/runners_controller_spec.rb
index d48e9ff0d51f3fb265437c57c1596a5c0a418c14..e732281a406e6180a14c97e012faea7b9099da11 100644
--- a/spec/controllers/groups/runners_controller_spec.rb
+++ b/spec/controllers/groups/runners_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Groups::RunnersController, feature_category: :runner_fleet do
+RSpec.describe Groups::RunnersController, feature_category: :fleet_visibility do
   let_it_be(:user) { create(:user) }
   let_it_be(:namespace_settings) { create(:namespace_settings, runner_registration_enabled: true) }
   let_it_be(:group) { create(:group, namespace_settings: namespace_settings) }
diff --git a/spec/controllers/projects/runner_projects_controller_spec.rb b/spec/controllers/projects/runner_projects_controller_spec.rb
index beedaad0fa9e3f0a6bc81cdaba3d2347a6bc42db..42ceeb32f51ca458cabc32bf5ea444958c41a9b9 100644
--- a/spec/controllers/projects/runner_projects_controller_spec.rb
+++ b/spec/controllers/projects/runner_projects_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Projects::RunnerProjectsController, feature_category: :runner_fleet do
+RSpec.describe Projects::RunnerProjectsController, feature_category: :fleet_visibility do
   let_it_be(:user) { create(:user) }
   let_it_be(:group) { create(:group) }
   let_it_be(:project) { create(:project, group: group) }
diff --git a/spec/controllers/projects/runners_controller_spec.rb b/spec/controllers/projects/runners_controller_spec.rb
index 3602a2df9599190b6afb44c47aada049e1e10ce8..35cfe09332334f5be7444691212a2136cc056ffa 100644
--- a/spec/controllers/projects/runners_controller_spec.rb
+++ b/spec/controllers/projects/runners_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Projects::RunnersController, feature_category: :runner_fleet do
+RSpec.describe Projects::RunnersController, feature_category: :fleet_visibility do
   let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project) }
   let_it_be(:runner) { create(:ci_runner, :project, projects: [project]) }
diff --git a/spec/features/admin/admin_runners_spec.rb b/spec/features/admin/admin_runners_spec.rb
index d4e25d413dd516944f1921e241d74ac085bfefc2..dad9a08fce1d1bd4e7056f0a6176fbee54c31a00 100644
--- a/spec/features/admin/admin_runners_spec.rb
+++ b/spec/features/admin/admin_runners_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe "Admin Runners", feature_category: :runner_fleet do
+RSpec.describe "Admin Runners", feature_category: :fleet_visibility do
   include Features::SortingHelpers
   include Features::RunnersHelpers
   include Spec::Support::Helpers::ModalHelpers
diff --git a/spec/features/groups/group_runners_spec.rb b/spec/features/groups/group_runners_spec.rb
index 4e5d7c6f8e86685fb26419c745dc9f25fc35d278..36f469a4d2ebc788c2dd704f20232c8e9dc3a777 100644
--- a/spec/features/groups/group_runners_spec.rb
+++ b/spec/features/groups/group_runners_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe "Group Runners", feature_category: :runner_fleet do
+RSpec.describe "Group Runners", feature_category: :fleet_visibility do
   include Features::RunnersHelpers
   include Spec::Support::Helpers::ModalHelpers
 
diff --git a/spec/features/runners_spec.rb b/spec/features/runners_spec.rb
index 091c318459be6462611c98304dbada0767eda8a6..e7047610180c95b07a383388aa47e6f9d52a3587 100644
--- a/spec/features/runners_spec.rb
+++ b/spec/features/runners_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'Runners', feature_category: :runner_fleet do
+RSpec.describe 'Runners', feature_category: :fleet_visibility do
   let_it_be(:user) { create(:user) }
 
   before do
diff --git a/spec/finders/ci/runners_finder_spec.rb b/spec/finders/ci/runners_finder_spec.rb
index 7f680f50297bdb8911fcae882a64d9c31993ff21..fbe44244dba5525b730fe7b956e9a4e0b55fcfd0 100644
--- a/spec/finders/ci/runners_finder_spec.rb
+++ b/spec/finders/ci/runners_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::RunnersFinder, feature_category: :runner_fleet do
+RSpec.describe Ci::RunnersFinder, feature_category: :fleet_visibility do
   context 'admin' do
     let_it_be(:admin) { create(:user, :admin) }
 
diff --git a/spec/frontend/fixtures/runner.rb b/spec/frontend/fixtures/runner.rb
index a73a0dcbdd10f670ec4600b8703ab6f9b1f2e729..3b03a03cb96c1098be03952d9f67569d0130fa0f 100644
--- a/spec/frontend/fixtures/runner.rb
+++ b/spec/frontend/fixtures/runner.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'Runner (JavaScript fixtures)', feature_category: :runner_fleet do
+RSpec.describe 'Runner (JavaScript fixtures)', feature_category: :fleet_visibility do
   include AdminModeHelper
   include ApiHelpers
   include JavaScriptFixturesHelpers
diff --git a/spec/graphql/mutations/ci/runner/bulk_delete_spec.rb b/spec/graphql/mutations/ci/runner/bulk_delete_spec.rb
index aaa74fa78aa566a294cd17073c56e06ee22230f0..0dcfaa9b8ac051374992f359ed825b9f26ebeb33 100644
--- a/spec/graphql/mutations/ci/runner/bulk_delete_spec.rb
+++ b/spec/graphql/mutations/ci/runner/bulk_delete_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Mutations::Ci::Runner::BulkDelete, feature_category: :runner_fleet do
+RSpec.describe Mutations::Ci::Runner::BulkDelete, feature_category: :fleet_visibility do
   include GraphqlHelpers
 
   let_it_be(:admin_user) { create(:user, :admin) }
diff --git a/spec/graphql/mutations/ci/runner/delete_spec.rb b/spec/graphql/mutations/ci/runner/delete_spec.rb
index beff18e1dfd1c5897ac8d64b4d48715b562c3719..3617c75116590f8da87cc40daccb35f1be95d48e 100644
--- a/spec/graphql/mutations/ci/runner/delete_spec.rb
+++ b/spec/graphql/mutations/ci/runner/delete_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Mutations::Ci::Runner::Delete, feature_category: :runner_fleet do
+RSpec.describe Mutations::Ci::Runner::Delete, feature_category: :fleet_visibility do
   include GraphqlHelpers
 
   let_it_be(:runner) { create(:ci_runner) }
diff --git a/spec/graphql/mutations/ci/runner/update_spec.rb b/spec/graphql/mutations/ci/runner/update_spec.rb
index 03bfd4d738bbac64f4dfe541d3cb60d92e28556f..32c4e6952e44c311de813618b0e3a75ec1282883 100644
--- a/spec/graphql/mutations/ci/runner/update_spec.rb
+++ b/spec/graphql/mutations/ci/runner/update_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Mutations::Ci::Runner::Update, feature_category: :runner_fleet do
+RSpec.describe Mutations::Ci::Runner::Update, feature_category: :fleet_visibility do
   include GraphqlHelpers
 
   let_it_be(:user) { create(:user) }
diff --git a/spec/graphql/resolvers/ci/group_runners_resolver_spec.rb b/spec/graphql/resolvers/ci/group_runners_resolver_spec.rb
index e0fc3b96b930b17994607c524aba9141788c4347..d1eec0baeeaf39c24525c62447ed6edbcb186829 100644
--- a/spec/graphql/resolvers/ci/group_runners_resolver_spec.rb
+++ b/spec/graphql/resolvers/ci/group_runners_resolver_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Resolvers::Ci::GroupRunnersResolver, feature_category: :runner_fleet do
+RSpec.describe Resolvers::Ci::GroupRunnersResolver, feature_category: :fleet_visibility do
   include GraphqlHelpers
 
   describe '#resolve' do
diff --git a/spec/graphql/resolvers/ci/project_runners_resolver_spec.rb b/spec/graphql/resolvers/ci/project_runners_resolver_spec.rb
index 9d9f0fee04a5845f24a82989ac7e317004dd7a48..85b55521174486263ce832d57d009c1961bde03c 100644
--- a/spec/graphql/resolvers/ci/project_runners_resolver_spec.rb
+++ b/spec/graphql/resolvers/ci/project_runners_resolver_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Resolvers::Ci::ProjectRunnersResolver, feature_category: :runner_fleet do
+RSpec.describe Resolvers::Ci::ProjectRunnersResolver, feature_category: :fleet_visibility do
   include GraphqlHelpers
 
   describe '#resolve' do
diff --git a/spec/graphql/resolvers/ci/runner_groups_resolver_spec.rb b/spec/graphql/resolvers/ci/runner_groups_resolver_spec.rb
index 9272689ef0b4ecd21050262db9cb939598c76a28..f535f6e415d43e059393dcbe80547609e3f94db1 100644
--- a/spec/graphql/resolvers/ci/runner_groups_resolver_spec.rb
+++ b/spec/graphql/resolvers/ci/runner_groups_resolver_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Resolvers::Ci::RunnerGroupsResolver, feature_category: :runner_fleet do
+RSpec.describe Resolvers::Ci::RunnerGroupsResolver, feature_category: :fleet_visibility do
   include GraphqlHelpers
 
   let_it_be(:group1) { create(:group) }
diff --git a/spec/graphql/resolvers/ci/runner_job_count_resolver_spec.rb b/spec/graphql/resolvers/ci/runner_job_count_resolver_spec.rb
index 6336ea883f79ee6c5b898668b79c687bcb9e7af5..18501d4add59bcdf584e6e7fcd9a07ea47e31206 100644
--- a/spec/graphql/resolvers/ci/runner_job_count_resolver_spec.rb
+++ b/spec/graphql/resolvers/ci/runner_job_count_resolver_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Resolvers::Ci::RunnerJobCountResolver, feature_category: :runner_fleet do
+RSpec.describe Resolvers::Ci::RunnerJobCountResolver, feature_category: :fleet_visibility do
   include GraphqlHelpers
 
   let_it_be(:project) { create(:project, :repository) }
diff --git a/spec/graphql/resolvers/ci/runner_jobs_resolver_spec.rb b/spec/graphql/resolvers/ci/runner_jobs_resolver_spec.rb
index 322bead0d3c2fcea50215324403b085f5be54cd7..4af87b6882fc7c5747f5485a3f114beaba14b83f 100644
--- a/spec/graphql/resolvers/ci/runner_jobs_resolver_spec.rb
+++ b/spec/graphql/resolvers/ci/runner_jobs_resolver_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Resolvers::Ci::RunnerJobsResolver, feature_category: :runner_fleet do
+RSpec.describe Resolvers::Ci::RunnerJobsResolver, feature_category: :fleet_visibility do
   include GraphqlHelpers
 
   let_it_be(:project) { create(:project, :repository) }
diff --git a/spec/graphql/resolvers/ci/runner_platforms_resolver_spec.rb b/spec/graphql/resolvers/ci/runner_platforms_resolver_spec.rb
index da6a84cec4493e39148b6d90d23f8effdfc55601..e6238c41445fdd01db5a1b86e8f18ae7f1eb16a0 100644
--- a/spec/graphql/resolvers/ci/runner_platforms_resolver_spec.rb
+++ b/spec/graphql/resolvers/ci/runner_platforms_resolver_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Resolvers::Ci::RunnerPlatformsResolver, feature_category: :runner_fleet do
+RSpec.describe Resolvers::Ci::RunnerPlatformsResolver, feature_category: :fleet_visibility do
   include GraphqlHelpers
 
   describe '#resolve' do
diff --git a/spec/graphql/resolvers/ci/runner_projects_resolver_spec.rb b/spec/graphql/resolvers/ci/runner_projects_resolver_spec.rb
index 44203fb29120a65545ab10167b3d2f65355846c1..c75d7fb831c8285a591e2917b42e81fd5870d231 100644
--- a/spec/graphql/resolvers/ci/runner_projects_resolver_spec.rb
+++ b/spec/graphql/resolvers/ci/runner_projects_resolver_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Resolvers::Ci::RunnerProjectsResolver, feature_category: :runner_fleet do
+RSpec.describe Resolvers::Ci::RunnerProjectsResolver, feature_category: :fleet_visibility do
   include GraphqlHelpers
 
   let_it_be(:project1) { create(:project, description: 'Project1.1') }
diff --git a/spec/graphql/resolvers/ci/runner_setup_resolver_spec.rb b/spec/graphql/resolvers/ci/runner_setup_resolver_spec.rb
index 734337f7c923b04fee744c93df1856572b743b90..1724623e5c472c83d9097c8b0fe6020cff8dc6cb 100644
--- a/spec/graphql/resolvers/ci/runner_setup_resolver_spec.rb
+++ b/spec/graphql/resolvers/ci/runner_setup_resolver_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Resolvers::Ci::RunnerSetupResolver, feature_category: :runner_fleet do
+RSpec.describe Resolvers::Ci::RunnerSetupResolver, feature_category: :fleet_visibility do
   include GraphqlHelpers
 
   describe '#resolve' do
diff --git a/spec/graphql/resolvers/ci/runner_status_resolver_spec.rb b/spec/graphql/resolvers/ci/runner_status_resolver_spec.rb
index 97a10a7da33c5064bd17d8c88aeb4a8d1e9ebf65..d541bbddfe53741dcfb0ca297c7d69abb6dcca38 100644
--- a/spec/graphql/resolvers/ci/runner_status_resolver_spec.rb
+++ b/spec/graphql/resolvers/ci/runner_status_resolver_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Resolvers::Ci::RunnerStatusResolver, feature_category: :runner_fleet do
+RSpec.describe Resolvers::Ci::RunnerStatusResolver, feature_category: :fleet_visibility do
   include GraphqlHelpers
 
   describe '#resolve' do
diff --git a/spec/graphql/resolvers/ci/runners_resolver_spec.rb b/spec/graphql/resolvers/ci/runners_resolver_spec.rb
index 7d37d13366ce57e69c4a78a2a8bcd2b4b5b41608..85a90924384b6a4ff5e17dabcc643dc2da65757a 100644
--- a/spec/graphql/resolvers/ci/runners_resolver_spec.rb
+++ b/spec/graphql/resolvers/ci/runners_resolver_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Resolvers::Ci::RunnersResolver, feature_category: :runner_fleet do
+RSpec.describe Resolvers::Ci::RunnersResolver, feature_category: :fleet_visibility do
   include GraphqlHelpers
 
   describe '#resolve' do
diff --git a/spec/graphql/types/ci/job_base_field_spec.rb b/spec/graphql/types/ci/job_base_field_spec.rb
index ec7d2a7d33a2aa2e94fc139bc0bef421dd0f6628..c2bf73526d2e4d1b06560a7485e1add2c01362a4 100644
--- a/spec/graphql/types/ci/job_base_field_spec.rb
+++ b/spec/graphql/types/ci/job_base_field_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Types::Ci::JobBaseField, feature_category: :runner_fleet do
+RSpec.describe Types::Ci::JobBaseField, feature_category: :fleet_visibility do
   describe 'authorized?' do
     let_it_be(:current_user) { create(:user) }
 
diff --git a/spec/graphql/types/ci/runner_countable_connection_type_spec.rb b/spec/graphql/types/ci/runner_countable_connection_type_spec.rb
index 49254ed0f93da73c033aac6ab3fd2d4f3da10f97..9f24909e110b99d1dcefa46112274b369e715446 100644
--- a/spec/graphql/types/ci/runner_countable_connection_type_spec.rb
+++ b/spec/graphql/types/ci/runner_countable_connection_type_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Types::Ci::RunnerCountableConnectionType, feature_category: :runner_fleet do
+RSpec.describe Types::Ci::RunnerCountableConnectionType, feature_category: :fleet_visibility do
   it 'contains attributes related to a runner connection' do
     expected_fields = %w[count]
 
diff --git a/spec/graphql/types/ci/runner_manager_type_spec.rb b/spec/graphql/types/ci/runner_manager_type_spec.rb
index ff7297b0a0e6c6468215afbd64db1e2308450b4f..ce55d6fee0347c02a8a1d4abe2c7f712d265660e 100644
--- a/spec/graphql/types/ci/runner_manager_type_spec.rb
+++ b/spec/graphql/types/ci/runner_manager_type_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe GitlabSchema.types['CiRunnerManager'], feature_category: :runner_fleet do
+RSpec.describe GitlabSchema.types['CiRunnerManager'], feature_category: :fleet_visibility do
   specify { expect(described_class.graphql_name).to eq('CiRunnerManager') }
 
   specify { expect(described_class).to require_graphql_authorizations(:read_runner_manager) }
diff --git a/spec/graphql/types/ci/runner_platform_type_spec.rb b/spec/graphql/types/ci/runner_platform_type_spec.rb
index 1b0f5a5ec716bae1f21a340494d6b16ad45f4bb7..f4acfc1f8caaca7df5773fc43335aa19240bdf04 100644
--- a/spec/graphql/types/ci/runner_platform_type_spec.rb
+++ b/spec/graphql/types/ci/runner_platform_type_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Types::Ci::RunnerPlatformType, feature_category: :runner_fleet do
+RSpec.describe Types::Ci::RunnerPlatformType, feature_category: :fleet_visibility do
   specify { expect(described_class.graphql_name).to eq('RunnerPlatform') }
 
   it 'exposes the expected fields' do
diff --git a/spec/graphql/types/ci/runner_setup_type_spec.rb b/spec/graphql/types/ci/runner_setup_type_spec.rb
index d3e47b52a805b317dfccdf69bb0993b394363741..66469a35a9462a6033e08c3574e4c3467652099a 100644
--- a/spec/graphql/types/ci/runner_setup_type_spec.rb
+++ b/spec/graphql/types/ci/runner_setup_type_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Types::Ci::RunnerSetupType, feature_category: :runner_fleet do
+RSpec.describe Types::Ci::RunnerSetupType, feature_category: :fleet_visibility do
   specify { expect(described_class.graphql_name).to eq('RunnerSetup') }
 
   it 'exposes the expected fields' do
diff --git a/spec/graphql/types/ci/runner_upgrade_status_enum_spec.rb b/spec/graphql/types/ci/runner_upgrade_status_enum_spec.rb
index 4aa9ad094a6b8bf0269a9664824e3d9077b562a2..3f6a867de39ef65cbfa5d0d0adb45781f4f5d357 100644
--- a/spec/graphql/types/ci/runner_upgrade_status_enum_spec.rb
+++ b/spec/graphql/types/ci/runner_upgrade_status_enum_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Types::Ci::RunnerUpgradeStatusEnum, feature_category: :runner_fleet do
+RSpec.describe Types::Ci::RunnerUpgradeStatusEnum, feature_category: :fleet_visibility do
   let(:model_only_enum_values) { %w[not_processed] }
   let(:expected_graphql_source_values) do
     Ci::RunnerVersion.statuses.keys - model_only_enum_values
diff --git a/spec/graphql/types/ci/runner_web_url_edge_spec.rb b/spec/graphql/types/ci/runner_web_url_edge_spec.rb
index 07a9655b3e16fe9bb23d442e3c48edaa2693c077..fc4e54283603f6efe63f2a2efa3b2cee28be043d 100644
--- a/spec/graphql/types/ci/runner_web_url_edge_spec.rb
+++ b/spec/graphql/types/ci/runner_web_url_edge_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Types::Ci::RunnerWebUrlEdge, feature_category: :runner_fleet do
+RSpec.describe Types::Ci::RunnerWebUrlEdge, feature_category: :fleet_visibility do
   specify { expect(described_class.graphql_name).to eq('RunnerWebUrlEdge') }
 
   it 'contains URL attributes' do
diff --git a/spec/helpers/ci/runners_helper_spec.rb b/spec/helpers/ci/runners_helper_spec.rb
index 12d92bc505f4120aee91405979e8490646088a9c..583bbba1b6d72a8c512beb0289667584233d8a09 100644
--- a/spec/helpers/ci/runners_helper_spec.rb
+++ b/spec/helpers/ci/runners_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::RunnersHelper, feature_category: :runner_fleet do
+RSpec.describe Ci::RunnersHelper, feature_category: :fleet_visibility do
   let_it_be(:user) { create(:user) }
 
   before do
diff --git a/spec/lib/api/ci/helpers/runner_spec.rb b/spec/lib/api/ci/helpers/runner_spec.rb
index b74f5bf2de8e0fa5c97dd0c13958ffc36fcd283f..ee0a58a4e5308262db03acfcd8e155e7556e8418 100644
--- a/spec/lib/api/ci/helpers/runner_spec.rb
+++ b/spec/lib/api/ci/helpers/runner_spec.rb
@@ -85,7 +85,7 @@
     end
   end
 
-  describe '#current_runner_manager', :freeze_time, feature_category: :runner_fleet do
+  describe '#current_runner_manager', :freeze_time, feature_category: :fleet_visibility do
     let(:runner) { create(:ci_runner, token: 'foo') }
     let(:runner_manager) { create(:ci_runner_machine, runner: runner, system_xid: 'bar', contacted_at: 1.hour.ago) }
 
diff --git a/spec/lib/gitlab/background_migration/fix_allow_descendants_override_disabled_shared_runners_spec.rb b/spec/lib/gitlab/background_migration/fix_allow_descendants_override_disabled_shared_runners_spec.rb
index 5f5dcb3583631f56c0a0cfa6ae7c52a59c845a44..cd99557e1d937fc87e857306b19ebc2e150ecb3b 100644
--- a/spec/lib/gitlab/background_migration/fix_allow_descendants_override_disabled_shared_runners_spec.rb
+++ b/spec/lib/gitlab/background_migration/fix_allow_descendants_override_disabled_shared_runners_spec.rb
@@ -2,7 +2,8 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::BackgroundMigration::FixAllowDescendantsOverrideDisabledSharedRunners, schema: 20230802085923, feature_category: :runner_fleet do # rubocop:disable Layout/LineLength
+RSpec.describe Gitlab::BackgroundMigration::FixAllowDescendantsOverrideDisabledSharedRunners, schema: 20230802085923,
+  feature_category: :fleet_visibility do
   let(:namespaces) { table(:namespaces) }
 
   let!(:valid_enabled) do
diff --git a/spec/lib/gitlab/ci/runner_instructions_spec.rb b/spec/lib/gitlab/ci/runner_instructions_spec.rb
index 31c53d4a030bf7f91bd1becc727c91b572601310..6da649393f326ebbb85f6a529d6154613486cc1a 100644
--- a/spec/lib/gitlab/ci/runner_instructions_spec.rb
+++ b/spec/lib/gitlab/ci/runner_instructions_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::Ci::RunnerInstructions, feature_category: :runner_fleet do
+RSpec.describe Gitlab::Ci::RunnerInstructions, feature_category: :fleet_visibility do
   using RSpec::Parameterized::TableSyntax
 
   let(:params) { {} }
diff --git a/spec/lib/gitlab/ci/runner_releases_spec.rb b/spec/lib/gitlab/ci/runner_releases_spec.rb
index 9e211327deee743da8a6d5be1a3389c606afb8b6..126a5b854710999a083ec4896cedfd616829bde3 100644
--- a/spec/lib/gitlab/ci/runner_releases_spec.rb
+++ b/spec/lib/gitlab/ci/runner_releases_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::Ci::RunnerReleases, feature_category: :runner_fleet do
+RSpec.describe Gitlab::Ci::RunnerReleases, feature_category: :fleet_visibility do
   subject { described_class.instance }
 
   let(:runner_releases_url) { 'http://testurl.com/runner_public_releases' }
diff --git a/spec/lib/gitlab/ci/runner_upgrade_check_spec.rb b/spec/lib/gitlab/ci/runner_upgrade_check_spec.rb
index 526d6cba657becab3088ec2fe502e5f94f65c237..778c0aa69de8b364a52cb139b0d88b147a7673f0 100644
--- a/spec/lib/gitlab/ci/runner_upgrade_check_spec.rb
+++ b/spec/lib/gitlab/ci/runner_upgrade_check_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::Ci::RunnerUpgradeCheck, feature_category: :runner_fleet do
+RSpec.describe Gitlab::Ci::RunnerUpgradeCheck, feature_category: :fleet_visibility do
   using RSpec::Parameterized::TableSyntax
 
   subject(:instance) { described_class.new(gitlab_version, runner_releases) }
diff --git a/spec/lib/gitlab/doctor/reset_tokens_spec.rb b/spec/lib/gitlab/doctor/reset_tokens_spec.rb
index 0cc947efdb4797f5fa5075507964865de9180450..b2155ee83ad7ed34b7d7dc52da1ef4adecdcd675 100644
--- a/spec/lib/gitlab/doctor/reset_tokens_spec.rb
+++ b/spec/lib/gitlab/doctor/reset_tokens_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::Doctor::ResetTokens, feature_category: :runner_fleet do
+RSpec.describe Gitlab::Doctor::ResetTokens, feature_category: :fleet_visibility do
   let(:logger) { instance_double('Logger') }
   let(:model_names) { %w[Project Group] }
   let(:token_names) { %w[runners_token] }
diff --git a/spec/lib/gitlab/seeders/ci/runner/runner_fleet_pipeline_seeder_spec.rb b/spec/lib/gitlab/seeders/ci/runner/runner_fleet_pipeline_seeder_spec.rb
index a15dbccc80c37c4e51abecac27ba2c98e3ed552c..930782dfadfe0bf73ceb754dbe6fbb2de2d07a90 100644
--- a/spec/lib/gitlab/seeders/ci/runner/runner_fleet_pipeline_seeder_spec.rb
+++ b/spec/lib/gitlab/seeders/ci/runner/runner_fleet_pipeline_seeder_spec.rb
@@ -5,7 +5,7 @@
 NULL_LOGGER = Gitlab::JsonLogger.new('/dev/null')
 TAG_LIST = Gitlab::Seeders::Ci::Runner::RunnerFleetSeeder::TAG_LIST.to_set
 
-RSpec.describe ::Gitlab::Seeders::Ci::Runner::RunnerFleetPipelineSeeder, feature_category: :runner_fleet do
+RSpec.describe ::Gitlab::Seeders::Ci::Runner::RunnerFleetPipelineSeeder, feature_category: :fleet_visibility do
   subject(:seeder) do
     described_class.new(NULL_LOGGER, projects_to_runners: projects_to_runners, job_count: job_count)
   end
diff --git a/spec/lib/gitlab/seeders/ci/runner/runner_fleet_seeder_spec.rb b/spec/lib/gitlab/seeders/ci/runner/runner_fleet_seeder_spec.rb
index 4597cc6b3152716163d1ce4ceadc7932bdb6029a..01cbce28159d0d35003fbb8fcee138f53dd06955 100644
--- a/spec/lib/gitlab/seeders/ci/runner/runner_fleet_seeder_spec.rb
+++ b/spec/lib/gitlab/seeders/ci/runner/runner_fleet_seeder_spec.rb
@@ -4,7 +4,7 @@
 
 NULL_LOGGER = Gitlab::JsonLogger.new('/dev/null')
 
-RSpec.describe ::Gitlab::Seeders::Ci::Runner::RunnerFleetSeeder, feature_category: :runner_fleet do
+RSpec.describe ::Gitlab::Seeders::Ci::Runner::RunnerFleetSeeder, feature_category: :fleet_visibility do
   let_it_be(:user) { create(:user, :admin, username: 'test-admin') }
 
   subject(:seeder) do
diff --git a/spec/migrations/20230802085923_queue_fix_allow_descendants_override_disabled_shared_runners_spec.rb b/spec/migrations/20230802085923_queue_fix_allow_descendants_override_disabled_shared_runners_spec.rb
index c296ba24d9d8f561b9133ea3336899b5c3dfc2bb..f12985bf6c90bb2d0f3ec01e23b744b8926ae3cd 100644
--- a/spec/migrations/20230802085923_queue_fix_allow_descendants_override_disabled_shared_runners_spec.rb
+++ b/spec/migrations/20230802085923_queue_fix_allow_descendants_override_disabled_shared_runners_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueFixAllowDescendantsOverrideDisabledSharedRunners, feature_category: :runner_fleet do
+RSpec.describe QueueFixAllowDescendantsOverrideDisabledSharedRunners, feature_category: :fleet_visibility do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
diff --git a/spec/models/ci/runner_manager_build_spec.rb b/spec/models/ci/runner_manager_build_spec.rb
index 3a381313b766d64adc7234ca582b299d80243040..a4dd3a2c74843be3f57e5d51e936a44194d8558f 100644
--- a/spec/models/ci/runner_manager_build_spec.rb
+++ b/spec/models/ci/runner_manager_build_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::RunnerManagerBuild, model: true, feature_category: :runner_fleet do
+RSpec.describe Ci::RunnerManagerBuild, model: true, feature_category: :fleet_visibility do
   let_it_be(:runner) { create(:ci_runner) }
   let_it_be(:runner_manager) { create(:ci_runner_machine, runner: runner) }
   let_it_be(:build) { create(:ci_build, runner_manager: runner_manager) }
diff --git a/spec/models/ci/runner_manager_spec.rb b/spec/models/ci/runner_manager_spec.rb
index 01275ffd31c6ef360cbbd991a51ca6e26dc7bf3d..02a72afe0c60c5b1190a9b79ec382720d6756bad 100644
--- a/spec/models/ci/runner_manager_spec.rb
+++ b/spec/models/ci/runner_manager_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::RunnerManager, feature_category: :runner_fleet, type: :model do
+RSpec.describe Ci::RunnerManager, feature_category: :fleet_visibility, type: :model do
   it_behaves_like 'having unique enum values'
 
   it_behaves_like 'it has loose foreign keys' do
diff --git a/spec/models/ci/runner_version_spec.rb b/spec/models/ci/runner_version_spec.rb
index bce1f2a6c398d084671366840f71ec6e74771b03..32f840a80340193cef0db5a05593faab455e33f7 100644
--- a/spec/models/ci/runner_version_spec.rb
+++ b/spec/models/ci/runner_version_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::RunnerVersion, feature_category: :runner_fleet do
+RSpec.describe Ci::RunnerVersion, feature_category: :fleet_visibility do
   let_it_be(:runner_version_upgrade_recommended) do
     create(:ci_runner_version, version: 'abc234', status: :recommended)
   end
diff --git a/spec/models/preloaders/runner_manager_policy_preloader_spec.rb b/spec/models/preloaders/runner_manager_policy_preloader_spec.rb
index 1977e2c57870a1ceb604a77855f7c63ca2fc6e70..b19502733805d3ceeb36f0f6b887cc258c402685 100644
--- a/spec/models/preloaders/runner_manager_policy_preloader_spec.rb
+++ b/spec/models/preloaders/runner_manager_policy_preloader_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Preloaders::RunnerManagerPolicyPreloader, feature_category: :runner_fleet do
+RSpec.describe Preloaders::RunnerManagerPolicyPreloader, feature_category: :fleet_visibility do
   let_it_be(:user) { create(:user) }
   let_it_be(:runner1) { create(:ci_runner) }
   let_it_be(:runner2) { create(:ci_runner) }
diff --git a/spec/policies/ci/runner_manager_policy_spec.rb b/spec/policies/ci/runner_manager_policy_spec.rb
index 11b0941024f39cc0a3cb62c821ed5fcce646d8d8..82894e729bf31ba831bc07e857e7bb21fe0884ee 100644
--- a/spec/policies/ci/runner_manager_policy_spec.rb
+++ b/spec/policies/ci/runner_manager_policy_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::RunnerManagerPolicy, feature_category: :runner_fleet do
+RSpec.describe Ci::RunnerManagerPolicy, feature_category: :fleet_visibility do
   let_it_be(:owner) { create(:user) }
 
   describe 'ability :read_runner_manager' do
diff --git a/spec/requests/api/ci/runner/runners_delete_spec.rb b/spec/requests/api/ci/runner/runners_delete_spec.rb
index d1488828bad784412db8fa2b336ec77c02e107b4..61420afd578d6d6d42136d62f2e0bbcf52b9f829 100644
--- a/spec/requests/api/ci/runner/runners_delete_spec.rb
+++ b/spec/requests/api/ci/runner/runners_delete_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe API::Ci::Runner, :clean_gitlab_redis_shared_state, feature_category: :runner_fleet do
+RSpec.describe API::Ci::Runner, :clean_gitlab_redis_shared_state, feature_category: :fleet_visibility do
   include StubGitlabCalls
   include RedisHelpers
   include WorkhorseHelpers
diff --git a/spec/requests/api/ci/runner/runners_post_spec.rb b/spec/requests/api/ci/runner/runners_post_spec.rb
index 1490172d1c39486405fbee15a699ce68fed8b818..748efe3cd54b7f5138372f763c258dbfd4e2e267 100644
--- a/spec/requests/api/ci/runner/runners_post_spec.rb
+++ b/spec/requests/api/ci/runner/runners_post_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe API::Ci::Runner, :clean_gitlab_redis_shared_state, feature_category: :runner_fleet do
+RSpec.describe API::Ci::Runner, :clean_gitlab_redis_shared_state, feature_category: :fleet_visibility do
   describe '/api/v4/runners' do
     describe 'POST /api/v4/runners' do
       it_behaves_like 'runner migrations backoff' do
diff --git a/spec/requests/api/ci/runner/runners_reset_spec.rb b/spec/requests/api/ci/runner/runners_reset_spec.rb
index 03cb6238fc10a0c653637ab54bf45f2602934439..92de1276dbb0b8e1ca9686ee785b3d05defbd6ad 100644
--- a/spec/requests/api/ci/runner/runners_reset_spec.rb
+++ b/spec/requests/api/ci/runner/runners_reset_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe API::Ci::Runner, :clean_gitlab_redis_shared_state, feature_category: :runner_fleet do
+RSpec.describe API::Ci::Runner, :clean_gitlab_redis_shared_state, feature_category: :fleet_visibility do
   include StubGitlabCalls
   include RedisHelpers
   include WorkhorseHelpers
diff --git a/spec/requests/api/ci/runners_reset_registration_token_spec.rb b/spec/requests/api/ci/runners_reset_registration_token_spec.rb
index 98edde93e950b96a80d863ff39a11afbfa088240..0b6a6abf419915e4b7f5c82afb0828107b73a83e 100644
--- a/spec/requests/api/ci/runners_reset_registration_token_spec.rb
+++ b/spec/requests/api/ci/runners_reset_registration_token_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe API::Ci::Runners, feature_category: :runner_fleet do
+RSpec.describe API::Ci::Runners, feature_category: :fleet_visibility do
   let_it_be(:admin_mode) { false }
 
   subject { post api("#{prefix}/runners/reset_registration_token", user, admin_mode: admin_mode) }
diff --git a/spec/requests/api/ci/runners_spec.rb b/spec/requests/api/ci/runners_spec.rb
index ba80684e89edfad95d2d137dc9723879e76e5b57..187880e16a450941c2d360290948fc0bf1aef452 100644
--- a/spec/requests/api/ci/runners_spec.rb
+++ b/spec/requests/api/ci/runners_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe API::Ci::Runners, :aggregate_failures, feature_category: :runner_fleet do
+RSpec.describe API::Ci::Runners, :aggregate_failures, feature_category: :fleet_visibility do
   let_it_be(:admin) { create(:user, :admin) }
   let_it_be(:user) { create(:user) }
   let_it_be(:user2) { create(:user) }
diff --git a/spec/requests/api/graphql/ci/runner_spec.rb b/spec/requests/api/graphql/ci/runner_spec.rb
index 6f1eb77fa9b91084da7e75e167bfd89981a24bf9..8262640b28339f6989f2dc1750663cb5ae9ab50f 100644
--- a/spec/requests/api/graphql/ci/runner_spec.rb
+++ b/spec/requests/api/graphql/ci/runner_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'Query.runner(id)', :freeze_time, feature_category: :runner_fleet do
+RSpec.describe 'Query.runner(id)', :freeze_time, feature_category: :fleet_visibility do
   include GraphqlHelpers
 
   using RSpec::Parameterized::TableSyntax
diff --git a/spec/requests/api/graphql/ci/runner_web_url_edge_spec.rb b/spec/requests/api/graphql/ci/runner_web_url_edge_spec.rb
index 76e2dda4ce2c61db768c8655aa018e69908231e7..8e3efb67ee50d8741c8a49bb50812f5b19a79f3d 100644
--- a/spec/requests/api/graphql/ci/runner_web_url_edge_spec.rb
+++ b/spec/requests/api/graphql/ci/runner_web_url_edge_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-RSpec.describe 'RunnerWebUrlEdge', feature_category: :runner_fleet do
+RSpec.describe 'RunnerWebUrlEdge', feature_category: :fleet_visibility do
   include GraphqlHelpers
 
   describe 'inside a Query.group' do
diff --git a/spec/requests/api/graphql/ci/runners_spec.rb b/spec/requests/api/graphql/ci/runners_spec.rb
index 9b45e16178a68fe3869b6a1cb18a3ab86b40ed67..0fe14bef7787de5064f61cbde93f082be7f0d53a 100644
--- a/spec/requests/api/graphql/ci/runners_spec.rb
+++ b/spec/requests/api/graphql/ci/runners_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-RSpec.describe 'Query.runners', feature_category: :runner_fleet do
+RSpec.describe 'Query.runners', feature_category: :fleet_visibility do
   include GraphqlHelpers
 
   let_it_be(:current_user) { create_default(:user, :admin) }
diff --git a/spec/requests/api/graphql/mutations/ci/runner/create_spec.rb b/spec/requests/api/graphql/mutations/ci/runner/create_spec.rb
index b697b9f73b7e910c15fd3cd3cc9e40bf1b463610..567ef12df2b61e5318642cc37aa807424637aaf3 100644
--- a/spec/requests/api/graphql/mutations/ci/runner/create_spec.rb
+++ b/spec/requests/api/graphql/mutations/ci/runner/create_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'RunnerCreate', feature_category: :runner_fleet do
+RSpec.describe 'RunnerCreate', feature_category: :fleet_visibility do
   include GraphqlHelpers
 
   let_it_be(:user) { create(:user) }
diff --git a/spec/requests/api/graphql/mutations/ci/runners_registration_token/reset_spec.rb b/spec/requests/api/graphql/mutations/ci/runners_registration_token/reset_spec.rb
index 752242c3ab33cca35095c874dd4c2471340a750c..ef752448966a7bb2671bb8a68e6ecd590cf51ae9 100644
--- a/spec/requests/api/graphql/mutations/ci/runners_registration_token/reset_spec.rb
+++ b/spec/requests/api/graphql/mutations/ci/runners_registration_token/reset_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'RunnersRegistrationTokenReset', feature_category: :runner_fleet do
+RSpec.describe 'RunnersRegistrationTokenReset', feature_category: :fleet_visibility do
   include GraphqlHelpers
 
   let(:mutation) { graphql_mutation(:runners_registration_token_reset, input) }
diff --git a/spec/requests/api/user_runners_spec.rb b/spec/requests/api/user_runners_spec.rb
index 0e40dcade194952cc5ee97b34df9b9e2d71eb62f..412b2c48f3fae491337f9798b526d58cc3ab6f50 100644
--- a/spec/requests/api/user_runners_spec.rb
+++ b/spec/requests/api/user_runners_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe API::UserRunners, :aggregate_failures, feature_category: :runner_fleet do
+RSpec.describe API::UserRunners, :aggregate_failures, feature_category: :fleet_visibility do
   let_it_be(:admin) { create(:admin) }
   let_it_be(:user, reload: true) { create(:user, username: 'user.withdot') }
 
diff --git a/spec/requests/runner_setup_controller_spec.rb b/spec/requests/runner_setup_controller_spec.rb
index 8d75b9e81b7bf89a28daa1896386f928060ced28..ae52bd71b3bdd8e7373a20b202a0768c4e552560 100644
--- a/spec/requests/runner_setup_controller_spec.rb
+++ b/spec/requests/runner_setup_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe RunnerSetupController, feature_category: :runner_fleet do
+RSpec.describe RunnerSetupController, feature_category: :fleet_visibility do
   let(:user) { create(:user) }
 
   before do
diff --git a/spec/services/ci/runners/assign_runner_service_spec.rb b/spec/services/ci/runners/assign_runner_service_spec.rb
index 00fbb5e2d26a14c97f182286d18da1a962c0f865..eb0b7478ad384d3027c8e82d459ed24fc463feeb 100644
--- a/spec/services/ci/runners/assign_runner_service_spec.rb
+++ b/spec/services/ci/runners/assign_runner_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe ::Ci::Runners::AssignRunnerService, '#execute', feature_category: :runner_fleet do
+RSpec.describe ::Ci::Runners::AssignRunnerService, '#execute', feature_category: :fleet_visibility do
   subject(:execute) { described_class.new(runner, new_project, user).execute }
 
   let_it_be(:owner_group) { create(:group) }
diff --git a/spec/services/ci/runners/bulk_delete_runners_service_spec.rb b/spec/services/ci/runners/bulk_delete_runners_service_spec.rb
index 5e69756597219fd633e4a4684d07fa6301d4f20a..b57cae00867a81bb69211dc9223ec178229c7273 100644
--- a/spec/services/ci/runners/bulk_delete_runners_service_spec.rb
+++ b/spec/services/ci/runners/bulk_delete_runners_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe ::Ci::Runners::BulkDeleteRunnersService, '#execute', feature_category: :runner_fleet do
+RSpec.describe ::Ci::Runners::BulkDeleteRunnersService, '#execute', feature_category: :fleet_visibility do
   subject(:execute) { described_class.new(**service_args).execute }
 
   let_it_be(:admin_user) { create(:user, :admin) }
diff --git a/spec/services/ci/runners/create_runner_service_spec.rb b/spec/services/ci/runners/create_runner_service_spec.rb
index db337b0b005f292d0323af63d4a1657ac9d5638d..eaba7b9e4db54e1656778ea9149a32536bb697c2 100644
--- a/spec/services/ci/runners/create_runner_service_spec.rb
+++ b/spec/services/ci/runners/create_runner_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe ::Ci::Runners::CreateRunnerService, "#execute", feature_category: :runner_fleet do
+RSpec.describe ::Ci::Runners::CreateRunnerService, "#execute", feature_category: :fleet_visibility do
   subject(:execute) { described_class.new(user: current_user, params: params).execute }
 
   let(:runner) { execute.payload[:runner] }
diff --git a/spec/services/ci/runners/process_runner_version_update_service_spec.rb b/spec/services/ci/runners/process_runner_version_update_service_spec.rb
index f8b7aa281af4dbf6c13e79bc07edcca9aefd0891..cc8df6579d48f6dc59ef630677789b82aa4267ca 100644
--- a/spec/services/ci/runners/process_runner_version_update_service_spec.rb
+++ b/spec/services/ci/runners/process_runner_version_update_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::Runners::ProcessRunnerVersionUpdateService, feature_category: :runner_fleet do
+RSpec.describe Ci::Runners::ProcessRunnerVersionUpdateService, feature_category: :fleet_visibility do
   subject(:service) { described_class.new(version) }
 
   let(:version) { '1.0.0' }
diff --git a/spec/services/ci/runners/reconcile_existing_runner_versions_service_spec.rb b/spec/services/ci/runners/reconcile_existing_runner_versions_service_spec.rb
index 8d7e97e5ea87d63b94a368d522083f063dc617cd..88f0a93059943f85eb07da9e6c33ad7751dcc53f 100644
--- a/spec/services/ci/runners/reconcile_existing_runner_versions_service_spec.rb
+++ b/spec/services/ci/runners/reconcile_existing_runner_versions_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe ::Ci::Runners::ReconcileExistingRunnerVersionsService, '#execute', feature_category: :runner_fleet do
+RSpec.describe ::Ci::Runners::ReconcileExistingRunnerVersionsService, '#execute', feature_category: :fleet_visibility do
   include RunnerReleasesHelper
 
   subject(:execute) { described_class.new.execute }
diff --git a/spec/services/ci/runners/register_runner_service_spec.rb b/spec/services/ci/runners/register_runner_service_spec.rb
index 4b997855657d366ef49ba0053b4a95c9f3243c2b..aabf30d975a7fc99331f18c7b34554499b3b9843 100644
--- a/spec/services/ci/runners/register_runner_service_spec.rb
+++ b/spec/services/ci/runners/register_runner_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe ::Ci::Runners::RegisterRunnerService, '#execute', feature_category: :runner_fleet do
+RSpec.describe ::Ci::Runners::RegisterRunnerService, '#execute', feature_category: :fleet_visibility do
   let(:registration_token) { 'abcdefg123456' }
   let(:token) {}
   let(:args) { {} }
diff --git a/spec/services/ci/runners/reset_registration_token_service_spec.rb b/spec/services/ci/runners/reset_registration_token_service_spec.rb
index c81152360342d40affa004c92fcf7409434ecb26..68faa9fa3875230ee67e757e5307da8e17f63e4d 100644
--- a/spec/services/ci/runners/reset_registration_token_service_spec.rb
+++ b/spec/services/ci/runners/reset_registration_token_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe ::Ci::Runners::ResetRegistrationTokenService, '#execute', feature_category: :runner_fleet do
+RSpec.describe ::Ci::Runners::ResetRegistrationTokenService, '#execute', feature_category: :fleet_visibility do
   subject(:execute) { described_class.new(scope, current_user).execute }
 
   let_it_be(:user) { build(:user) }
diff --git a/spec/services/ci/runners/set_runner_associated_projects_service_spec.rb b/spec/services/ci/runners/set_runner_associated_projects_service_spec.rb
index 8d612174a0b1462864e835229a8dce25278dd406..b617cb0a006071d3882639887ce21164a98e2ee4 100644
--- a/spec/services/ci/runners/set_runner_associated_projects_service_spec.rb
+++ b/spec/services/ci/runners/set_runner_associated_projects_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe ::Ci::Runners::SetRunnerAssociatedProjectsService, '#execute', feature_category: :runner_fleet do
+RSpec.describe ::Ci::Runners::SetRunnerAssociatedProjectsService, '#execute', feature_category: :fleet_visibility do
   subject(:execute) do
     described_class.new(runner: runner, current_user: user, project_ids: new_projects.map(&:id)).execute
   end
diff --git a/spec/services/ci/runners/stale_managers_cleanup_service_spec.rb b/spec/services/ci/runners/stale_managers_cleanup_service_spec.rb
index 0a20c12bc158513ac033f714ce8043709b94357a..4931f24d5d812b1253ca340e31cae72c0f9e94c0 100644
--- a/spec/services/ci/runners/stale_managers_cleanup_service_spec.rb
+++ b/spec/services/ci/runners/stale_managers_cleanup_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::Runners::StaleManagersCleanupService, feature_category: :runner_fleet do
+RSpec.describe Ci::Runners::StaleManagersCleanupService, feature_category: :fleet_visibility do
   let(:service) { described_class.new }
   let!(:runner_manager3) { create(:ci_runner_machine, created_at: 6.months.ago, contacted_at: Time.current) }
 
diff --git a/spec/services/ci/runners/unassign_runner_service_spec.rb b/spec/services/ci/runners/unassign_runner_service_spec.rb
index e91d4249473d21e0d59b75d5132b603317a7d2bb..99cf087cf7844a373bbe0d258ddc0d95fa576e27 100644
--- a/spec/services/ci/runners/unassign_runner_service_spec.rb
+++ b/spec/services/ci/runners/unassign_runner_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe ::Ci::Runners::UnassignRunnerService, '#execute', feature_category: :runner_fleet do
+RSpec.describe ::Ci::Runners::UnassignRunnerService, '#execute', feature_category: :fleet_visibility do
   let_it_be(:project) { create(:project) }
   let_it_be(:runner) { create(:ci_runner, :project, projects: [project]) }
 
diff --git a/spec/services/ci/runners/unregister_runner_manager_service_spec.rb b/spec/services/ci/runners/unregister_runner_manager_service_spec.rb
index 8bfda8e208320e8af0fa3aee92ff3b91032b8710..590df18469d0453dfdded35a34b5ca53ef2f56ca 100644
--- a/spec/services/ci/runners/unregister_runner_manager_service_spec.rb
+++ b/spec/services/ci/runners/unregister_runner_manager_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe ::Ci::Runners::UnregisterRunnerManagerService, '#execute', feature_category: :runner_fleet do
+RSpec.describe ::Ci::Runners::UnregisterRunnerManagerService, '#execute', feature_category: :fleet_visibility do
   subject(:execute) { described_class.new(runner, 'some_token', system_id: system_id).execute }
 
   context 'with runner registered with registration token' do
diff --git a/spec/services/ci/runners/unregister_runner_service_spec.rb b/spec/services/ci/runners/unregister_runner_service_spec.rb
index fb779e1a673d9778e0b605172825ccc547d96743..e73dcb2511ee4116cace08762ddf5a8195cfc699 100644
--- a/spec/services/ci/runners/unregister_runner_service_spec.rb
+++ b/spec/services/ci/runners/unregister_runner_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe ::Ci::Runners::UnregisterRunnerService, '#execute', feature_category: :runner_fleet do
+RSpec.describe ::Ci::Runners::UnregisterRunnerService, '#execute', feature_category: :fleet_visibility do
   subject(:execute) { described_class.new(runner, 'some_token').execute }
 
   let(:runner) { create(:ci_runner) }
diff --git a/spec/services/ci/runners/update_runner_service_spec.rb b/spec/services/ci/runners/update_runner_service_spec.rb
index 86875df70a2cc635672d70a9eab83c3a2c2184ce..9483d122c351d6b08e3c191b98ad7df13c8da722 100644
--- a/spec/services/ci/runners/update_runner_service_spec.rb
+++ b/spec/services/ci/runners/update_runner_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::Runners::UpdateRunnerService, '#execute', feature_category: :runner_fleet do
+RSpec.describe Ci::Runners::UpdateRunnerService, '#execute', feature_category: :fleet_visibility do
   subject(:execute) { described_class.new(runner).execute(params) }
 
   let(:runner) { create(:ci_runner) }
diff --git a/spec/services/ci/stuck_builds/drop_pending_service_spec.rb b/spec/services/ci/stuck_builds/drop_pending_service_spec.rb
index 9da6393005765ffd9dd46f12648d5b424c82bcd2..b3045d838a168bf2c02d6cd78c951a27ce371a6e 100644
--- a/spec/services/ci/stuck_builds/drop_pending_service_spec.rb
+++ b/spec/services/ci/stuck_builds/drop_pending_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::StuckBuilds::DropPendingService, feature_category: :runner_fleet do
+RSpec.describe Ci::StuckBuilds::DropPendingService, feature_category: :fleet_visibility do
   let_it_be(:runner) { create(:ci_runner) }
   let_it_be(:pipeline) { create(:ci_empty_pipeline) }
   let_it_be_with_reload(:job) do
diff --git a/spec/services/ci/stuck_builds/drop_running_service_spec.rb b/spec/services/ci/stuck_builds/drop_running_service_spec.rb
index c2f8a643f2467166bdda836e53451f8a50738b67..74b02240ea541703a3552e648e99884c774542fc 100644
--- a/spec/services/ci/stuck_builds/drop_running_service_spec.rb
+++ b/spec/services/ci/stuck_builds/drop_running_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::StuckBuilds::DropRunningService, feature_category: :runner_fleet do
+RSpec.describe Ci::StuckBuilds::DropRunningService, feature_category: :fleet_visibility do
   let!(:runner) { create :ci_runner }
   let!(:job) { create(:ci_build, runner: runner, created_at: created_at, updated_at: updated_at, status: status) }
 
diff --git a/spec/services/ci/stuck_builds/drop_scheduled_service_spec.rb b/spec/services/ci/stuck_builds/drop_scheduled_service_spec.rb
index 5560eaf9b40423670f86a0fc7a4bab9aff5282d1..5a95b55054fd8ff887b0c6d8aeeaa61be649673f 100644
--- a/spec/services/ci/stuck_builds/drop_scheduled_service_spec.rb
+++ b/spec/services/ci/stuck_builds/drop_scheduled_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::StuckBuilds::DropScheduledService, feature_category: :runner_fleet do
+RSpec.describe Ci::StuckBuilds::DropScheduledService, feature_category: :fleet_visibility do
   let_it_be(:runner) { create :ci_runner }
 
   let!(:job) { create :ci_build, :scheduled, scheduled_at: scheduled_at, runner: runner }
diff --git a/spec/tasks/gitlab/doctor/secrets_rake_spec.rb b/spec/tasks/gitlab/doctor/secrets_rake_spec.rb
index 91ef3c57d7312716d118c66347f84d8795ff9e07..123b8745d650bc88760b34fd1a2b201412210cc1 100644
--- a/spec/tasks/gitlab/doctor/secrets_rake_spec.rb
+++ b/spec/tasks/gitlab/doctor/secrets_rake_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'gitlab:doctor:reset_encrypted_tokens', :silence_stdout, feature_category: :runner_fleet do
+RSpec.describe 'gitlab:doctor:reset_encrypted_tokens', :silence_stdout, feature_category: :fleet_visibility do
   let(:model_names) { 'Project,Group' }
   let(:token_names) { 'runners_token' }
 
diff --git a/spec/tasks/gitlab/seed/runner_fleet_rake_spec.rb b/spec/tasks/gitlab/seed/runner_fleet_rake_spec.rb
index b8503e2bc1b4c5d43d2d9a7679774eeb72e94a5d..ae4e5425d0c65f54b01f0dc2c88180b7ec572a33 100644
--- a/spec/tasks/gitlab/seed/runner_fleet_rake_spec.rb
+++ b/spec/tasks/gitlab/seed/runner_fleet_rake_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'gitlab:seed:runner_fleet rake task', :silence_stdout, feature_category: :runner_fleet do
+RSpec.describe 'gitlab:seed:runner_fleet rake task', :silence_stdout, feature_category: :fleet_visibility do
   let(:registration_prefix) { 'rf-' }
   let(:runner_count) { 10 }
   let(:job_count) { 20 }
diff --git a/spec/views/shared/runners/_runner_details.html.haml_spec.rb b/spec/views/shared/runners/_runner_details.html.haml_spec.rb
index a597c719d8776d8acaa14bbb8ee29d1c6ee56c53..0612d157ff44d1d0c6e5b77acea09af39c6e89ae 100644
--- a/spec/views/shared/runners/_runner_details.html.haml_spec.rb
+++ b/spec/views/shared/runners/_runner_details.html.haml_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'shared/runners/_runner_details.html.haml', feature_category: :runner_fleet do
+RSpec.describe 'shared/runners/_runner_details.html.haml', feature_category: :fleet_visibility do
   include PageLayoutHelper
 
   let_it_be(:runner) do
diff --git a/spec/workers/ci/runners/process_runner_version_update_worker_spec.rb b/spec/workers/ci/runners/process_runner_version_update_worker_spec.rb
index 30b451f2112a7ea5ce8844d7a0d843eb6c8f57cd..64e2e8cd0375ccc1c215bb18e0db45ee6833e8cd 100644
--- a/spec/workers/ci/runners/process_runner_version_update_worker_spec.rb
+++ b/spec/workers/ci/runners/process_runner_version_update_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::Runners::ProcessRunnerVersionUpdateWorker, feature_category: :runner_fleet do
+RSpec.describe Ci::Runners::ProcessRunnerVersionUpdateWorker, feature_category: :fleet_visibility do
   subject(:worker) { described_class.new }
 
   describe '#perform' do
diff --git a/spec/workers/ci/runners/reconcile_existing_runner_versions_cron_worker_spec.rb b/spec/workers/ci/runners/reconcile_existing_runner_versions_cron_worker_spec.rb
index 34b1cb33e6b2fddda64f62845a6b486e639d0599..7157a3e7beb2018203caf0e2ec6ca9378233c2f6 100644
--- a/spec/workers/ci/runners/reconcile_existing_runner_versions_cron_worker_spec.rb
+++ b/spec/workers/ci/runners/reconcile_existing_runner_versions_cron_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::Runners::ReconcileExistingRunnerVersionsCronWorker, feature_category: :runner_fleet do
+RSpec.describe Ci::Runners::ReconcileExistingRunnerVersionsCronWorker, feature_category: :fleet_visibility do
   subject(:worker) { described_class.new }
 
   describe '#perform' do
diff --git a/spec/workers/ci/runners/stale_machines_cleanup_cron_worker_spec.rb b/spec/workers/ci/runners/stale_machines_cleanup_cron_worker_spec.rb
index 79d1fadfd2beda78c9c1ea77d3dc4579d6edd669..4c5ea621191a9523763cc197f4a853b8e729043d 100644
--- a/spec/workers/ci/runners/stale_machines_cleanup_cron_worker_spec.rb
+++ b/spec/workers/ci/runners/stale_machines_cleanup_cron_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::Runners::StaleMachinesCleanupCronWorker, feature_category: :runner_fleet do
+RSpec.describe Ci::Runners::StaleMachinesCleanupCronWorker, feature_category: :fleet_visibility do
   let(:worker) { described_class.new }
 
   describe '#perform', :freeze_time do