diff --git a/ee/spec/controllers/admin/runners_controller_spec.rb b/ee/spec/controllers/admin/runners_controller_spec.rb
index a1dadccf841e34bfd90d63a7c6b95e688580ef20..83d5edc65f9ece63badcea3ffee5b7ee69aac9fc 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 do
+RSpec.describe Admin::RunnersController, feature_category: :runner_fleet 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 1758aee25726c200da5d02ef7d6b9f37bd418a10..37134a694d249184323e383f971de0f5b209a7d1 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 do
+RSpec.describe Groups::RunnersController, feature_category: :runner_fleet 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 b26ffad9ec5df9bc17b9d1bfeae537ceacf1320f..8cf068292e02b521e9b5fa9be9cd59262042e0a5 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 do
+RSpec.describe Projects::RunnersController, :saas, feature_category: :runner_fleet 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 2f1e27f36c69d84064a6f61b674f9e62a50941aa..11e6e7a23106e7b7e10ff9889e392471e9c19ad8 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 do
+RSpec.describe "Admin Runners", feature_category: :runner_fleet do
   include RunnerReleasesHelper
   include Spec::Support::Helpers::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 2a8b0168a80ccde5fe0a214a6e7eebc03b302c24..638b5b7fdcff1571b58315a963fa5eda5f07f383 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 do
+RSpec.describe 'CI shared runner settings', feature_category: :runner_fleet do
   include StubENV
 
   let(:admin) { create(:admin) }
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 fb5b8fed56d2940172b1c83ed65b512b8481e4eb..f88e01c4718caa274b25bf83b4063d314b1b7045 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 do
+RSpec.describe Mutations::Ci::Runner::Update, feature_category: :runner_fleet do
   include GraphqlHelpers
 
   describe '#resolve' do
diff --git a/ee/spec/requests/api/graphql/ci/runner_spec.rb b/ee/spec/requests/api/graphql/ci/runner_spec.rb
index 8ca58bc5d0bd98f8c0a67660d66c52ef45e32904..17f41edb6482e9938b49fb27bf57c33d2c2d3c84 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)' do
+RSpec.describe 'Query.runner(id)', feature_category: :runner_fleet 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 0c55ee31d7832cb8df81cef377157a390d059aa7..eb79c2b55fda92fc396c16c62aafebda9b848d2d 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' do
+RSpec.describe 'Query.runners', feature_category: :runner_fleet do
   include GraphqlHelpers
   include RunnerReleasesHelper
 
diff --git a/spec/controllers/admin/runner_projects_controller_spec.rb b/spec/controllers/admin/runner_projects_controller_spec.rb
index 5e4fee17e67687d749e63f90bd9f55e8c585d8b4..38cc2d171acd3f88d0cbaee68ece213b2580eb32 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 do
+RSpec.describe Admin::RunnerProjectsController, feature_category: :runner_fleet 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 a73071e14b34192d58133c7f4a62ae504ab54d30..6d58abb9d4dcbdf2ebdfd8d4703a2b1f803280db 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 do
+RSpec.describe Admin::RunnersController, feature_category: :runner_fleet 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 0e349e1d53f588765dede1dc2f20905f77de4199..93c1571bb6c9b1a39da36a1ea6421096519c4bd4 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 do
+RSpec.describe Groups::RunnersController, feature_category: :runner_fleet 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 dba78617e89811198916d7ea3e4ea09b589f3554..5733b8114d4dc932fde7fdc1fe8e8a5635088660 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 do
+RSpec.describe Projects::RunnersController, feature_category: :runner_fleet do
   let(:user) { create(:user) }
   let(:project) { create(:project) }
   let(: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 342c4d55dd6718e2d9c18c3c79cb689514585b9a..3a5abd0a7a65fec75c2afb6973d07cb701cb989e 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 do
+RSpec.describe "Admin Runners", feature_category: :runner_fleet do
   include Spec::Support::Helpers::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 c920a06665c7450153f97d1ed24d9f2ef4650f69..ab53ef7c470c3106378a5abeca8129d5bbdf05f2 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 do
+RSpec.describe "Group Runners", feature_category: :runner_fleet do
   include Spec::Support::Helpers::Features::RunnersHelpers
   include Spec::Support::Helpers::ModalHelpers
 
diff --git a/spec/features/runners_spec.rb b/spec/features/runners_spec.rb
index 2dc388d714a157139ae2d8a16dcedbc1d3d2b95b..40ba0fa9ebbb000ff4691e40784af1e7115e3270 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 do
+RSpec.describe 'Runners', feature_category: :runner_fleet do
   let_it_be(:user) { create(:user) }
 
   before do
diff --git a/spec/graphql/mutations/ci/runner/bulk_delete_spec.rb b/spec/graphql/mutations/ci/runner/bulk_delete_spec.rb
index 7300d2ad5bdea26579c6f7072eb525aca566ccdc..aaa74fa78aa566a294cd17073c56e06ee22230f0 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 do
+RSpec.describe Mutations::Ci::Runner::BulkDelete, feature_category: :runner_fleet 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 e21b35602cc245235ca786208138bd083207ce86..f19fa7c34a923146203483c8c7d1a692bbe084de 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 do
+RSpec.describe Mutations::Ci::Runner::Delete, feature_category: :runner_fleet 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 35a447400656dfe0fbe4919e994a1b00a4b9f6d0..e0c8219e0f64f111d95f956a4559d8823cab15bb 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 do
+RSpec.describe Mutations::Ci::Runner::Update, feature_category: :runner_fleet 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 eb61345755547b474975104d1f1b30faced2fc41..5d06db904d5efa5602ca04172e59fb35385e3f7a 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 do
+RSpec.describe Resolvers::Ci::GroupRunnersResolver, feature_category: :runner_fleet 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 5025878cc21da428a893e9b1902225b573d0be21..4cc00ced10466d6fc6a34217e1bef4b4803c3f10 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 do
+RSpec.describe Resolvers::Ci::ProjectRunnersResolver, feature_category: :runner_fleet do
   include GraphqlHelpers
 
   describe '#resolve' do
diff --git a/spec/graphql/resolvers/ci/runner_jobs_resolver_spec.rb b/spec/graphql/resolvers/ci/runner_jobs_resolver_spec.rb
index ba8a127bec564f418700694682f7d908e7d6cd21..963a642fa4e1732df1ec2c736ccafc29f45a2ce9 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 do
+RSpec.describe Resolvers::Ci::RunnerJobsResolver, feature_category: :runner_fleet 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 3cb6e94e81ee5eaf2fe4facf1941c32bfcdefea2..1d1fb4a9967d83cc6c9a01676d17d0291e8d3e97 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 do
+RSpec.describe Resolvers::Ci::RunnerPlatformsResolver, feature_category: :runner_fleet 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 952c7337d65f24c75f4940d1fdfcdda41ad20ccf..6c69cdc19ccf62b2c3b815b87110d57e8d4cc42b 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 do
+RSpec.describe Resolvers::Ci::RunnerProjectsResolver, feature_category: :runner_fleet 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 13ef89023d9a568d611e3cf74fab87d28fac4c42..734337f7c923b04fee744c93df1856572b743b90 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 do
+RSpec.describe Resolvers::Ci::RunnerSetupResolver, feature_category: :runner_fleet 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 fbef07b72e645aedf658f405d3469e2e0166ed63..2bea256856dbc75afb58ee97905bd1ac8ede0dd2 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 do
+RSpec.describe Resolvers::Ci::RunnerStatusResolver, feature_category: :runner_fleet 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 9e3793ba1e21d898a255264da817e23b1005b420..d6da8222234f45504d86024d6761068d0ce03fd6 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 do
+RSpec.describe Resolvers::Ci::RunnersResolver, feature_category: :runner_fleet do
   include GraphqlHelpers
 
   describe '#resolve' do
diff --git a/spec/migrations/20220922143143_schedule_reset_duplicate_ci_runners_token_values_spec.rb b/spec/migrations/20220922143143_schedule_reset_duplicate_ci_runners_token_values_spec.rb
index a0041bb9fd2fdfab7afaf1dc498ae91728ff86e5..07627725ed0eda61ac691f45a24e6e319a7ffb7b 100644
--- a/spec/migrations/20220922143143_schedule_reset_duplicate_ci_runners_token_values_spec.rb
+++ b/spec/migrations/20220922143143_schedule_reset_duplicate_ci_runners_token_values_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe ScheduleResetDuplicateCiRunnersTokenValues, feature_category: :runner, migration: :gitlab_ci do
+RSpec.describe ScheduleResetDuplicateCiRunnersTokenValues, feature_category: :runner_fleet, migration: :gitlab_ci do
   let(:migration) { described_class::MIGRATION }
 
   describe '#up' do
diff --git a/spec/migrations/20220922143634_schedule_reset_duplicate_ci_runners_token_encrypted_values_spec.rb b/spec/migrations/20220922143634_schedule_reset_duplicate_ci_runners_token_encrypted_values_spec.rb
index 4b3e9bfef054899ebd91ca635d78020185603f0e..42f200e0d6f338fe85f0432e116a54e482fbfecc 100644
--- a/spec/migrations/20220922143634_schedule_reset_duplicate_ci_runners_token_encrypted_values_spec.rb
+++ b/spec/migrations/20220922143634_schedule_reset_duplicate_ci_runners_token_encrypted_values_spec.rb
@@ -3,7 +3,9 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe ScheduleResetDuplicateCiRunnersTokenEncryptedValues, feature_category: :runner, migration: :gitlab_ci do
+RSpec.describe ScheduleResetDuplicateCiRunnersTokenEncryptedValues,
+  feature_category: :runner_fleet,
+  migration: :gitlab_ci do
   let(:migration) { described_class::MIGRATION }
 
   describe '#up' do
diff --git a/spec/models/ci/runner_version_spec.rb b/spec/models/ci/runner_version_spec.rb
index 80d72de3b14e2011dd0cffc6a8a84e389fba0573..552b271fe851c4f8022c91096df79ec17c5bcec7 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 do
+RSpec.describe Ci::RunnerVersion, feature_category: :runner_fleet do
   let_it_be(:runner_version_recommended) do
     create(:ci_runner_version, version: 'abc234', status: :recommended)
   end
diff --git a/spec/requests/api/ci/runner/runners_delete_spec.rb b/spec/requests/api/ci/runner/runners_delete_spec.rb
index d53c9d3c64405033203c09ed586361dddf7c2d7b..65c287a95356e0ffebe2070709d7368d6192aff5 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 do
+RSpec.describe API::Ci::Runner, :clean_gitlab_redis_shared_state, feature_category: :runner_fleet 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 a501437e21abc13e53fa99de2be96c87276dad0c..73f8e87a9fb9725ec3e1869727f515828f775f3b 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 do
+RSpec.describe API::Ci::Runner, :clean_gitlab_redis_shared_state, feature_category: :runner_fleet do
   describe '/api/v4/runners' do
     describe 'POST /api/v4/runners' do
       context 'when no token is provided' do
diff --git a/spec/requests/api/ci/runner/runners_reset_spec.rb b/spec/requests/api/ci/runner/runners_reset_spec.rb
index 43e9f7ddf38f8c0d8d7353a8f6134888b4f6b66f..6ab21138d2690a9e37ae287f0e41ca0b1ca70e8a 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 do
+RSpec.describe API::Ci::Runner, :clean_gitlab_redis_shared_state, feature_category: :runner_fleet 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 6ac341240ca0dfa080b736e3513496225b62fe2b..1110dbf5fbc59a920549f2dc2b412def95b0fdb6 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 do
+RSpec.describe API::Ci::Runners, feature_category: :runner_fleet do
   subject { post api("#{prefix}/runners/reset_registration_token", user) }
 
   shared_examples 'bad request' do |result|
diff --git a/spec/requests/api/ci/runners_spec.rb b/spec/requests/api/ci/runners_spec.rb
index fe57a574ceba4cdc011d2fb69ff082d002913775..b07dd388390590e9ce46e7f6360360e179b9c9cc 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, feature_category: :runner do
+RSpec.describe API::Ci::Runners, feature_category: :runner_fleet 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 b2a7c523cb07329a3f01d2e38205bdaba1d96f8d..1b3241c9959421a1cbaf474894a32df6fea2178f 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)', feature_category: :runner do
+RSpec.describe 'Query.runner(id)', feature_category: :runner_fleet do
   include GraphqlHelpers
 
   let_it_be(:user) { create(:user, :admin) }
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 9afa11a40b28799d5b9d9268fed973714cfc1e64..e84a1ca4cc4b0e213001275d602c731cc1bd9ada 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 do
+RSpec.describe 'RunnerWebUrlEdge', feature_category: :runner_fleet 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 3791169877049a073c7c3769883b26c5058601c4..75d8609dc388533c730aae5341b7b62ad7f48df1 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 do
+RSpec.describe 'Query.runners', feature_category: :runner_fleet do
   include GraphqlHelpers
 
   let_it_be(:current_user) { create_default(:user, :admin) }
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 17a7d0ac99c6816d8d34fac88050a098bc0abfc1..752242c3ab33cca35095c874dd4c2471340a750c 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 do
+RSpec.describe 'RunnersRegistrationTokenReset', feature_category: :runner_fleet do
   include GraphqlHelpers
 
   let(:mutation) { graphql_mutation(:runners_registration_token_reset, input) }
diff --git a/spec/requests/runner_setup_controller_spec.rb b/spec/requests/runner_setup_controller_spec.rb
index 5a9c296afd14247fd6f7d748c7b341a6e6bcfef6..8d75b9e81b7bf89a28daa1896386f928060ced28 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 do
+RSpec.describe RunnerSetupController, feature_category: :runner_fleet 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 030b54c2753c4a03f81aedb0f2b1ff56e19e20fe..92f6db2bdfb389e65f27ee54c4ce37bbe3b6dec5 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 do
+RSpec.describe ::Ci::Runners::AssignRunnerService, '#execute', feature_category: :runner_fleet do
   subject(:execute) { described_class.new(runner, project, user).execute }
 
   let_it_be(:runner) { create(:ci_runner, :project, projects: [project]) }
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 dbdcda0828246ab3d0c20afbb438fedabc71b4bd..5e69756597219fd633e4a4684d07fa6301d4f20a 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 do
+RSpec.describe ::Ci::Runners::BulkDeleteRunnersService, '#execute', feature_category: :runner_fleet do
   subject(:execute) { described_class.new(**service_args).execute }
 
   let_it_be(:admin_user) { create(:user, :admin) }
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 1591782be11ac9c5cc4f6a7cebbed75b559b0af0..d2a7e87b2d5e20ee16af49286ddedd844f26deb2 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 do
+RSpec.describe Ci::Runners::ProcessRunnerVersionUpdateService, feature_category: :runner_fleet 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 1169e6f81061d8089ea014662e8b10c0d43647e7..39082b5c0f469a668993db3d811eb525bafc74df 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 do
+RSpec.describe ::Ci::Runners::ReconcileExistingRunnerVersionsService, '#execute', feature_category: :runner_fleet 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 6ec1cd11c893714b46e0fc40aecbadc2e9c90701..47d399cb19ae862689cedc98cc6cb0dc1ee11e94 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 do
+RSpec.describe ::Ci::Runners::RegisterRunnerService, '#execute', feature_category: :runner_fleet 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 0563ea0d0cce59d42ec1099b5807b487d51257ca..c81152360342d40affa004c92fcf7409434ecb26 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 do
+RSpec.describe ::Ci::Runners::ResetRegistrationTokenService, '#execute', feature_category: :runner_fleet 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 66bd8cd9bd2ef20bf573b12cfbc388f4f215032f..9921f9322bda259b961b452479747de41a50965e 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 do
+RSpec.describe ::Ci::Runners::SetRunnerAssociatedProjectsService, '#execute', feature_category: :runner_fleet do
   subject(:execute) { described_class.new(runner: runner, current_user: user, project_ids: project_ids).execute }
 
   let_it_be(:owner_project) { create(:project) }
diff --git a/spec/services/ci/runners/unassign_runner_service_spec.rb b/spec/services/ci/runners/unassign_runner_service_spec.rb
index 36620ab9c57a27db338cf9349390d9251a30ee98..e91d4249473d21e0d59b75d5132b603317a7d2bb 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 do
+RSpec.describe ::Ci::Runners::UnassignRunnerService, '#execute', feature_category: :runner_fleet 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_service_spec.rb b/spec/services/ci/runners/unregister_runner_service_spec.rb
index 33266bc58e52d68b6d70c978ab0ad29f43c86dc5..fb779e1a673d9778e0b605172825ccc547d96743 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 do
+RSpec.describe ::Ci::Runners::UnregisterRunnerService, '#execute', feature_category: :runner_fleet 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 42c509fee9ed82713c8b378262d3f9778e6c800e..86875df70a2cc635672d70a9eab83c3a2c2184ce 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 do
+RSpec.describe Ci::Runners::UpdateRunnerService, '#execute', feature_category: :runner_fleet do
   subject(:execute) { described_class.new(runner).execute(params) }
 
   let(:runner) { create(:ci_runner) }
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 d6c31fe2016e4308bd05e2e347239aeb80cc40ee..30b451f2112a7ea5ce8844d7a0d843eb6c8f57cd 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 do
+RSpec.describe Ci::Runners::ProcessRunnerVersionUpdateWorker, feature_category: :runner_fleet 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 46145dc6c350128aa6bb499a7aeab27ddbbf802e..34b1cb33e6b2fddda64f62845a6b486e639d0599 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 do
+RSpec.describe Ci::Runners::ReconcileExistingRunnerVersionsCronWorker, feature_category: :runner_fleet do
   subject(:worker) { described_class.new }
 
   describe '#perform' do