diff --git a/config/feature_categories.yml b/config/feature_categories.yml
index a7e84d53c31c042a1ea6cbba2506ff8218665035..265967a9834cfdec3cee74aaec62ae6ccb2f0f7e 100644
--- a/config/feature_categories.yml
+++ b/config/feature_categories.yml
@@ -11,6 +11,7 @@
 - activation
 - advisory_database
 - ai_abstraction_layer
+- ai_agents
 - ai_evaluation
 - ai_research
 - api
@@ -38,6 +39,7 @@
 - container_scanning
 - continuous_delivery
 - continuous_integration
+- custom_models
 - customersdot_application
 - database
 - dataops
@@ -71,6 +73,7 @@
 - global_search
 - groups_and_projects
 - helm_chart_registry
+- hosted_runners
 - importers
 - incident_management
 - infrastructure_as_code
@@ -109,7 +112,6 @@
 - requirements_management
 - review_apps
 - runner
-- runner_saas
 - saas_provisioning
 - sbom
 - scalability
diff --git a/db/docs/ci_runners.yml b/db/docs/ci_runners.yml
index 33bd6ae402f55e3fc6ffbf6d3e3afb9836bc4c75..84d6dda38a0f0e4a8d6fb0cc286387c87a177362 100644
--- a/db/docs/ci_runners.yml
+++ b/db/docs/ci_runners.yml
@@ -5,7 +5,7 @@ classes:
 feature_categories:
 - runner
 - fleet_visibility
-- runner_saas
+- hosted_runners
 description: Registered CI runners
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/046b28312704f3131e72dcd2dbdacc5264d4aa62
 milestone: '8.0'