diff --git a/db/docs/remote_development_agent_configs.yml b/db/docs/remote_development_agent_configs.yml
index 89e8009558056c3c8a99f654ce5f278dace4dd8f..855389cf6235d71fe7381285e270bb079543fd78 100644
--- a/db/docs/remote_development_agent_configs.yml
+++ b/db/docs/remote_development_agent_configs.yml
@@ -7,4 +7,19 @@ feature_categories:
 description: Remote Development Cluster Agent Configuration
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105783
 milestone: '16.0'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_cell
+allow_cross_joins:
+- gitlab_main_clusterwide
+allow_cross_transactions:
+- gitlab_main_clusterwide
+allow_cross_foreign_keys:
+- gitlab_main_clusterwide
+desired_sharding_key:
+  project_id:
+    references: projects
+    backfill_via:
+      parent:
+        foreign_key: cluster_agent_id
+        table: cluster_agents
+        sharding_key: project_id
+        belongs_to: agent
diff --git a/db/docs/workspace_variables.yml b/db/docs/workspace_variables.yml
index f3eef551225eb425b5556ad2b5a7b08b3cf0c123..f92750f84c1d9483c584c1f21949b6118bf73319 100644
--- a/db/docs/workspace_variables.yml
+++ b/db/docs/workspace_variables.yml
@@ -7,4 +7,19 @@ feature_categories:
 description: Remote Development Workspace variables
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/129688
 milestone: '16.4'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_cell
+allow_cross_joins:
+- gitlab_main_clusterwide
+allow_cross_transactions:
+- gitlab_main_clusterwide
+allow_cross_foreign_keys:
+- gitlab_main_clusterwide
+desired_sharding_key:
+  project_id:
+    references: projects
+    backfill_via:
+      parent:
+        foreign_key: workspace_id
+        table: workspaces
+        sharding_key: project_id
+        belongs_to: workspace
diff --git a/db/docs/workspaces.yml b/db/docs/workspaces.yml
index 045a31d0d73ecaa25305ece8f7c00cf600d4efbc..8aefb91c4de4bd080218d4abd7c2026eb5e4f8c5 100644
--- a/db/docs/workspaces.yml
+++ b/db/docs/workspaces.yml
@@ -7,4 +7,12 @@ feature_categories:
 description: Remote Development Workspaces
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105783
 milestone: '16.0'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_cell
+allow_cross_joins:
+- gitlab_main_clusterwide
+allow_cross_transactions:
+- gitlab_main_clusterwide
+allow_cross_foreign_keys:
+- gitlab_main_clusterwide
+sharding_key:
+  project_id: projects