diff --git a/src/plugins/esql/kibana.jsonc b/src/plugins/esql/kibana.jsonc
index 2bb2b759dc429..6ee732ef79f5a 100644
--- a/src/plugins/esql/kibana.jsonc
+++ b/src/plugins/esql/kibana.jsonc
@@ -2,6 +2,8 @@
   "type": "plugin",
   "id": "@kbn/esql",
   "owner": "@elastic/kibana-esql",
+  "group": "platform",
+  "visibility": "shared",
   "plugin": {
     "id": "esql",
     "server": true,
diff --git a/src/plugins/esql_datagrid/kibana.jsonc b/src/plugins/esql_datagrid/kibana.jsonc
index e2596ccb9fc8b..f8f880b2d4313 100644
--- a/src/plugins/esql_datagrid/kibana.jsonc
+++ b/src/plugins/esql_datagrid/kibana.jsonc
@@ -2,6 +2,8 @@
   "type": "plugin",
   "id": "@kbn/esql-datagrid",
   "owner": "@elastic/kibana-esql",
+  "group": "platform",
+  "visibility": "shared",
   "plugin": {
     "id": "esqlDataGrid",
     "server": false,
diff --git a/test/common/plugins/otel_metrics/kibana.jsonc b/test/common/plugins/otel_metrics/kibana.jsonc
index e64546f446052..dea9f97260c7a 100644
--- a/test/common/plugins/otel_metrics/kibana.jsonc
+++ b/test/common/plugins/otel_metrics/kibana.jsonc
@@ -2,6 +2,8 @@
   "type": "plugin",
   "id": "@kbn/open-telemetry-instrumented-plugin",
   "owner": "@elastic/obs-ux-infra_services-team",
+  "group": "platform",
+  "visibility": "shared",
   "plugin": {
     "id": "openTelemetryInstrumentedPlugin",
     "server": true,
diff --git a/x-pack/plugins/data_usage/kibana.jsonc b/x-pack/plugins/data_usage/kibana.jsonc
index ffd8833351267..3706875c1ad94 100644
--- a/x-pack/plugins/data_usage/kibana.jsonc
+++ b/x-pack/plugins/data_usage/kibana.jsonc
@@ -5,6 +5,8 @@
     "@elastic/obs-ai-assistant",
     "@elastic/security-solution"
   ],
+  "group": "platform",
+  "visibility": "private",
   "plugin": {
     "id": "dataUsage",
     "server": true,
diff --git a/x-pack/plugins/enterprise_search/kibana.jsonc b/x-pack/plugins/enterprise_search/kibana.jsonc
index f631bd2dc53d1..14a36c85c6c87 100644
--- a/x-pack/plugins/enterprise_search/kibana.jsonc
+++ b/x-pack/plugins/enterprise_search/kibana.jsonc
@@ -2,6 +2,9 @@
   "type": "plugin",
   "id": "@kbn/enterprise-search-plugin",
   "owner": "@elastic/search-kibana",
+  // Could be categorised as Search in the future, but it currently needs to run in Observability too
+  "group": "platform",
+  "visibility": "shared",
   "description": "Adds dashboards for discovering and managing Enterprise Search products.",
   "plugin": {
     "id": "enterpriseSearch",
diff --git a/x-pack/plugins/entity_manager/kibana.jsonc b/x-pack/plugins/entity_manager/kibana.jsonc
index efd6d3a445b3f..d5dadcf8fd2b7 100644
--- a/x-pack/plugins/entity_manager/kibana.jsonc
+++ b/x-pack/plugins/entity_manager/kibana.jsonc
@@ -2,6 +2,8 @@
   "type": "plugin",
   "id": "@kbn/entityManager-plugin",
   "owner": "@elastic/obs-entities",
+  "group": "platform",
+  "visibility": "shared",
   "description": "Entity manager plugin for entity assets (inventory, topology, etc)",
   "plugin": {
     "id": "entityManager",
diff --git a/x-pack/plugins/fields_metadata/kibana.jsonc b/x-pack/plugins/fields_metadata/kibana.jsonc
index 2befc0c7be07b..37cdaaf92c2b3 100644
--- a/x-pack/plugins/fields_metadata/kibana.jsonc
+++ b/x-pack/plugins/fields_metadata/kibana.jsonc
@@ -2,6 +2,8 @@
   "type": "plugin",
   "id": "@kbn/fields-metadata-plugin",
   "owner": "@elastic/obs-ux-logs-team",
+  "group": "platform",
+  "visibility": "shared",
   "description": "Exposes services for async usage and search of fields metadata.",
   "plugin": {
     "id": "fieldsMetadata",
diff --git a/x-pack/plugins/inference/kibana.jsonc b/x-pack/plugins/inference/kibana.jsonc
index 6e4e389bdc5ff..f184a848cf982 100644
--- a/x-pack/plugins/inference/kibana.jsonc
+++ b/x-pack/plugins/inference/kibana.jsonc
@@ -2,6 +2,8 @@
   "type": "plugin",
   "id": "@kbn/inference-plugin",
   "owner": "@elastic/appex-ai-infra",
+  "group": "platform",
+  "visibility": "shared",
   "plugin": {
     "id": "inference",
     "server": true,
diff --git a/x-pack/plugins/integration_assistant/kibana.jsonc b/x-pack/plugins/integration_assistant/kibana.jsonc
index 94840008a3344..66ee0775fb481 100644
--- a/x-pack/plugins/integration_assistant/kibana.jsonc
+++ b/x-pack/plugins/integration_assistant/kibana.jsonc
@@ -2,6 +2,8 @@
   "type": "plugin",
   "id": "@kbn/integration-assistant-plugin",
   "owner": "@elastic/security-scalability",
+  "group": "platform",
+  "visibility": "shared",
   "description": "Plugin implementing the Integration Assistant API and UI",
   "plugin": {
     "id": "integrationAssistant",
diff --git a/x-pack/plugins/monitoring_collection/kibana.jsonc b/x-pack/plugins/monitoring_collection/kibana.jsonc
index c2df8e9015326..0e779a6f532a5 100644
--- a/x-pack/plugins/monitoring_collection/kibana.jsonc
+++ b/x-pack/plugins/monitoring_collection/kibana.jsonc
@@ -2,6 +2,8 @@
   "type": "plugin",
   "id": "@kbn/monitoring-collection-plugin",
   "owner": "@elastic/stack-monitoring",
+  "group": "platform",
+  "visibility": "private",
   "plugin": {
     "id": "monitoringCollection",
     "server": true,
diff --git a/x-pack/plugins/observability_solution/entities_data_access/kibana.jsonc b/x-pack/plugins/observability_solution/entities_data_access/kibana.jsonc
index 78c2e5db5c2b0..ed5c9ead0f6ef 100644
--- a/x-pack/plugins/observability_solution/entities_data_access/kibana.jsonc
+++ b/x-pack/plugins/observability_solution/entities_data_access/kibana.jsonc
@@ -2,6 +2,8 @@
   "type": "plugin",
   "id": "@kbn/entities-data-access-plugin",
   "owner": "@elastic/obs-entities",
+  "group": "observability",
+  "visibility": "private",
   "plugin": {
     "id": "entitiesDataAccess",
     "server": true,
diff --git a/x-pack/plugins/observability_solution/investigate/kibana.jsonc b/x-pack/plugins/observability_solution/investigate/kibana.jsonc
index b3421fca1541c..a7e6761dd5392 100644
--- a/x-pack/plugins/observability_solution/investigate/kibana.jsonc
+++ b/x-pack/plugins/observability_solution/investigate/kibana.jsonc
@@ -2,6 +2,8 @@
   "type": "plugin",
   "id": "@kbn/investigate-plugin",
   "owner": "@elastic/obs-ux-management-team",
+  "group": "observability",
+  "visibility": "private",
   "plugin": {
     "id": "investigate",
     "server": true,
diff --git a/x-pack/plugins/search_connectors/kibana.jsonc b/x-pack/plugins/search_connectors/kibana.jsonc
index e5aac900e89c0..83d052ac232ad 100644
--- a/x-pack/plugins/search_connectors/kibana.jsonc
+++ b/x-pack/plugins/search_connectors/kibana.jsonc
@@ -2,6 +2,8 @@
   "type": "plugin",
   "id": "@kbn/search-connectors-plugin",
   "owner": "@elastic/search-kibana",
+  "group": "platform",
+  "visibility": "shared",
   "description": "Plugin hosting shared features for connectors",
   "plugin": {
     "id": "searchConnectors",
diff --git a/x-pack/plugins/search_homepage/kibana.jsonc b/x-pack/plugins/search_homepage/kibana.jsonc
index 0e345ab0d330a..7120432e1ef7f 100644
--- a/x-pack/plugins/search_homepage/kibana.jsonc
+++ b/x-pack/plugins/search_homepage/kibana.jsonc
@@ -2,6 +2,8 @@
   "type": "plugin",
   "id": "@kbn/search-homepage",
   "owner": "@elastic/search-kibana",
+  "group": "search",
+  "visibility": "private",
   "plugin": {
     "id": "searchHomepage",
     "server": true,
diff --git a/x-pack/plugins/search_indices/kibana.jsonc b/x-pack/plugins/search_indices/kibana.jsonc
index dee69b2b4e109..50778c3fbb4e4 100644
--- a/x-pack/plugins/search_indices/kibana.jsonc
+++ b/x-pack/plugins/search_indices/kibana.jsonc
@@ -2,6 +2,8 @@
   "type": "plugin",
   "id": "@kbn/search-indices",
   "owner": "@elastic/search-kibana",
+  "group": "search",
+  "visibility": "private",
   "plugin": {
     "id": "searchIndices",
     "server": true,
@@ -25,4 +27,4 @@
       "esUiShared"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/plugins/search_inference_endpoints/kibana.jsonc b/x-pack/plugins/search_inference_endpoints/kibana.jsonc
index ce49397901748..7531316cd12e6 100644
--- a/x-pack/plugins/search_inference_endpoints/kibana.jsonc
+++ b/x-pack/plugins/search_inference_endpoints/kibana.jsonc
@@ -2,6 +2,8 @@
   "type": "plugin",
   "id": "@kbn/search-inference-endpoints",
   "owner": "@elastic/search-kibana",
+  "group": "platform",
+  "visibility": "shared",
   "plugin": {
     "id": "searchInferenceEndpoints",
     "server": true,
diff --git a/x-pack/plugins/search_notebooks/kibana.jsonc b/x-pack/plugins/search_notebooks/kibana.jsonc
index e9432a5559ce9..2944f22f83382 100644
--- a/x-pack/plugins/search_notebooks/kibana.jsonc
+++ b/x-pack/plugins/search_notebooks/kibana.jsonc
@@ -2,6 +2,8 @@
   "type": "plugin",
   "id": "@kbn/search-notebooks",
   "owner": "@elastic/search-kibana",
+  "group": "search",
+  "visibility": "private",
   "description": "Plugin to provide access to and rendering of python notebooks for use in the persistent developer console.",
   "plugin": {
     "id": "searchNotebooks",
diff --git a/x-pack/plugins/search_playground/kibana.jsonc b/x-pack/plugins/search_playground/kibana.jsonc
index e9dedf0fe716f..8b99add8587fa 100644
--- a/x-pack/plugins/search_playground/kibana.jsonc
+++ b/x-pack/plugins/search_playground/kibana.jsonc
@@ -2,6 +2,9 @@
   "type": "plugin",
   "id": "@kbn/search-playground",
   "owner": "@elastic/search-kibana",
+  // @kbn/enterprise-search-plugin (platform) and @kbn/serverless-search (search) depend on it
+  "group": "platform",
+  "visibility": "shared",
   "plugin": {
     "id": "searchPlayground",
     "server": true,