diff --git a/app/controllers/profiles/gpg_keys_controller.rb b/app/controllers/profiles/gpg_keys_controller.rb
index 9e16d195b00ed2f6002401b2ae9f6a28f8692ffc..e31ca87a5d5dcb29ba4d49535ad20c8341939c76 100644
--- a/app/controllers/profiles/gpg_keys_controller.rb
+++ b/app/controllers/profiles/gpg_keys_controller.rb
@@ -3,7 +3,7 @@
 class Profiles::GpgKeysController < Profiles::ApplicationController
   before_action :set_gpg_key, only: [:destroy, :revoke]
 
-  feature_category :users
+  feature_category :source_code_management
 
   def index
     @gpg_keys = current_user.gpg_keys.with_subkeys
diff --git a/ee/app/controllers/ee/users_controller.rb b/ee/app/controllers/ee/users_controller.rb
index 2723de8371c694b716fea675bbaebf01df0c20a3..66012355ffd6443e75e422f41ef349b292c16360 100644
--- a/ee/app/controllers/ee/users_controller.rb
+++ b/ee/app/controllers/ee/users_controller.rb
@@ -8,7 +8,9 @@ module UsersController
     prepended do
       include GeoInstrumentation
 
-      feature_category :users, [:available_group_templates, :available_project_templates, :pipelines_quota]
+      feature_category :users, [:available_group_templates, :pipelines_quota]
+
+      feature_category :source_code_management, [:available_project_templates]
     end
 
     def available_project_templates
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index 398e392277e0d4e6c6ca28ddaf03ec0bdf59863f..ab39790f02f8a1038a5bd24716991cea3b254c13 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -729,7 +729,7 @@ def translate_params_for_compatibility(params)
       params do
         requires :id, type: String, desc: 'ID of a project'
       end
-      get ':id/storage', feature_category: :projects do
+      get ':id/storage', feature_category: :source_code_management do
         authenticated_as_admin!
 
         present user_project, with: Entities::ProjectRepositoryStorage, current_user: current_user