diff --git a/db/docs/automation_rules.yml b/db/docs/automation_rules.yml
index 2465bd3a059963c562d1c364a7df1ca2248122cf..22cdf9c499a5e8495a52dc5094627c64b239dd02 100644
--- a/db/docs/automation_rules.yml
+++ b/db/docs/automation_rules.yml
@@ -5,4 +5,12 @@ feature_categories:
 -
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111021
 milestone: '15.9'
-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:
+  namespace_id: namespaces
diff --git a/db/docs/ci_builds_metadata.yml b/db/docs/ci_builds_metadata.yml
index 028b6dfefab1b28c1f9eb4dc996381907cb5a9af..d3c3310a381abf692fc72fb67942d1309588785f 100644
--- a/db/docs/ci_builds_metadata.yml
+++ b/db/docs/ci_builds_metadata.yml
@@ -7,3 +7,5 @@ description: TODO
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/1dde609ca6b130aa0a3d39e929edee7e770e62fc
 milestone: '10.7'
 gitlab_schema: gitlab_ci
+sharding_key:
+  project_id: projects
diff --git a/db/docs/user_namespace_callouts.yml b/db/docs/user_namespace_callouts.yml
index 7ffc2e0c209461bf290481a1a4be996959e77325..5c2777609396762bd87a163152398c99ba6980c8 100644
--- a/db/docs/user_namespace_callouts.yml
+++ b/db/docs/user_namespace_callouts.yml
@@ -6,4 +6,12 @@ feature_categories:
 description: Contains records of which users have dismissed a callout, grouped by namespace.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91092
 milestone: '15.2'
-gitlab_schema: gitlab_main
\ No newline at end of file
+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:
+  namespace_id: namespaces
diff --git a/spec/lib/gitlab/database/sharding_key_spec.rb b/spec/lib/gitlab/database/sharding_key_spec.rb
index 15280dea0383da4f86dc1b944461e0c57c086597..1840da60eec5bed5e80f229b2dfba2308c40ffee 100644
--- a/spec/lib/gitlab/database/sharding_key_spec.rb
+++ b/spec/lib/gitlab/database/sharding_key_spec.rb
@@ -56,7 +56,8 @@
       'zoekt_tasks.project_identifier',
       'ci_namespace_monthly_usages.namespace_id', # https://gitlab.com/gitlab-org/gitlab/-/issues/321400
       'ci_job_artifacts.project_id',
-      'ci_namespace_monthly_usages.namespace_id' # https://gitlab.com/gitlab-org/gitlab/-/issues/321400
+      'ci_namespace_monthly_usages.namespace_id', # https://gitlab.com/gitlab-org/gitlab/-/issues/321400
+      'ci_builds_metadata.project_id'
     ]
   end