diff --git a/db/docs/audit_events_instance_amazon_s3_configurations.yml b/db/docs/audit_events_instance_amazon_s3_configurations.yml
index 5cb049342ee0f3d7eb4ed033de4536655289d4c6..cedc68d25ee410b9ab24ef422ba547ebfaf893a7 100644
--- a/db/docs/audit_events_instance_amazon_s3_configurations.yml
+++ b/db/docs/audit_events_instance_amazon_s3_configurations.yml
@@ -7,4 +7,4 @@ feature_categories:
 description: Stores Amazon S3 configurations used for instance level audit event streaming.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136492
 milestone: '16.7'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_clusterwide
diff --git a/db/docs/audit_events_instance_external_audit_event_destinations.yml b/db/docs/audit_events_instance_external_audit_event_destinations.yml
index fe57989cec2dc60439731861135082c3ed68ade3..54c31eb8bfac64fa32a8bb41cecb3dcdce36e8de 100644
--- a/db/docs/audit_events_instance_external_audit_event_destinations.yml
+++ b/db/docs/audit_events_instance_external_audit_event_destinations.yml
@@ -7,4 +7,4 @@ feature_categories:
 description: Stores external destination urls for instance level audit events.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/116909
 milestone: '15.11'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_clusterwide
diff --git a/db/docs/audit_events_instance_google_cloud_logging_configurations.yml b/db/docs/audit_events_instance_google_cloud_logging_configurations.yml
index 059ab59d860467489b5a1c449c152d2f741d3f16..ecf20cb390d442b88df47ddc6e161ca8e6643f6d 100644
--- a/db/docs/audit_events_instance_google_cloud_logging_configurations.yml
+++ b/db/docs/audit_events_instance_google_cloud_logging_configurations.yml
@@ -7,4 +7,4 @@ feature_categories:
 description: Stores Instance level Google Cloud Logging configurations associated with IAM service accounts, used for generating access tokens.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/423036
 milestone: '16.4'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_clusterwide
diff --git a/db/docs/audit_events_streaming_http_instance_namespace_filters.yml b/db/docs/audit_events_streaming_http_instance_namespace_filters.yml
index 9dc7d05a315143eb9bd9a5dec9bcb92664a55138..1a136c24bcc1dcbd242656988d189fe0f28d1408 100644
--- a/db/docs/audit_events_streaming_http_instance_namespace_filters.yml
+++ b/db/docs/audit_events_streaming_http_instance_namespace_filters.yml
@@ -10,3 +10,5 @@ milestone: '16.7'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   namespace_id: namespaces
+allow_cross_foreign_keys:
+  - gitlab_main_clusterwide
diff --git a/db/docs/audit_events_streaming_instance_event_type_filters.yml b/db/docs/audit_events_streaming_instance_event_type_filters.yml
index c70b840f25eba5a4930b391ac740df7c2bc6b800..64fd6c84131283af75afebc3600ad67e5275a956 100644
--- a/db/docs/audit_events_streaming_instance_event_type_filters.yml
+++ b/db/docs/audit_events_streaming_instance_event_type_filters.yml
@@ -7,4 +7,4 @@ feature_categories:
 description: Represents an event type filter for audit event streaming
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/123330
 milestone: '16.1'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_clusterwide
diff --git a/db/docs/instance_audit_events_streaming_headers.yml b/db/docs/instance_audit_events_streaming_headers.yml
index 40db0ead3bf2b35cccc29ea66f3edeaebd864ffa..0915589f39f16b54a820b943cd2407f6454969ac 100644
--- a/db/docs/instance_audit_events_streaming_headers.yml
+++ b/db/docs/instance_audit_events_streaming_headers.yml
@@ -7,4 +7,4 @@ feature_categories:
 description: Represents a HTTP header sent with streaming audit events to instance level destinations
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88063
 milestone: '16.1'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_clusterwide
diff --git a/spec/lib/gitlab/database/no_new_tables_with_gitlab_main_schema_spec.rb b/spec/lib/gitlab/database/no_new_tables_with_gitlab_main_schema_spec.rb
index 704c6929c8a86324d587a2cc350ea6b47d638c82..49274fbf445dfd2630898303513800aeebc42778 100644
--- a/spec/lib/gitlab/database/no_new_tables_with_gitlab_main_schema_spec.rb
+++ b/spec/lib/gitlab/database/no_new_tables_with_gitlab_main_schema_spec.rb
@@ -12,7 +12,6 @@
   # Specific tables can be exempted from this requirement, and such tables must be added to the `exempted_tables` list.
   let!(:exempted_tables) do
     [
-      "audit_events_instance_amazon_s3_configurations", # https://gitlab.com/gitlab-org/gitlab/-/issues/431327
       "sbom_source_packages"                            # https://gitlab.com/gitlab-org/gitlab/-/issues/437718
     ]
   end