From 581c7ae445d22143edd3755549c1a833dbf01b22 Mon Sep 17 00:00:00 2001
From: Tomasz Skorupa <tskorupa@gitlab.com>
Date: Wed, 1 Oct 2025 08:17:07 -0400
Subject: [PATCH] All main tables are classified as sharded

Addresses exit criteria of https://gitlab.com/groups/gitlab-org/-/epics/11670

->  All main tables are classified as sharded (gitlab_main_org, gitlab_main_user), or cell-local (gitlab_main_cell_local, or gitlab_main_cell_setting). No tables are classified as gitlab_main.

Changelog: other
---
 .../Geo Replicate a new Git repository type.md       |  2 +-
 .../issue_templates/Geo Replicate a new blob type.md |  2 +-
 db/docs/abuse_report_notes.yml                       |  2 +-
 db/docs/abuse_report_uploads.yml                     |  2 +-
 db/docs/ai_settings.yml                              |  2 +-
 db/docs/deleted_tables/abuse_report_assignees.yml    |  2 +-
 db/docs/deleted_tables/abuse_report_label_links.yml  |  2 +-
 db/docs/deleted_tables/abuse_report_labels.yml       |  2 +-
 db/docs/deleted_tables/airflow_dags.yml              |  2 +-
 db/docs/deleted_tables/alerts_service_data.yml       |  2 +-
 .../analytics_cycle_analytics_project_stages.yml     |  2 +-
 ...alytics_cycle_analytics_project_value_streams.yml |  2 +-
 .../analytics_devops_adoption_segment_selections.yml |  2 +-
 .../analytics_repository_file_commits.yml            |  2 +-
 .../analytics_repository_file_edits.yml              |  2 +-
 .../deleted_tables/analytics_repository_files.yml    |  2 +-
 db/docs/deleted_tables/audit_events_archived.yml     |  2 +-
 .../deleted_tables/audit_events_part_5fc467ac26.yml  |  2 +-
 db/docs/deleted_tables/backup_labels.yml             |  2 +-
 .../clusters_applications_cert_managers.yml          |  4 ++--
 .../deleted_tables/clusters_applications_cilium.yml  |  2 +-
 .../clusters_applications_crossplane.yml             |  2 +-
 .../clusters_applications_elastic_stacks.yml         |  2 +-
 .../deleted_tables/clusters_applications_fluentd.yml |  2 +-
 .../deleted_tables/clusters_applications_helm.yml    |  2 +-
 .../deleted_tables/clusters_applications_ingress.yml |  2 +-
 .../deleted_tables/clusters_applications_jupyter.yml |  2 +-
 .../deleted_tables/clusters_applications_knative.yml |  2 +-
 .../clusters_applications_prometheus.yml             |  2 +-
 .../deleted_tables/clusters_applications_runners.yml |  2 +-
 .../clusters_integration_elasticstack.yml            |  2 +-
 .../deleted_tables/dast_scanner_profiles_tags.yml    |  2 +-
 .../deleted_tables/dast_site_profiles_pipelines.yml  |  2 +-
 db/docs/deleted_tables/experiment_subjects.yml       |  2 +-
 db/docs/deleted_tables/experiment_users.yml          |  2 +-
 db/docs/deleted_tables/experiments.yml               |  2 +-
 .../external_approval_rules_protected_branches.yml   |  2 +-
 db/docs/deleted_tables/forked_project_links.yml      |  2 +-
 .../geo_container_repository_updated_events.yml      |  2 +-
 .../geo_job_artifact_deleted_events.yml              |  2 +-
 .../deleted_tables/geo_lfs_object_deleted_events.yml |  2 +-
 db/docs/deleted_tables/group_deploy_keys.yml         |  2 +-
 db/docs/deleted_tables/group_deploy_keys_groups.yml  |  2 +-
 .../deleted_tables/in_product_marketing_emails.yml   |  2 +-
 db/docs/deleted_tables/issue_milestones.yml          |  2 +-
 .../issues_prometheus_alert_events.yml               |  2 +-
 .../issues_self_managed_prometheus_alert_events.yml  |  2 +-
 db/docs/deleted_tables/member_tasks.yml              |  2 +-
 db/docs/deleted_tables/merge_request_milestones.yml  |  2 +-
 .../deleted_tables/metrics_dashboard_annotations.yml |  2 +-
 .../deleted_tables/namespace_onboarding_actions.yml  |  2 +-
 .../operations_feature_flag_scopes.yml               |  2 +-
 db/docs/deleted_tables/packages_events.yml           |  2 +-
 db/docs/deleted_tables/partitioned_foreign_keys.yml  |  2 +-
 db/docs/deleted_tables/post_migration_test_table.yml |  2 +-
 .../product_analytics_events_experimental.yml        |  2 +-
 db/docs/deleted_tables/project_tracing_settings.yml  |  2 +-
 .../project_wiki_repository_states.yml               |  2 +-
 db/docs/deleted_tables/prometheus_metrics.yml        |  2 +-
 .../sbom_vulnerable_component_versions.yml           |  2 +-
 db/docs/deleted_tables/schema_inconsistencies.yml    |  2 +-
 db/docs/deleted_tables/serverless_domain_cluster.yml |  2 +-
 db/docs/deleted_tables/services.yml                  |  2 +-
 db/docs/deleted_tables/terraform_state_registry.yml  |  2 +-
 .../tmp_fingerprint_sha256_migration.yml             |  2 +-
 db/docs/deleted_tables/u2f_registrations.yml         |  2 +-
 db/docs/deleted_tables/vulnerability_advisories.yml  |  2 +-
 .../deleted_tables/vulnerability_export_registry.yml |  2 +-
 .../vulnerability_export_verification_status.yml     |  2 +-
 .../vulnerability_finding_evidence_assets.yml        |  2 +-
 .../vulnerability_finding_evidence_headers.yml       |  2 +-
 .../vulnerability_finding_evidence_requests.yml      |  2 +-
 .../vulnerability_finding_evidence_responses.yml     |  2 +-
 .../vulnerability_finding_evidence_sources.yml       |  2 +-
 ...rability_finding_evidence_supporting_messages.yml |  2 +-
 .../vulnerability_finding_fingerprints.yml           |  2 +-
 db/docs/deleted_tables/web_hook_logs_archived.yml    |  2 +-
 .../deleted_tables/web_hook_logs_part_0c5294f417.yml |  2 +-
 .../work_item_hierarchy_restrictions.yml             |  2 +-
 .../work_item_related_link_restrictions.yml          |  2 +-
 db/docs/instance_integrations.yml                    |  2 +-
 db/docs/ldap_admin_role_links.yml                    |  2 +-
 db/docs/plans.yml                                    |  2 +-
 db/docs/programming_languages.yml                    |  2 +-
 db/docs/scim_oauth_access_tokens.yml                 |  2 +-
 db/docs/security_training_providers.yml              |  2 +-
 db/docs/slack_api_scopes.yml                         |  2 +-
 db/docs/subscription_add_ons.yml                     |  2 +-
 db/docs/user_permission_export_upload_uploads.yml    |  2 +-
 db/docs/views/group_wikis_routes_view.yml            |  2 +-
 db/docs/views/personal_snippets_view.yml             |  2 +-
 .../views/project_design_management_routes_view.yml  |  2 +-
 db/docs/views/project_snippets_routes_view.yml       |  2 +-
 db/docs/work_item_types.yml                          |  2 +-
 db/docs/work_item_widget_definitions.yml             |  2 +-
 .../20240228144013_migrate_custom_permissions.rb     |  2 +-
 ...migrate_zoekt_settings_in_application_settings.rb |  2 +-
 ...4545_add_development_widget_to_work_item_types.rb |  2 +-
 ...versioned_pages_deployments_limit_by_namespace.rb |  2 +-
 ...authenticated_git_http_in_application_settings.rb |  2 +-
 ...ble_allow_runner_registration_for_self_managed.rb |  2 +-
 ...s_deployments_limit_by_namespace_for_gold_plan.rb |  2 +-
 ...20240501113440_extend_gitlabcom_duo_pro_trials.rb |  2 +-
 ...pipeline_triggers_premium_ultimate_plan_limits.rb |  2 +-
 ...increase_quantity_for_gitlabcom_duo_pro_trials.rb |  2 +-
 ...115_add_cargo_purl_type_to_application_setting.rb |  2 +-
 ...0240627231742_update_weight_widget_definitions.rb |  2 +-
 ...rency_in_application_settings_for_self_managed.rb |  2 +-
 ...901_add_crm_contacts_widget_to_work_item_types.rb |  2 +-
 ...927_cap_workspaces_max_termination_to_one_year.rb |  2 +-
 ..._set_import_placeholder_limits_for_plan_limits.rb |  2 +-
 ...thout_project_from_project_saved_replies_table.rb |  2 +-
 db/migrate/20240806222106_add_dev_widget_to_tasks.rb |  2 +-
 ...emove_crm_contacts_widget_from_work_item_types.rb |  2 +-
 .../20240812040747_remote_deplicated_agent_config.rb |  2 +-
 ...ment_agent_configs_to_workspaces_agent_configs.rb |  2 +-
 ...916084832_delete_invalid_pages_domains_records.rb |  2 +-
 ...40250_add_email_participants_widget_definition.rb |  2 +-
 ...241017160504_generate_ci_job_token_signing_key.rb |  2 +-
 ...1017160505_regenerate_ci_job_token_signing_key.rb |  2 +-
 ...5736_insert_opensource_pages_deployments_limit.rb |  2 +-
 ...lab_com_concurrent_relation_batch_export_limit.rb |  2 +-
 ...20241029184904_update_admin_bot_user_confirmed.rb |  2 +-
 ...ean_trial_gitlab_subscriptions_date_attributes.rb |  2 +-
 ...36_update_seat_control_in_application_settings.rb |  2 +-
 ...232506_move_all_ready_zoekt_indices_to_pending.rb |  2 +-
 ...h_application_settings_to_elasticsearch_column.rb |  2 +-
 ...d_development_widgets_to_ticket_work_item_type.rb |  2 +-
 ...dd_widgets_to_incidents_for_parity_with_issues.rb |  2 +-
 ...05_add_custom_status_widget_to_work_item_types.rb |  2 +-
 ..._elasticsearch_application_settings_from_jsonb.rb |  2 +-
 ...global_search_settings_in_application_settings.rb |  2 +-
 ...610_backfill_user_provided_workspace_variables.rb |  2 +-
 ...45_add_custom_fields_widget_to_work_item_types.rb |  2 +-
 ...versioned_pages_deployments_limit_by_namespace.rb |  2 +-
 ...8163345_add_error_tracking_to_work_item_widget.rb |  2 +-
 ...50129114448_remove_duplicate_user_member_roles.rb |  2 +-
 .../20250129135025_seed_cloud_connector_keys_new.rb  |  2 +-
 ...ove_package_protection_rules_on_down_migration.rb |  2 +-
 ...remove_start_and_due_date_widget_from_incident.rb |  2 +-
 ...add_linked_resources_widget_to_work_item_types.rb |  2 +-
 ...141159_backfill_default_pages_deployment_limit.rb |  2 +-
 ...820_add_swift_purl_type_to_application_setting.rb |  2 +-
 ...9173756_add_milestone_widget_to_epic_work_item.rb |  2 +-
 ...me_status_widget_to_verification_status_widget.rb |  2 +-
 ...ode_extension_marketplace_feature_flag_to_data.rb |  2 +-
 ...7_rename_custom_status_widget_to_status_widget.rb |  2 +-
 ..._add_vulnerabilities_widget_to_work_item_types.rb |  2 +-
 ..._usage_data_enabled_from_service_ping_settings.rb |  2 +-
 ...s_with_null_namespace_id_from_seat_assignments.rb |  2 +-
 ..._registry_application_settings_to_jsonb_column.rb |  2 +-
 ...bal_search_settings_in_application_settings_v2.rb |  2 +-
 ...80824_disable_ai_events_backfill_to_ch_for_com.rb |  2 +-
 ...g_default_scan_execution_policies_action_limit.rb |  2 +-
 ...41927_add_pub_purl_type_to_application_setting.rb |  2 +-
 ...rification_feature_flag_to_application_setting.rb |  2 +-
 ...cleanup_backfill_missing_namespace_id_on_notes.rb |  2 +-
 ...uct_usage_data_collection_for_offline_licenses.rb |  2 +-
 ...4054305_add_status_widget_definition_to_issues.rb |  2 +-
 ...245_update_pipeline_role_setting_on_gitlab_com.rb |  2 +-
 ...e_own_user_feature_flag_to_application_setting.rb |  2 +-
 ..._null_project_ids_from_duo_workflows_workflows.rb |  2 +-
 ...ull_project_ids_from_duo_workflows_checkpoints.rb |  2 +-
 ...ith_null_project_ids_from_duo_workflows_events.rb |  2 +-
 ...oject_ids_from_duo_workflows_checkpoint_writes.rb |  2 +-
 ..._linked_resources_widget_to_work_item_types_v2.rb |  2 +-
 ...l_prompt_cache_enabled_to_application_settings.rb |  2 +-
 ...l_prompt_cache_enabled_to_application_settings.rb |  2 +-
 ...ate_wiki_page_max_content_bytes_to_5_megabytes.rb |  2 +-
 ...us_in_conversational_development_index_metrics.rb |  2 +-
 ...307051421_update_occupies_seat_on_member_roles.rb |  2 +-
 ...0_finalize_backfill_onboarding_status_step_url.rb |  2 +-
 ...ize_backfill_default_organization_owners_again.rb |  2 +-
 ...0240325131114_move_self_managed_cr_to_instance.rb |  2 +-
 ...20240329125210_finalize_has_issues_backfilling.rb |  2 +-
 ...706_finalize_backfill_vs_code_settings_version.rb |  2 +-
 ..._queue_backfill_jira_tracker_data_project_keys.rb |  2 +-
 ..._inputs_to_spec_on_catalog_resource_components.rb |  2 +-
 ...kfill_merge_request_metrics_pipeline_id_bigint.rb |  2 +-
 ...ackfill_merge_requests_head_pipeline_id_bigint.rb |  2 +-
 ...84104_backfill_merge_trains_pipeline_id_bigint.rb |  2 +-
 ...ckfill_packages_build_infos_pipeline_id_bigint.rb |  2 +-
 ...fill_vulnerability_feedback_pipeline_id_bigint.rb |  2 +-
 ...x_corrupted_scanner_ids_of_vulnerability_reads.rb |  2 +-
 ...hived_and_traversal_ids_to_vulnerability_reads.rb |  2 +-
 ...5130318_migrate_application_settings_help_text.rb |  2 +-
 ...fos_pipeline_id_convert_to_bigint_is_completed.rb |  2 +-
 ...ins_pipeline_id_convert_to_bigint_is_completed.rb |  2 +-
 ...ity_feedback_id_convert_to_bigint_is_completed.rb |  2 +-
 ...ontainer_protection_rules_minimum_access_level.rb |  2 +-
 ...istration_on_namespace_settings_for_gitlab_com.rb |  2 +-
 ...0240422165035_update_kustomization_api_version.rb |  2 +-
 ...ics_pipeline_id_convert_to_bigint_is_completed.rb |  2 +-
 ...240424183213_backfill_deployment_approval_data.rb |  2 +-
 ...inalize_feedback_to_state_transition_migration.rb |  2 +-
 ...25140717_finalize_vulnerability_links_creation.rb |  2 +-
 ...occurrence_pipelines_id_to_bigint_is_completed.rb |  2 +-
 ...ckfill_has_remediations_of_vulnerability_reads.rb |  2 +-
 ...ll_vulnerability_reads_cluster_agent_migration.rb |  2 +-
 ...backfill_epic_basic_fields_to_work_item_record.rb |  2 +-
 ...959_finalize_backfill_nuget_normalized_version.rb |  2 +-
 ...backfill_epic_basic_fields_to_work_item_record.rb |  2 +-
 ...pic_basic_fields_to_work_item_record_corrected.rb |  2 +-
 ...hived_and_traversal_ids_to_vulnerability_reads.rb |  2 +-
 ...240515094240_delete_invalid_path_locks_records.rb |  2 +-
 ...persist_usage_data_keys_that_should_not_expire.rb |  2 +-
 ...nalize_backfill_issue_search_data_namespace_id.rb |  2 +-
 ...ue_backfill_default_branch_protection_settings.rb |  2 +-
 ...ble_cross_hierarchy_for_hierarchy_restrictions.rb |  2 +-
 ...eue_backfill_related_epic_links_to_issue_links.rb |  2 +-
 ...3_queue_backfill_work_item_hierarchy_for_epics.rb |  2 +-
 ...20240521051045_delete_invalid_releases_records.rb |  2 +-
 ...ckfill_epic_issues_into_work_item_parent_links.rb |  2 +-
 ...x_corrupted_scanner_ids_of_vulnerability_reads.rb |  2 +-
 ...23083208_delete_invalid_remote_mirrors_records.rb |  2 +-
 ...lize_backfill_catalog_resource_version_sem_ver.rb |  2 +-
 ...packages_protection_rules_minimum_access_level.rb |  2 +-
 ...58_queue_resync_basic_epic_fields_to_work_item.rb |  2 +-
 ...backfill_epic_dates_to_work_item_dates_sources.rb |  2 +-
 ...bitbucket_identities_with_untrusted_extern_uid.rb |  2 +-
 ...4205241_delete_abuse_report_records_from_notes.rb |  2 +-
 ...l_merge_requests_head_pipeline_id_is_completed.rb |  2 +-
 ..._missing_traversal_ids_for_vulnerability_reads.rb |  2 +-
 ..._invalid_merge_request_context_commits_records.rb |  2 +-
 ...ve_subscription_history_with_null_namespace_id.rb |  2 +-
 ...6_queue_fix_synced_epic_work_item_parent_links.rb |  2 +-
 ...21054244_finalize_backfill_users_color_mode_id.rb |  2 +-
 ...ize_backfill_related_epic_links_to_issue_links.rb |  2 +-
 ...ll_sbom_occurrences_traversal_ids_and_archived.rb |  2 +-
 ...identifier_external_ids_of_vulnerability_reads.rb |  2 +-
 .../20240629011500_queue_backfill_zoekt_replicas.rb  |  2 +-
 ..._convert_credit_card_validation_data_to_hashes.rb |  2 +-
 ...ckfill_epic_issues_into_work_item_parent_links.rb |  2 +-
 ...inalize_backfill_work_item_hierarchy_for_epics.rb |  2 +-
 ...backfill_epic_dates_to_work_item_dates_sources.rb |  2 +-
 ...fill_issues_dates_with_work_item_dates_sources.rb |  2 +-
 ...04030747_queue_backfill_new_audit_event_tables.rb |  2 +-
 ...finalize_resync_basic_epic_fields_to_work_item.rb |  2 +-
 ...finalize_create_compliance_standards_adherence.rb |  2 +-
 ...240708161802_sync_group_merge_request_settings.rb |  2 +-
 ...e_hierarchy_restriction_subepics_maximum_depth.rb |  2 +-
 ..._app_integration_for_jira_connect_subscription.rb |  2 +-
 ...e_delete_orphans_approval_merge_request_rules2.rb |  2 +-
 ..._namespace_settings_seat_control_with_user_cap.rb |  2 +-
 .../20240716191121_queue_backfill_user_details.rb    |  2 +-
 ...0239_queue_backfill_deploy_tokens_sharding_key.rb |  2 +-
 ...ue_recalculate_dora_deployment_frequency_score.rb |  2 +-
 ...ue_fix_namespace_id_for_work_item_parent_links.rb |  2 +-
 ...618_queue_nullify_organization_id_for_snippets.rb |  2 +-
 ...124632_queue_make_security_policy_bots_private.rb |  2 +-
 ...133817_queue_alter_webhook_deleted_audit_event.rb |  2 +-
 ...1070404_update_max_total_yaml_size_bytes_value.rb |  2 +-
 ...ci_max_total_yaml_size_bytes_new_default_value.rb |  2 +-
 ...01195253_queue_backfill_reserved_storage_bytes.rb |  2 +-
 ...240806143319_finalize_dora_df_scores_migration.rb |  2 +-
 ..._resync_epic_dates_to_work_items_dates_sources.rb |  2 +-
 ...ate_owasp_top10_default_of_vulnerability_reads.rb |  2 +-
 ...8125149_queue_deduplicate_lfs_objects_projects.rb |  2 +-
 ...identifier_external_ids_of_vulnerability_reads.rb |  2 +-
 ...90312_queue_populate_detumbled_email_in_emails.rb |  2 +-
 ...0814025044_queue_delete_orphaned_deploy_tokens.rb |  2 +-
 .../20240814145204_finalize_backfill_user_details.rb |  2 +-
 ...4151504_clean_time_tracking_widget_definitions.rb |  2 +-
 .../20240815172551_remove_visual_review_bot.rb       |  2 +-
 ...run_epic_dates_to_work_item_dates_sources_sync.rb |  2 +-
 ...12_requeue_backfill_deploy_tokens_sharding_key.rb |  2 +-
 ...inalize_delete_orphans_approval_project_rules2.rb |  2 +-
 ...fill_catalog_resource_versions_published_by_id.rb |  2 +-
 ...7_queue_backfill_missing_namespace_id_on_notes.rb |  2 +-
 ...855_reenqueue_deduplicate_lfs_objects_projects.rb |  2 +-
 ...ep_503_sbom_component_normalization_migrations.rb |  2 +-
 ...ueue_backfill_packages_dependencies_project_id.rb |  2 +-
 .../20240906133040_fix_non_nullable_snippets.rb      |  2 +-
 ..._finalize_nullify_organization_id_for_snippets.rb |  2 +-
 ...4_queue_mark_duplicate_issuable_resource_links.rb |  2 +-
 ...lize_os_sbom_component_normalization_migration.rb |  2 +-
 ...onal_access_token_seven_days_notification_sent.rb |  2 +-
 ...1712_queue_mark_single_issuable_resource_links.rb |  2 +-
 ...ueue_delete_stale_packages_npm_metadata_caches.rb |  2 +-
 ...eue_backfill_packages_nuget_symbols_project_id.rb |  2 +-
 ...onfig_version_with_latest_agent_config_version.rb |  2 +-
 ...58_queue_backfill_has_vulnerability_resolution.rb |  2 +-
 .../20240913004547_remove_placeholder_memberships.rb |  2 +-
 ...510_set_correct_id_to_existing_work_item_types.rb |  2 +-
 ...708_queue_backfill_members_request_accepted_at.rb |  2 +-
 ..._finalize_workspaces_config_version3_migration.rb |  2 +-
 ...0240926061349_lock_duo_features_enabled_update.rb |  2 +-
 ...fs_objects_projects_with_null_repository_types.rb |  2 +-
 ...ueue_backfill_issues_correct_work_item_type_id.rb |  2 +-
 ...ueue_recover_deleted_ml_model_version_packages.rb |  2 +-
 ...59_finalize_fix_vulnerability_reads_has_issues.rb |  2 +-
 ...leanup_events_personal_namespace_id_gitlab_com.rb |  2 +-
 ...04_queue_backfill_events_personal_namespace_id.rb |  2 +-
 ..._delete_project_import_data_without_project_id.rb |  2 +-
 ..._export_uploads_without_project_id_or_group_id.rb |  2 +-
 ...lize_backfill_packages_dependencies_project_id.rb |  2 +-
 ...lize_delete_stale_packages_npm_metadata_caches.rb |  2 +-
 ...6215438_finalize_delete_orphaned_deploy_tokens.rb |  2 +-
 ...8_finalize_backfill_deploy_tokens_sharding_key.rb |  2 +-
 ...16_finalize_populate_detumbled_email_in_emails.rb |  2 +-
 ...timate_trial_plan_from_community_edition_plans.rb |  2 +-
 ...lize_recover_deleted_ml_model_version_packages.rb |  2 +-
 ...ate_missing_external_links_for_vulnerabilities.rb |  2 +-
 ...3_backfill_abuse_reports_for_bigint_conversion.rb |  2 +-
 ...ate_owasp_top10_default_of_vulnerability_reads.rb |  2 +-
 ...finalize_backfill_has_vulnerability_resolution.rb |  2 +-
 ...0241029170331_queue_resync_has_vulnerabilities.rb |  2 +-
 ...241030125718_update_namespaces_organization_id.rb |  2 +-
 ...lize_backfill_issues_correct_work_item_type_id.rb |  2 +-
 ...030232146_finalize_populate_topics_slug_column.rb |  2 +-
 ...2007_finalize_deduplicate_lfs_objects_projects.rb |  2 +-
 ...thout_spdx_identifier_to_custom_licenses_table.rb |  2 +-
 ...nalize_backfill_jira_tracker_data_project_keys.rb |  2 +-
 ...ze_backfill_default_branch_protection_settings.rb |  2 +-
 ...t_existing_plan_limits_repository_size_to_null.rb |  2 +-
 ...backfill_project_id_to_dependency_list_exports.rb |  2 +-
 ...eue_backfill_related_epic_links_to_issue_links.rb |  2 +-
 ...requeue_backfill_work_item_hierarchy_for_epics.rb |  2 +-
 ...ckfill_epic_issues_into_work_item_parent_links.rb |  2 +-
 ...08133603_queue_backfill_seat_assignments_table.rb |  2 +-
 .../20241108205025_set_work_item_types_old_id.rb     |  2 +-
 ...queue_delete_duplicate_issuable_resource_links.rb |  2 +-
 ...alize_migrate_links_for_vulnerability_findings.rb |  2 +-
 ...61754_finalize_set_correct_vulnerability_state.rb |  2 +-
 ...l_compliance_violation_null_target_project_ids.rb |  2 +-
 ...41118124301_requeue_backfill_security_policies.rb |  2 +-
 ...queue_create_missing_terraform_module_metadata.rb |  2 +-
 .../20241120185321_create_default_ai_setting.rb      |  2 +-
 ...software_license_policies_with_custom_licenses.rb |  2 +-
 ...45919_queue_delete_orphaned_project_namespaces.rb |  2 +-
 ...istration_on_namespace_settings_for_gitlab_com.rb |  2 +-
 ...nse_without_spdx_identifier_to_custom_licenses.rb |  2 +-
 .../20241127210044_backfill_user_details.rb          |  2 +-
 ...ueue_update_status_for_deprecated_npm_packages.rb |  2 +-
 ...e_backfill_issue_link_id_on_related_epic_links.rb |  2 +-
 ...kfill_subscription_add_on_purchases_started_at.rb |  2 +-
 ...1518_queue_backfill_group_wiki_activity_events.rb |  2 +-
 ...ove_rolledup_dates_widget_from_work_item_types.rb |  2 +-
 ...5232318_finalize_backfill_resource_link_events.rb |  2 +-
 ..._queue_requeue_backfill_seat_assignments_table.rb |  2 +-
 ...1210081707_finalize_backfill_security_policies.rb |  2 +-
 ..._mark_duplicate_maven_packages_for_destruction.rb |  2 +-
 ...rtifact_size_lsif_of_plan_limits_from100_to200.rb |  2 +-
 ...218223002_fix_work_item_types_id_column_values.rb |  2 +-
 ...41219144523_queue_skip_company_onboarding_step.rb |  2 +-
 ..._sbom_occurrences_to_components_without_prefix.rb |  2 +-
 ...0250103051831_enable_read_compliance_dashboard.rb |  2 +-
 ...106104021_queue_fix_usernamespace_audit_events.rb |  2 +-
 ...3236_queue_fix_issues_work_item_type_id_values.rb |  2 +-
 .../20250106175246_queue_migrate_scim_identities.rb  |  2 +-
 ...ce_violation_null_target_project_ids_migration.rb |  2 +-
 .../20250107143450_queue_migrate_scim_tokens.rb      |  2 +-
 ...eue_backfill_related_epic_links_to_issue_links.rb |  2 +-
 ...ckfill_epic_issues_into_work_item_parent_links.rb |  2 +-
 ...requeue_backfill_work_item_hierarchy_for_epics.rb |  2 +-
 ...0113204448_finalize_resync_has_vulnerabilities.rb |  2 +-
 ...13222525_finalize_events_sharding_key_backfill.rb |  2 +-
 ...123402_requeue_backfill_seat_assignments_table.rb |  2 +-
 ...4142652_update_import_failures_organization_id.rb |  2 +-
 ...nse_without_spdx_identifier_to_custom_licenses.rb |  2 +-
 ...ize_backfill_packages_nuget_symbols_project_id.rb |  2 +-
 ...ackfill_vs_code_settings_settings_context_hash.rb |  2 +-
 .../20250117145241_fix_group_scim_identities.rb      |  2 +-
 ...nalize_fix_issues_work_item_type_id_values_bbm.rb |  2 +-
 ...inalize_backfill_resource_link_events_attempt2.rb |  2 +-
 ...22193107_finalize_skip_company_onboarding_step.rb |  2 +-
 ...e_the_deduplication_of_issuable_resource_links.rb |  2 +-
 ...the_deduplication_of_issuable_resource_links_2.rb |  2 +-
 ...the_deduplication_of_issuable_resource_links_3.rb |  2 +-
 ...185100_delete_boards_without_project_and_group.rb |  2 +-
 ...250123195100_fix_boards_with_project_and_group.rb |  2 +-
 ...95300_backfill_sharding_key_on_board_assignees.rb |  2 +-
 ...7_finalize_backfill_group_wiki_activity_events.rb |  2 +-
 ...52138_queue_split_microsoft_applications_table.rb |  2 +-
 ...135_delete_milestones_without_project_or_group.rb |  2 +-
 ...257_fix_milestones_with_with_project_and_group.rb |  2 +-
 ...ce_violation_null_target_project_ids_migration.rb |  2 +-
 ...ize_backfill_packages_conan_package_references.rb |  2 +-
 ...125828_queue_create_missing_nuget_symbol_files.rb |  2 +-
 ...kfill_pipeline_execution_policies_config_links.rb |  2 +-
 ...06223925_backfill_sharding_key_on_board_labels.rb |  2 +-
 ...fill_issues_dates_with_work_item_dates_sources.rb |  2 +-
 ...0212025529_finalize_hk_backfill_zoekt_replicas.rb |  2 +-
 ...lize_hk_fix_synced_epic_work_item_parent_links.rb |  2 +-
 ..._finalize_hk_alter_webhook_deleted_audit_event.rb |  2 +-
 ...085204_fill_ai_duo_chat_events_organization_id.rb |  2 +-
 ...14518_queue_backfill_software_license_policies.rb |  2 +-
 .../20250220185148_queue_update_closed_merged_mrs.rb |  2 +-
 ...23_finalize_hk_backfill_reserved_storage_bytes.rb |  2 +-
 ...clean_resource_milestone_events_without_parent.rb |  2 +-
 ...ean_resource_milestone_events_with_two_parents.rb |  2 +-
 ...e_backfill_resource_milestone_events_namespace.rb |  2 +-
 ...hk_fix_namespace_id_for_work_item_parent_links.rb |  2 +-
 ...ue_sync_unlinked_security_policy_project_links.rb |  2 +-
 ...e_backfill_onboarding_status_setup_for_company.rb |  2 +-
 ..._finalize_hk_make_security_policy_bots_private.rb |  2 +-
 ...orphaned_vulnerability_notes_batched_migration.rb |  2 +-
 ...run_epic_dates_to_work_item_dates_sources_sync.rb |  2 +-
 ...ueue_backfill_finish_onboarding_for_group_saml.rb |  2 +-
 ...backfill_finish_onboarding_for_enterprise_user.rb |  2 +-
 ...15_finalize_hk_backfill_new_audit_event_tables.rb |  2 +-
 ...ueue_backfill_organization_id_on_fork_networks.rb |  2 +-
 ...ckfill_external_group_audit_event_destinations.rb |  2 +-
 ...backfill_amazon_group_audit_event_destinations.rb |  2 +-
 ...kfill_amazon_instance_audit_event_destinations.rb |  2 +-
 ...kfill_google_instance_audit_event_destinations.rb |  2 +-
 ...ill_external_instance_audit_event_destinations.rb |  2 +-
 ...backfill_google_group_audit_event_destinations.rb |  2 +-
 ...nalize_hk_backfill_members_request_accepted_at.rb |  2 +-
 ...kfill_subscription_add_on_purchases_started_at.rb |  2 +-
 ...314113948_remove_replicas_with_evicted_indices.rb |  2 +-
 .../20250317004525_remove_leftover_routes.rb         |  2 +-
 ...451_migrate_old_disabled_web_hook_to_new_state.rb |  2 +-
 .../20250317122642_fix_secureflag_description.rb     |  2 +-
 ...3121_backfill_merge_requests_id_columns_bigint.rb |  2 +-
 ..._queue_backfill_description_versions_namespace.rb |  2 +-
 ..._app_integration_for_jira_connect_subscription.rb |  2 +-
 ...204252_queue_backfill_approval_policy_rule_ids.rb |  2 +-
 ..._modules_metadata_for_semver_bigint_conversion.rb |  2 +-
 .../20250320142149_downgrade_organization_owners.rb  |  2 +-
 ...backfill_merge_request_diffs_id_columns_bigint.rb |  2 +-
 ...ct_usage_data_enabled_in_service_ping_settings.rb |  2 +-
 ...017_test_env_update_work_item_types_correct_id.rb |  2 +-
 ...onal_access_token_seven_days_notification_sent.rb |  2 +-
 ...ackfill_vs_code_settings_settings_context_hash.rb |  2 +-
 ..._external_group_audit_event_destinations_fixed.rb |  2 +-
 ...ternal_instance_audit_event_destinations_fixed.rb |  2 +-
 ...ll_amazon_group_audit_event_destinations_fixed.rb |  2 +-
 ...amazon_instance_audit_event_destinations_fixed.rb |  2 +-
 ...ll_google_group_audit_event_destinations_fixed.rb |  2 +-
 ...google_instance_audit_event_destinations_fixed.rb |  2 +-
 ..._hk_backfill_free_shared_runners_minutes_limit.rb |  2 +-
 ...250404130722_queue_backfill_lists_sharding_key.rb |  2 +-
 ...backfill_ci_job_live_trace_application_setting.rb |  2 +-
 .../20250408161158_remove_sprints_without_group.rb   |  2 +-
 ...ve_resource_iteration_events_without_iteration.rb |  2 +-
 ...ing_config_hashes_group_streaming_destinations.rb |  2 +-
 ..._config_hashes_instance_streaming_destinations.rb |  2 +-
 ...ackfill_resource_iteration_events_namespace_id.rb |  2 +-
 ...backfill_finish_onboarding_for_enterprise_user.rb |  2 +-
 ...lize_backfill_finish_onboarding_for_group_saml.rb |  2 +-
 ...516_add_incident_to_related_links_restrictions.rb |  2 +-
 ...lize_backfill_organization_id_on_fork_networks.rb |  2 +-
 ...module_metadata_semver_patch_bigint_conversion.rb |  2 +-
 ...20250415164706_queue_delete_twitter_identities.rb |  2 +-
 ...require_dpop_for_manage_api_endpoints_to_false.rb |  2 +-
 ...14_finalize_split_microsoft_applications_table.rb |  2 +-
 ...ll_git_push_pipeline_limit_application_setting.rb |  2 +-
 ...18164805_enable_ci_job_token_allowlist_setting.rb |  2 +-
 ...0422093734_outdate_namespace_descendants_cache.rb |  2 +-
 ...ckfill_compliance_framework_security_policy_id.rb |  2 +-
 ...ackfill_pipeline_execution_policy_config_links.rb |  2 +-
 ...eue_fix_incomplete_external_audit_destinations.rb |  2 +-
 ...ncomplete_instance_external_audit_destinations.rb |  2 +-
 ...nonymous_searches_flag_to_application_settings.rb |  2 +-
 ...k_backfill_issue_link_id_on_related_epic_links.rb |  2 +-
 ...queue_backfill_licenses_outside_spdx_catalogue.rb |  2 +-
 ..._global_push_rule_into_organization_push_rules.rb |  2 +-
 ...0250507154107_update_partitioning_app_settings.rb |  2 +-
 ..._mark_duplicate_maven_packages_for_destruction.rb |  2 +-
 ...ymous_searches_flag_to_application_settings_v2.rb |  2 +-
 ...517194243_queue_fix_non_existing_timelog_users.rb |  2 +-
 ...nalize_backfill_description_versions_namespace.rb |  2 +-
 ...519141223_finalize_backfill_lists_sharding_key.rb |  2 +-
 ...e_backfill_resource_milestone_events_namespace.rb |  2 +-
 ...ll_placeholder_users_details_from_source_users.rb |  2 +-
 ...t_proxy_secret_key_to_new_encryption_framework.rb |  2 +-
 ...20250528130903_backfill_board_user_preferences.rb |  2 +-
 ...et_work_item_type_wrong_hierarchy_restrictions.rb |  2 +-
 ...backfill_bulk_import_export_uploads_project_id.rb |  2 +-
 ...e_backfill_bulk_import_export_uploads_group_id.rb |  2 +-
 ...esign_management_designs_versions_namespace_id.rb |  2 +-
 ...ill_project_relation_export_uploads_project_id.rb |  2 +-
 ...20250529105143_remove_crm_widget_for_epic_type.rb |  2 +-
 ...emove_customer_relation_contacts_for_epic_type.rb |  2 +-
 ...ze_hk_create_missing_terraform_module_metadata.rb |  2 +-
 ...e_hk_update_status_for_deprecated_npm_packages.rb |  2 +-
 ...20250603125014_schedule_vulnerability_archival.rb |  2 +-
 ...50609164216_queue_backfill_partitioned_uploads.rb |  2 +-
 ...finalize_hk_delete_orphaned_project_namespaces.rb |  2 +-
 ...0609233305_finalize_hk_migrate_scim_identities.rb |  2 +-
 ...ueue_backfill_packages_composer_packages_table.rb |  2 +-
 ...20250611233222_finalize_hk_migrate_scim_tokens.rb |  2 +-
 ...igs_proxy_namespace_from_empty_hash_to_default.rb |  2 +-
 ...50617092550_expire_namespace_descendants_cache.rb |  2 +-
 ..._backfill_deployments_id_for_bigint_conversion.rb |  2 +-
 ...fill_deployment_clusters_for_bigint_conversion.rb |  2 +-
 ...queue_backfill_rolled_up_weight_for_work_items.rb |  2 +-
 ...ackfill_terraform_modules_metadata_with_semver.rb |  2 +-
 ...2740_queue_backfill_user_detail_onboarding_url.rb |  2 +-
 ...kfill_onboarding_status_registration_objective.rb |  2 +-
 ..._queue_backfill_epics_work_item_parent_link_id.rb |  2 +-
 ...roject_statuses_from_project_security_settings.rb |  4 ++--
 ..._queue_fix_secret_tokens_for_http_destinations.rb |  2 +-
 ..._backfill_epic_issues_work_item_parent_link_id.rb |  2 +-
 ...ue_backfill_resource_state_events_namespace_id.rb |  2 +-
 ...l_subscription_user_add_on_assignment_versions.rb |  2 +-
 ...kfill_onboarding_status_registration_objective.rb |  2 +-
 ...ackfill_terraform_modules_metadata_with_semver.rb |  2 +-
 ...05_finalize_hk_backfill_seat_assignments_table.rb |  2 +-
 ...335_finalize_hk_fix_usernamespace_audit_events.rb |  2 +-
 ...software_license_policies_with_custom_licenses.rb |  2 +-
 ...emove_backfill_rolled_up_weight_for_work_items.rb |  2 +-
 ...k_backfill_onboarding_status_setup_for_company.rb |  2 +-
 ..._for_vulnerability_findings_from_main_database.rb |  2 +-
 ...ckfill_compliance_violation_target_project_ids.rb |  2 +-
 ...ce_label_events_namespace_id_and_clean_invalid.rb |  2 +-
 ..._finalize_hk_create_missing_nuget_symbol_files.rb |  2 +-
 ...vulnerability_findings_jobs_from_main_database.rb |  2 +-
 ...ons_for_vulnerability_findings_to_sec_database.rb |  2 +-
 ...ue_backfill_rolled_up_weight_for_work_items_v2.rb |  2 +-
 ...hk_sync_unlinked_security_policy_project_links.rb |  2 +-
 ..._finalize_hk_backfill_approval_policy_rule_ids.rb |  2 +-
 ...17035404_finalize_partitioned_uploads_backfill.rb |  2 +-
 ...ackfill_resource_iteration_events_namespace_id.rb |  2 +-
 ...474_backfill_labels_with_group_project_missing.rb |  2 +-
 ...720210423_queue_backfill_clusters_sharding_key.rb |  2 +-
 ...ckfill_merge_request_context_commit_diff_files.rb |  2 +-
 ...ueue_delete_orphaned_security_policy_bot_users.rb |  2 +-
 ...221241_finalize_resource_state_events_backfill.rb |  2 +-
 ...fill_group_push_rules_from_push_rules_with_ids.rb |  2 +-
 ...ackfill_terraform_modules_metadata_with_semver.rb |  2 +-
 ...729134439_queue_backfill_licenses_outside_spdx.rb |  2 +-
 ...for_vulnerability_findings_from_main_database2.rb |  2 +-
 ...es_for_vulnerability_findings_to_sec_database2.rb |  2 +-
 ...250804140846_queue_fix_out_of_range_epic_dates.rb |  2 +-
 .../20250804193146_delete_orphaned_deploy_tokens.rb  |  2 +-
 ..._queue_reset_auto_duo_code_review_false_values.rb |  2 +-
 ...alize_merge_request_diffs_id_bigint_conversion.rb |  2 +-
 ...ue_backfill_rolled_up_weight_for_work_items_v3.rb |  2 +-
 ...211506_clean_sent_notifications_first_backfill.rb |  2 +-
 ...3200545_reschedule_sent_notifications_backfill.rb |  2 +-
 ...alize_backfill_licenses_outside_spdx_catalogue.rb |  2 +-
 ...819150000_queue_backfill_work_item_transitions.rb |  2 +-
 ...design_management_designs_project_namespace_id.rb |  2 +-
 ...n_management_repositories_project_namespace_id.rb |  2 +-
 ...2_set_sharding_key_for_remaining_deploy_tokens.rb |  2 +-
 ...er_type_for_human_users_personal_access_tokens.rb |  2 +-
 ...51_finalize_merge_request_id_bigint_conversion.rb |  2 +-
 ...kages_helm_metadata_caches_pending_destruction.rb |  2 +-
 ...ue_reset_duo_remote_flows_enabled_false_values.rb |  2 +-
 ...56_finalize_audit_event_destination_migrations.rb |  2 +-
 ...up_id_and_user_type_for_nonhuman_access_tokens.rb |  2 +-
 ...ckfill_compliance_framework_security_policy_id.rb |  2 +-
 ...08232216_finalize_hk_delete_twitter_identities.rb |  2 +-
 ...require_dpop_for_manage_api_endpoints_to_false.rb |  2 +-
 ...0915200517_queue_archive_authentication_events.rb |  2 +-
 ...ll_placeholder_users_details_from_source_users.rb |  2 +-
 ...916221001_queue_backfill_namespace_id_on_notes.rb |  2 +-
 ...115_finalize_hk_fix_non_existing_timelog_users.rb |  2 +-
 ..._backfill_epic_issues_work_item_parent_link_id.rb |  2 +-
 ...ing_config_hashes_group_streaming_destinations.rb |  2 +-
 ...ize_hk_backfill_epics_work_item_parent_link_id.rb |  2 +-
 ...er_type_for_human_users_personal_access_tokens.rb |  2 +-
 ...00000_remove_suggested_reviewers_bot_user_type.rb |  2 +-
 ...immediate_namespaces_deletion_to_false_on_saas.rb |  2 +-
 ..._config_hashes_instance_streaming_destinations.rb |  2 +-
 ...diate_namespaces_deletion_to_false_on_saas_bis.rb |  2 +-
 ...ue_recalculate_two_factor_enforcement_on_users.rb |  2 +-
 ...nil_desired_config_generator_version_workspace.rb |  2 +-
 ...1002112327_clean_timelogs_without_issue_and_mr.rb |  2 +-
 ...0251002115317_clean_timelogs_with_issue_and_mr.rb |  2 +-
 ...251002121105_queue_backfill_timelogs_namespace.rb |  2 +-
 ...2174401_enable_project_studio_for_team_members.rb |  2 +-
 ...l_subscription_user_add_on_assignment_versions.rb |  2 +-
 .../20251008144734_backfill_system_hook_org_id.rb    |  2 +-
 ...alize_backfill_resource_label_events_namespace.rb |  2 +-
 ...hk_backfill_sent_notifications_after_partition.rb |  2 +-
 doc/development/application_secrets.md               |  2 +-
 .../background_migration/batched_migration_spec.rb   | 12 ++++++------
 .../migration_helpers/restrict_gitlab_schema_spec.rb |  4 ++--
 spec/lib/gitlab/database/migration_helpers_spec.rb   |  2 +-
 .../batched_background_migration_helpers_spec.rb     |  6 +++---
 .../migrations/conversions/bigint_converter_spec.rb  |  2 +-
 spec/lib/gitlab/sidekiq_middleware/skip_jobs_spec.rb |  2 +-
 ...ackfill_packages_nuget_symbols_project_id_spec.rb |  2 +-
 ...29170331_queue_resync_has_vulnerabilities_spec.rb |  4 ++--
 ..._bot_user_details_bot_namespace_migration_spec.rb |  4 ++--
 ...ackfill_related_epic_links_to_issue_links_spec.rb |  4 ++--
 ...ue_backfill_work_item_hierarchy_for_epics_spec.rb |  4 ++--
 ...l_epic_issues_into_work_item_parent_links_spec.rb |  4 ++--
 ...603_queue_backfill_seat_assignments_table_spec.rb |  2 +-
 ..._delete_duplicate_issuable_resource_links_spec.rb |  4 ++--
 ...rial_gitlab_subscriptions_date_attributes_spec.rb |  2 +-
 ...124301_requeue_backfill_security_policies_spec.rb |  2 +-
 ..._create_missing_terraform_module_metadata_spec.rb |  4 ++--
 ...are_license_policies_with_custom_licenses_spec.rb |  2 +-
 ..._queue_delete_orphaned_project_namespaces_spec.rb |  2 +-
 ...ithout_spdx_identifier_to_custom_licenses_spec.rb |  2 +-
 ...update_status_for_deprecated_npm_packages_spec.rb |  4 ++--
 ...kfill_issue_link_id_on_related_epic_links_spec.rb |  4 ++--
 ..._subscription_add_on_purchases_started_at_spec.rb |  4 ++--
 ...queue_backfill_group_wiki_activity_events_spec.rb |  4 ++--
 ...e_requeue_backfill_seat_assignments_table_spec.rb |  2 +-
 ..._duplicate_maven_packages_for_destruction_spec.rb |  4 ++--
 ...144523_queue_skip_company_onboarding_step_spec.rb |  4 ++--
 ...4021_queue_fix_usernamespace_audit_events_spec.rb |  4 ++--
 ...queue_fix_issues_work_item_type_id_values_spec.rb |  2 +-
 ...50106175246_queue_migrate_scim_identities_spec.rb |  4 ++--
 .../20250107143450_queue_migrate_scim_tokens_spec.rb |  4 ++--
 ...2_requeue_backfill_seat_assignments_table_spec.rb |  4 ++--
 ...ll_vs_code_settings_settings_context_hash_spec.rb |  4 ++--
 ...0_delete_boards_without_project_and_group_spec.rb |  2 +-
 ...3195100_fix_boards_with_project_and_group_spec.rb |  2 +-
 ..._backfill_sharding_key_on_board_assignees_spec.rb |  2 +-
 ..._queue_split_microsoft_applications_table_spec.rb |  4 ++--
 ...50129135025_seed_cloud_connector_keys_new_spec.rb |  2 +-
 ...ackage_protection_rules_on_down_migration_spec.rb |  2 +-
 ...elete_milestones_without_project_or_group_spec.rb |  2 +-
 ...ix_milestones_with_with_project_and_group_spec.rb |  2 +-
 ...olation_null_target_project_ids_migration_spec.rb |  4 ++--
 ...8_queue_create_missing_nuget_symbol_files_spec.rb |  4 ++--
 ..._pipeline_execution_policies_config_links_spec.rb |  2 +-
 ...925_backfill_sharding_key_on_board_labels_spec.rb |  2 +-
 ..._queue_backfill_software_license_policies_spec.rb |  2 +-
 ...l_external_group_audit_event_destinations_spec.rb |  2 +-
 ...xternal_instance_audit_event_destinations_spec.rb |  2 +-
 ...ill_google_group_audit_event_destinations_spec.rb |  2 +-
 ..._google_instance_audit_event_destinations_spec.rb |  2 +-
 ...ill_amazon_group_audit_event_destinations_spec.rb |  2 +-
 ..._amazon_instance_audit_event_destinations_spec.rb |  2 +-
 ...0_queue_backfill_approval_policy_rule_ids_spec.rb |  4 ++--
 ...kfill_resource_milestone_events_namespace_spec.rb |  4 ++--
 ...nc_unlinked_security_policy_project_links_spec.rb |  2 +-
 ...kfill_onboarding_status_setup_for_company_spec.rb |  2 +-
 ...ned_vulnerability_notes_batched_migration_spec.rb |  4 ++--
 ...backfill_organization_id_on_fork_networks_spec.rb |  4 ++--
 ...e_backfill_description_versions_namespace_spec.rb |  4 ++--
 ...h_null_namespace_id_from_seat_assignments_spec.rb |  2 +-
 ...move_deployment_data_from_pages_metadatum_spec.rb |  2 +-
 ...l_compliance_framework_security_policy_id_spec.rb |  4 ++--
 ...rnal_group_audit_event_destinations_fixed_spec.rb |  2 +-
 ...l_instance_audit_event_destinations_fixed_spec.rb |  2 +-
 ...azon_group_audit_event_destinations_fixed_spec.rb |  4 ++--
 ...n_instance_audit_event_destinations_fixed_spec.rb |  4 ++--
 ...ogle_group_audit_event_destinations_fixed_spec.rb |  4 ++--
 ...e_instance_audit_event_destinations_fixed_spec.rb |  4 ++--
 ...4130722_queue_backfill_lists_sharding_key_spec.rb |  4 ++--
 ...onfig_hashes_group_streaming_destinations_spec.rb |  4 ++--
 ...ig_hashes_instance_streaming_destinations_spec.rb |  4 ++--
 ...250409161158_remove_sprints_without_group_spec.rb |  2 +-
 ...source_iteration_events_without_iteration_spec.rb |  2 +-
 ...ll_resource_iteration_events_namespace_id_spec.rb |  4 ++--
 ...415164706_queue_delete_twitter_identities_spec.rb |  4 ++--
 ...re_dpop_for_manage_api_endpoints_to_false_spec.rb |  4 ++--
 ...ix_incomplete_external_audit_destinations_spec.rb |  4 ++--
 ...lete_instance_external_audit_destinations_spec.rb |  4 ++--
 ..._backfill_licenses_outside_spdx_catalogue_spec.rb |  2 +-
 ...4243_queue_fix_non_existing_timelog_users_spec.rb |  4 ++--
 ...aceholder_users_details_from_source_users_spec.rb |  4 ++--
 ...528130903_backfill_board_user_preferences_spec.rb |  2 +-
 ..._customer_relation_contacts_for_epic_type_spec.rb |  2 +-
 ...backfill_packages_composer_packages_table_spec.rb |  4 ++--
 ...ll_terraform_modules_metadata_with_semver_spec.rb |  2 +-
 ...queue_backfill_user_detail_onboarding_url_spec.rb |  2 +-
 ...e_backfill_epics_work_item_parent_link_id_spec.rb |  4 ++--
 ...t_statuses_from_project_security_settings_spec.rb |  4 ++--
 ...e_fix_secret_tokens_for_http_destinations_spec.rb |  4 ++--
 ...fill_epic_issues_work_item_parent_link_id_spec.rb |  4 ++--
 ...ckfill_resource_state_events_namespace_id_spec.rb |  4 ++--
 ...scription_user_add_on_assignment_versions_spec.rb |  2 +-
 ...ll_terraform_modules_metadata_with_semver_spec.rb |  4 ++--
 ...bel_events_namespace_id_and_clean_invalid_spec.rb |  4 ++--
 ...ackfill_labels_with_group_project_missing_spec.rb |  2 +-
 ...0423_queue_backfill_clusters_sharding_key_spec.rb |  4 ++--
 ...group_push_rules_from_push_rules_with_ids_spec.rb |  4 ++--
 ...4439_queue_backfill_licenses_outside_spdx_spec.rb |  2 +-
 ...4140846_queue_fix_out_of_range_epic_dates_spec.rb |  4 ++--
 ...ckfill_rolled_up_weight_for_work_items_v3_spec.rb |  2 +-
 ...45_reschedule_sent_notifications_backfill_spec.rb |  6 +++---
 ...0000_queue_backfill_work_item_transitions_spec.rb |  2 +-
 ...n_management_designs_project_namespace_id_spec.rb |  4 ++--
 ...agement_repositories_project_namespace_id_spec.rb |  4 ++--
 ...93504_queue_archive_authentication_events_spec.rb |  4 ++--
 ..._helm_metadata_caches_pending_destruction_spec.rb |  4 ++--
 ...scription_user_add_on_assignment_versions_spec.rb |  4 ++--
 ...set_duo_remote_flows_enabled_false_values_spec.rb |  2 +-
 ...ue_cleanup_terminated_bulk_import_configs_spec.rb |  2 +-
 ...calculate_two_factor_enforcement_on_users_spec.rb |  4 ++--
 ..._and_user_type_for_nonhuman_access_tokens_spec.rb |  4 ++--
 ...pe_for_human_users_personal_access_tokens_spec.rb |  4 ++--
 ...0250923000001_create_namespace_isolations_spec.rb |  2 +-
 ...0923000002_create_organization_isolations_spec.rb |  2 +-
 ...fill_partitioned_project_daily_statistics_spec.rb |  2 +-
 ..._project_from_project_saved_replies_table_spec.rb |  2 +-
 ...ault_scan_execution_policies_action_limit_spec.rb |  2 +-
 ..._create_trigger_on_project_authorizations_spec.rb |  2 +-
 .../20240815172551_remove_visual_review_bot_spec.rb  |  2 +-
 ...catalog_resource_versions_published_by_id_spec.rb |  2 +-
 .../20240906133040_fix_non_nullable_snippets_spec.rb |  2 +-
 ...23090549_fix_inconsistent_organization_id_spec.rb |  2 +-
 ...0125718_update_namespaces_organization_id_spec.rb |  2 +-
 ..._spdx_identifier_to_custom_licenses_table_spec.rb |  2 +-
 .../20241127210044_backfill_user_details_spec.rb     |  2 +-
 ..._organization_id_for_bulk_import_entities_spec.rb |  2 +-
 ...36_update_import_failures_organization_id_spec.rb |  2 +-
 ...3948_remove_replicas_with_evicted_indices_spec.rb |  2 +-
 ...3527_set_organization_id_for_bulk_imports_spec.rb |  2 +-
 ...93734_outdate_namespace_descendants_cache_spec.rb |  2 +-
 ...xy_secret_key_to_new_encryption_framework_spec.rb |  2 +-
 ...092550_expire_namespace_descendants_cache_spec.rb |  2 +-
 ...ate_ai_duo_chat_events_to_ai_usage_events_spec.rb |  2 +-
 ...roubleshoot_job_events_to_ai_usage_events_spec.rb |  2 +-
 .../queue_backfill_partitioned_uploads_spec.rb       |  2 +-
 ...e_reset_auto_duo_code_review_false_values_spec.rb |  2 +-
 705 files changed, 777 insertions(+), 777 deletions(-)

diff --git a/.gitlab/issue_templates/Geo Replicate a new Git repository type.md b/.gitlab/issue_templates/Geo Replicate a new Git repository type.md
index 29fa092a091686..aa4d5d0521e60d 100644
--- a/.gitlab/issue_templates/Geo Replicate a new Git repository type.md	
+++ b/.gitlab/issue_templates/Geo Replicate a new Git repository type.md	
@@ -196,7 +196,7 @@ The Geo primary site needs to checksum every replicable so secondaries can verif
    - geo_replication
   classes:
    - Geo::CoolWidgetState
-  gitlab_schema: gitlab_main
+  gitlab_schema: gitlab_main_org
   ```
 
 - [ ] Run database migrations:
diff --git a/.gitlab/issue_templates/Geo Replicate a new blob type.md b/.gitlab/issue_templates/Geo Replicate a new blob type.md
index c83ef9a4f3ee5a..94492f8b1384fd 100644
--- a/.gitlab/issue_templates/Geo Replicate a new blob type.md	
+++ b/.gitlab/issue_templates/Geo Replicate a new blob type.md	
@@ -199,7 +199,7 @@ The Geo primary site needs to checksum every replicable so secondaries can verif
    - geo_replication
   classes:
    - Geo::CoolWidgetState
-  gitlab_schema: gitlab_main
+  gitlab_schema: gitlab_main_org
   ```
 
 - [ ] Run database migrations:
diff --git a/db/docs/abuse_report_notes.yml b/db/docs/abuse_report_notes.yml
index e37d388c03ab03..f4eeb47539c3e7 100644
--- a/db/docs/abuse_report_notes.yml
+++ b/db/docs/abuse_report_notes.yml
@@ -8,6 +8,6 @@ feature_categories:
 description: Stores notes and discussions around abuse reports
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156146
 milestone: '17.2'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 table_size: small
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/553432
diff --git a/db/docs/abuse_report_uploads.yml b/db/docs/abuse_report_uploads.yml
index a8dd2da747636b..c965d22c858ba8 100644
--- a/db/docs/abuse_report_uploads.yml
+++ b/db/docs/abuse_report_uploads.yml
@@ -8,6 +8,6 @@ feature_categories:
 description: Stores uploads for AbuseReport model
 introduced_by_url:
 milestone: '17.11'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 table_size: small
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/553433
diff --git a/db/docs/ai_settings.yml b/db/docs/ai_settings.yml
index 180811d146bc55..52e3f58bdae433 100644
--- a/db/docs/ai_settings.yml
+++ b/db/docs/ai_settings.yml
@@ -7,6 +7,6 @@ feature_categories:
 description: Stores instance-wide AI-related settings
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/172007
 milestone: '17.6'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 table_size: small
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/557293
diff --git a/db/docs/deleted_tables/abuse_report_assignees.yml b/db/docs/deleted_tables/abuse_report_assignees.yml
index 1cd221f6d9e399..bcb98d0e880581 100644
--- a/db/docs/deleted_tables/abuse_report_assignees.yml
+++ b/db/docs/deleted_tables/abuse_report_assignees.yml
@@ -7,7 +7,7 @@ feature_categories:
 description: Stores information linking abuse reports and users (assignee)
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/134240
 milestone: '16.7'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 table_size: small
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/553428
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/207614
diff --git a/db/docs/deleted_tables/abuse_report_label_links.yml b/db/docs/deleted_tables/abuse_report_label_links.yml
index c7cb1629db267a..82b1847d10d07e 100644
--- a/db/docs/deleted_tables/abuse_report_label_links.yml
+++ b/db/docs/deleted_tables/abuse_report_label_links.yml
@@ -7,7 +7,7 @@ feature_categories:
 description: Links between abuse report labels and abuse reports
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/168186
 milestone: '17.6'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 table_size: small
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/553430
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/205292
diff --git a/db/docs/deleted_tables/abuse_report_labels.yml b/db/docs/deleted_tables/abuse_report_labels.yml
index eae3a6a05536de..f25852839119ff 100644
--- a/db/docs/deleted_tables/abuse_report_labels.yml
+++ b/db/docs/deleted_tables/abuse_report_labels.yml
@@ -7,7 +7,7 @@ feature_categories:
 description: Stores labels for abuse reports
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/168186
 milestone: '17.6'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 table_size: small
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/553431
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/205292
diff --git a/db/docs/deleted_tables/airflow_dags.yml b/db/docs/deleted_tables/airflow_dags.yml
index 4942e71d3bf415..b3e643654c68e8 100644
--- a/db/docs/deleted_tables/airflow_dags.yml
+++ b/db/docs/deleted_tables/airflow_dags.yml
@@ -7,6 +7,6 @@ feature_categories:
 description: An Airflow DAG is a record of the current status of a DAG from an Airflow instance
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108900
 milestone: '15.9'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112192
 removed_in_milestone: '15.10'
diff --git a/db/docs/deleted_tables/alerts_service_data.yml b/db/docs/deleted_tables/alerts_service_data.yml
index 46cef40c4c54cd..f7165e4334dbc2 100644
--- a/db/docs/deleted_tables/alerts_service_data.yml
+++ b/db/docs/deleted_tables/alerts_service_data.yml
@@ -1,6 +1,6 @@
 ---
 table_name: alerts_service_data
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 feature_categories: []
 description: TODO
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/16607
diff --git a/db/docs/deleted_tables/analytics_cycle_analytics_project_stages.yml b/db/docs/deleted_tables/analytics_cycle_analytics_project_stages.yml
index 75e1d307d596f6..ae4ed71ac1c4a1 100644
--- a/db/docs/deleted_tables/analytics_cycle_analytics_project_stages.yml
+++ b/db/docs/deleted_tables/analytics_cycle_analytics_project_stages.yml
@@ -6,6 +6,6 @@ feature_categories:
 description: Persists project level value stream analytics stages. Scheduled for removal in https://gitlab.com/gitlab-org/gitlab/-/issues/390194
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/15061
 milestone: '12.2'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118980
 removed_in_milestone: '16.0'
diff --git a/db/docs/deleted_tables/analytics_cycle_analytics_project_value_streams.yml b/db/docs/deleted_tables/analytics_cycle_analytics_project_value_streams.yml
index 8fbaf68ec7f141..f875e6bbb3df80 100644
--- a/db/docs/deleted_tables/analytics_cycle_analytics_project_value_streams.yml
+++ b/db/docs/deleted_tables/analytics_cycle_analytics_project_value_streams.yml
@@ -6,6 +6,6 @@ feature_categories:
 description: Used to store the value stream configurations for projects. Scheduled for removal in https://gitlab.com/gitlab-org/gitlab/-/issues/390194
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60925
 milestone: '13.12'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118980
 removed_in_milestone: '16.0'
diff --git a/db/docs/deleted_tables/analytics_devops_adoption_segment_selections.yml b/db/docs/deleted_tables/analytics_devops_adoption_segment_selections.yml
index 90008e3e68b8fc..81d2ceca16e5c8 100644
--- a/db/docs/deleted_tables/analytics_devops_adoption_segment_selections.yml
+++ b/db/docs/deleted_tables/analytics_devops_adoption_segment_selections.yml
@@ -1,6 +1,6 @@
 ---
 table_name: analytics_devops_adoption_segment_selections
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 feature_categories: []
 description: TODO
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45748
diff --git a/db/docs/deleted_tables/analytics_repository_file_commits.yml b/db/docs/deleted_tables/analytics_repository_file_commits.yml
index 93a18171f02f58..9afd6758a13b52 100644
--- a/db/docs/deleted_tables/analytics_repository_file_commits.yml
+++ b/db/docs/deleted_tables/analytics_repository_file_commits.yml
@@ -1,6 +1,6 @@
 ---
 table_name: analytics_repository_file_commits
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 feature_categories: []
 description: TODO
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/17277
diff --git a/db/docs/deleted_tables/analytics_repository_file_edits.yml b/db/docs/deleted_tables/analytics_repository_file_edits.yml
index 58f66fb88ca676..f796cfe38555f4 100644
--- a/db/docs/deleted_tables/analytics_repository_file_edits.yml
+++ b/db/docs/deleted_tables/analytics_repository_file_edits.yml
@@ -1,6 +1,6 @@
 ---
 table_name: analytics_repository_file_edits
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 feature_categories: []
 description: TODO
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/17277
diff --git a/db/docs/deleted_tables/analytics_repository_files.yml b/db/docs/deleted_tables/analytics_repository_files.yml
index ae02c3aa29d84d..bc8e8f0a6cd7a9 100644
--- a/db/docs/deleted_tables/analytics_repository_files.yml
+++ b/db/docs/deleted_tables/analytics_repository_files.yml
@@ -1,6 +1,6 @@
 ---
 table_name: analytics_repository_files
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 feature_categories: []
 description: TODO
 introduced_by_url: TODO
diff --git a/db/docs/deleted_tables/audit_events_archived.yml b/db/docs/deleted_tables/audit_events_archived.yml
index 6f94a8e4466beb..9e65ffbca5d237 100644
--- a/db/docs/deleted_tables/audit_events_archived.yml
+++ b/db/docs/deleted_tables/audit_events_archived.yml
@@ -1,6 +1,6 @@
 ---
 table_name: audit_events_archived
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 feature_categories: []
 description: TODO
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44655
diff --git a/db/docs/deleted_tables/audit_events_part_5fc467ac26.yml b/db/docs/deleted_tables/audit_events_part_5fc467ac26.yml
index 86d27af6f34173..5b521ab1b9d664 100644
--- a/db/docs/deleted_tables/audit_events_part_5fc467ac26.yml
+++ b/db/docs/deleted_tables/audit_events_part_5fc467ac26.yml
@@ -1,6 +1,6 @@
 ---
 table_name: audit_events_part_5fc467ac26
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 feature_categories: []
 description: TODO
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/36298
diff --git a/db/docs/deleted_tables/backup_labels.yml b/db/docs/deleted_tables/backup_labels.yml
index 52a092aca7bbcf..5f0ef89266fcab 100644
--- a/db/docs/deleted_tables/backup_labels.yml
+++ b/db/docs/deleted_tables/backup_labels.yml
@@ -1,6 +1,6 @@
 ---
 table_name: backup_labels
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 feature_categories: []
 description: TODO
 introduced_by_url: TODO
diff --git a/db/docs/deleted_tables/clusters_applications_cert_managers.yml b/db/docs/deleted_tables/clusters_applications_cert_managers.yml
index cdf170d2a89806..63fbd824be5b7e 100644
--- a/db/docs/deleted_tables/clusters_applications_cert_managers.yml
+++ b/db/docs/deleted_tables/clusters_applications_cert_managers.yml
@@ -5,6 +5,6 @@ feature_categories:
 description: "(Deprecated) A GitLab managed cert-manager installation in a Kubernetes cluster"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/8837519445c319a699e0f3ced1c6912c839f3389
 milestone: '11.6'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119238
-removed_in_milestone: '16.0'
\ No newline at end of file
+removed_in_milestone: '16.0'
diff --git a/db/docs/deleted_tables/clusters_applications_cilium.yml b/db/docs/deleted_tables/clusters_applications_cilium.yml
index 0dd4be4f94fd5c..470b7917677726 100644
--- a/db/docs/deleted_tables/clusters_applications_cilium.yml
+++ b/db/docs/deleted_tables/clusters_applications_cilium.yml
@@ -5,6 +5,6 @@ feature_categories:
 description: Information about installed instance of Cilium in the cluster
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/34601
 milestone: '13.2'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119332
 removed_in_milestone: '16.0'
diff --git a/db/docs/deleted_tables/clusters_applications_crossplane.yml b/db/docs/deleted_tables/clusters_applications_crossplane.yml
index 9e0ec4828d48b9..5d4352abb631e3 100644
--- a/db/docs/deleted_tables/clusters_applications_crossplane.yml
+++ b/db/docs/deleted_tables/clusters_applications_crossplane.yml
@@ -5,6 +5,6 @@ feature_categories:
 description: "(Deprecated) A GitLab managed Crossplane installation in a Kubernetes cluster"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18797
 milestone: '12.5'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119361
 removed_in_milestone: '16.0'
diff --git a/db/docs/deleted_tables/clusters_applications_elastic_stacks.yml b/db/docs/deleted_tables/clusters_applications_elastic_stacks.yml
index 931b8ed9aadcb7..f2472288f4500d 100644
--- a/db/docs/deleted_tables/clusters_applications_elastic_stacks.yml
+++ b/db/docs/deleted_tables/clusters_applications_elastic_stacks.yml
@@ -7,6 +7,6 @@ feature_categories:
 description: (Deprecated) A GitLab managed Elastic Stack installation in a Kubernetes cluster
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18015
 milestone: '12.5'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91859
 removed_in_milestone: '15.2'
diff --git a/db/docs/deleted_tables/clusters_applications_fluentd.yml b/db/docs/deleted_tables/clusters_applications_fluentd.yml
index 4f481290cc6355..a966f844d425ac 100644
--- a/db/docs/deleted_tables/clusters_applications_fluentd.yml
+++ b/db/docs/deleted_tables/clusters_applications_fluentd.yml
@@ -1,6 +1,6 @@
 ---
 table_name: clusters_applications_fluentd
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 feature_categories: []
 description: TODO
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/28844
diff --git a/db/docs/deleted_tables/clusters_applications_helm.yml b/db/docs/deleted_tables/clusters_applications_helm.yml
index 5011a6dd3e1f90..5c953d423bf303 100644
--- a/db/docs/deleted_tables/clusters_applications_helm.yml
+++ b/db/docs/deleted_tables/clusters_applications_helm.yml
@@ -5,6 +5,6 @@ feature_categories:
 description: "(Deprecated) A GitLab managed Helm installation in a Kubernetes cluster"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/64be8d70ae20928df351e495a3442bb6036bc3e7
 milestone: '10.2'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119380
 removed_in_milestone: '16.0'
diff --git a/db/docs/deleted_tables/clusters_applications_ingress.yml b/db/docs/deleted_tables/clusters_applications_ingress.yml
index d06486f37a49e0..10cd705a69f5cd 100644
--- a/db/docs/deleted_tables/clusters_applications_ingress.yml
+++ b/db/docs/deleted_tables/clusters_applications_ingress.yml
@@ -5,6 +5,6 @@ feature_categories:
 description: "(Deprecated) A GitLab managed Ingress installation in a Kubernetes cluster"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/d8223468ae2ae061020cc26336c51dc93cc75571
 milestone: '10.2'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119386
 removed_in_milestone: '16.0'
diff --git a/db/docs/deleted_tables/clusters_applications_jupyter.yml b/db/docs/deleted_tables/clusters_applications_jupyter.yml
index 539cba27bd9388..2c3f5453927961 100644
--- a/db/docs/deleted_tables/clusters_applications_jupyter.yml
+++ b/db/docs/deleted_tables/clusters_applications_jupyter.yml
@@ -5,6 +5,6 @@ feature_categories:
 description: "(Deprecated) A GitLab managed Jupyter installation in a Kubernetes cluster"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/db9f765852d9fef464e69c0bf47a382f2ab7219d
 milestone: '11.0'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119469
 removed_in_milestone: '16.0'
diff --git a/db/docs/deleted_tables/clusters_applications_knative.yml b/db/docs/deleted_tables/clusters_applications_knative.yml
index 666f126f022f7a..5732c89fd9ae15 100644
--- a/db/docs/deleted_tables/clusters_applications_knative.yml
+++ b/db/docs/deleted_tables/clusters_applications_knative.yml
@@ -5,6 +5,6 @@ feature_categories:
 description: "(Deprecated) A GitLab managed Knative installation in a Kubernetes cluster"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/b5155b90ee233e2824c168fbb06b3ce5d3aeb194
 milestone: '11.5'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119515
 removed_in_milestone: '16.0'
diff --git a/db/docs/deleted_tables/clusters_applications_prometheus.yml b/db/docs/deleted_tables/clusters_applications_prometheus.yml
index eb33a41e181ec0..e7d3d404cdd711 100644
--- a/db/docs/deleted_tables/clusters_applications_prometheus.yml
+++ b/db/docs/deleted_tables/clusters_applications_prometheus.yml
@@ -5,6 +5,6 @@ feature_categories:
 description: Information about installed instance of Prometheus in the cluster
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/0d4548026f3060ca0a8f7aa8d8fc89838bc66130
 milestone: '10.4'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119533
 removed_in_milestone: '16.0'
diff --git a/db/docs/deleted_tables/clusters_applications_runners.yml b/db/docs/deleted_tables/clusters_applications_runners.yml
index e849e9d12c63b9..1e00f05777b524 100644
--- a/db/docs/deleted_tables/clusters_applications_runners.yml
+++ b/db/docs/deleted_tables/clusters_applications_runners.yml
@@ -5,6 +5,6 @@ feature_categories:
 description: "(Deprecated) A GitLab managed Runner installation in a Kubernetes cluster"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/c607008ee55e35465e04a938a341f2f24cb6761f
 milestone: '10.6'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119540
 removed_in_milestone: '16.0'
diff --git a/db/docs/deleted_tables/clusters_integration_elasticstack.yml b/db/docs/deleted_tables/clusters_integration_elasticstack.yml
index f52db5d797cc9f..54f04d8ce42182 100644
--- a/db/docs/deleted_tables/clusters_integration_elasticstack.yml
+++ b/db/docs/deleted_tables/clusters_integration_elasticstack.yml
@@ -7,6 +7,6 @@ feature_categories:
 description:
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61077
 milestone: '13.12'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91859
 removed_in_milestone: '15.2'
diff --git a/db/docs/deleted_tables/dast_scanner_profiles_tags.yml b/db/docs/deleted_tables/dast_scanner_profiles_tags.yml
index 1c1614c8a67f35..f27ab3433b9a74 100644
--- a/db/docs/deleted_tables/dast_scanner_profiles_tags.yml
+++ b/db/docs/deleted_tables/dast_scanner_profiles_tags.yml
@@ -8,4 +8,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104909
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/153443
 milestone: '15.7'
 removed_in_milestone: '17.2'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
diff --git a/db/docs/deleted_tables/dast_site_profiles_pipelines.yml b/db/docs/deleted_tables/dast_site_profiles_pipelines.yml
index f32ca7bed3485f..aada43e58c825c 100644
--- a/db/docs/deleted_tables/dast_site_profiles_pipelines.yml
+++ b/db/docs/deleted_tables/dast_site_profiles_pipelines.yml
@@ -8,4 +8,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60090
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/153443
 milestone: '13.12'
 removed_in_milestone: '17.2'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
diff --git a/db/docs/deleted_tables/experiment_subjects.yml b/db/docs/deleted_tables/experiment_subjects.yml
index cf595bf92f496a..8c0c48926d6d8e 100644
--- a/db/docs/deleted_tables/experiment_subjects.yml
+++ b/db/docs/deleted_tables/experiment_subjects.yml
@@ -7,6 +7,6 @@ feature_categories:
 description:
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47042
 milestone: '13.7'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103933
 removed_in_milestone: '15.7'
diff --git a/db/docs/deleted_tables/experiment_users.yml b/db/docs/deleted_tables/experiment_users.yml
index 73726e1213668a..fb6463f4c8969f 100644
--- a/db/docs/deleted_tables/experiment_users.yml
+++ b/db/docs/deleted_tables/experiment_users.yml
@@ -7,6 +7,6 @@ feature_categories:
 description:
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38397
 milestone: '13.3'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102337
 removed_in_milestone: '15.6'
diff --git a/db/docs/deleted_tables/experiments.yml b/db/docs/deleted_tables/experiments.yml
index c1bf04779c885a..1f2d88db68981d 100644
--- a/db/docs/deleted_tables/experiments.yml
+++ b/db/docs/deleted_tables/experiments.yml
@@ -7,6 +7,6 @@ feature_categories:
 description:
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38397
 milestone: '13.3'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103933
 removed_in_milestone: '15.7'
diff --git a/db/docs/deleted_tables/external_approval_rules_protected_branches.yml b/db/docs/deleted_tables/external_approval_rules_protected_branches.yml
index 74dfc5e5f619a0..8d74c3fda47e8c 100644
--- a/db/docs/deleted_tables/external_approval_rules_protected_branches.yml
+++ b/db/docs/deleted_tables/external_approval_rules_protected_branches.yml
@@ -6,6 +6,6 @@ feature_categories:
 description: Keeps relation between protected branches and external approval rules
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54002
 milestone: '13.10'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/148853
 removed_in_milestone: '17.0'
diff --git a/db/docs/deleted_tables/forked_project_links.yml b/db/docs/deleted_tables/forked_project_links.yml
index a83391f434036a..5c47e3730edda6 100644
--- a/db/docs/deleted_tables/forked_project_links.yml
+++ b/db/docs/deleted_tables/forked_project_links.yml
@@ -1,6 +1,6 @@
 ---
 table_name: forked_project_links
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 feature_categories: []
 description: TODO
 introduced_by_url: TODO
diff --git a/db/docs/deleted_tables/geo_container_repository_updated_events.yml b/db/docs/deleted_tables/geo_container_repository_updated_events.yml
index db0a3d0ccf718f..eb89752d27645a 100644
--- a/db/docs/deleted_tables/geo_container_repository_updated_events.yml
+++ b/db/docs/deleted_tables/geo_container_repository_updated_events.yml
@@ -7,6 +7,6 @@ feature_categories:
 description:
 introduced_by_url:
 milestone:
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107732
 removed_in_milestone: '15.8'
diff --git a/db/docs/deleted_tables/geo_job_artifact_deleted_events.yml b/db/docs/deleted_tables/geo_job_artifact_deleted_events.yml
index 3df5d7c253efc1..a32f517ddc3152 100644
--- a/db/docs/deleted_tables/geo_job_artifact_deleted_events.yml
+++ b/db/docs/deleted_tables/geo_job_artifact_deleted_events.yml
@@ -7,6 +7,6 @@ feature_categories:
 description:
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/3935
 milestone: '10.4'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85219
 removed_in_milestone: '15.0'
diff --git a/db/docs/deleted_tables/geo_lfs_object_deleted_events.yml b/db/docs/deleted_tables/geo_lfs_object_deleted_events.yml
index d4f1633d8128bc..469a4eac5bef91 100644
--- a/db/docs/deleted_tables/geo_lfs_object_deleted_events.yml
+++ b/db/docs/deleted_tables/geo_lfs_object_deleted_events.yml
@@ -6,6 +6,6 @@ feature_categories:
 description: Geo event for when an LFS object gets deleted, belongs to geo_event_log.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/3481
 milestone: '10.2'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88257
 removed_in_milestone: '15.1'
diff --git a/db/docs/deleted_tables/group_deploy_keys.yml b/db/docs/deleted_tables/group_deploy_keys.yml
index a14bb245e7c649..91400678430725 100644
--- a/db/docs/deleted_tables/group_deploy_keys.yml
+++ b/db/docs/deleted_tables/group_deploy_keys.yml
@@ -7,7 +7,7 @@ feature_categories:
 description: https://docs.gitlab.com/ee/user/project/deploy_keys/
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/30886
 milestone: '13.1'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 table_size: small
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/203576
 removed_in_milestone: '18.4'
diff --git a/db/docs/deleted_tables/group_deploy_keys_groups.yml b/db/docs/deleted_tables/group_deploy_keys_groups.yml
index 0a7df5cec94d56..31cb865b7a4192 100644
--- a/db/docs/deleted_tables/group_deploy_keys_groups.yml
+++ b/db/docs/deleted_tables/group_deploy_keys_groups.yml
@@ -7,7 +7,7 @@ feature_categories:
 description: https://docs.gitlab.com/ee/user/project/deploy_keys/
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/32901
 milestone: '13.2'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 table_size: small
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/203576
 removed_in_milestone: '18.4'
diff --git a/db/docs/deleted_tables/in_product_marketing_emails.yml b/db/docs/deleted_tables/in_product_marketing_emails.yml
index e36a4546ff4fea..5810f51172e8e9 100644
--- a/db/docs/deleted_tables/in_product_marketing_emails.yml
+++ b/db/docs/deleted_tables/in_product_marketing_emails.yml
@@ -9,4 +9,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55840
 milestone: '13.10'
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138835
 removed_in_milestone: '16.8'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
diff --git a/db/docs/deleted_tables/issue_milestones.yml b/db/docs/deleted_tables/issue_milestones.yml
index 7e18cd12f7c2f4..9d82f20a54228c 100644
--- a/db/docs/deleted_tables/issue_milestones.yml
+++ b/db/docs/deleted_tables/issue_milestones.yml
@@ -1,6 +1,6 @@
 ---
 table_name: issue_milestones
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 feature_categories: []
 description: TODO
 introduced_by_url: TODO
diff --git a/db/docs/deleted_tables/issues_prometheus_alert_events.yml b/db/docs/deleted_tables/issues_prometheus_alert_events.yml
index 71055b35c8accf..ea880e1ce2288d 100644
--- a/db/docs/deleted_tables/issues_prometheus_alert_events.yml
+++ b/db/docs/deleted_tables/issues_prometheus_alert_events.yml
@@ -7,7 +7,7 @@ description: Adds relationship between PrometheusAlertEvent and issues created d
   to them
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/17477
 milestone: '12.4'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/461838 # table is scheduled to be dropped
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/164288
 removed_in_milestone: '17.4'
diff --git a/db/docs/deleted_tables/issues_self_managed_prometheus_alert_events.yml b/db/docs/deleted_tables/issues_self_managed_prometheus_alert_events.yml
index 03a3411be91c9a..6187ebaeba90ed 100644
--- a/db/docs/deleted_tables/issues_self_managed_prometheus_alert_events.yml
+++ b/db/docs/deleted_tables/issues_self_managed_prometheus_alert_events.yml
@@ -7,7 +7,7 @@ description: Adds associations between Issues table and Prometheus alerts from s
   Prometheus instances
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18046
 milestone: '12.4'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/461838 # table is scheduled to be dropped
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/164288
 removed_in_milestone: '17.4'
diff --git a/db/docs/deleted_tables/member_tasks.yml b/db/docs/deleted_tables/member_tasks.yml
index 07e3f556a8b132..8154fa054138b1 100644
--- a/db/docs/deleted_tables/member_tasks.yml
+++ b/db/docs/deleted_tables/member_tasks.yml
@@ -5,6 +5,6 @@ feature_categories:
 description: TODO
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69299
 milestone: '14.5'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/134452
 removed_in_milestone: '16.6'
diff --git a/db/docs/deleted_tables/merge_request_milestones.yml b/db/docs/deleted_tables/merge_request_milestones.yml
index 3f42312c5ec7ec..d4d75a7bd9c70e 100644
--- a/db/docs/deleted_tables/merge_request_milestones.yml
+++ b/db/docs/deleted_tables/merge_request_milestones.yml
@@ -1,6 +1,6 @@
 ---
 table_name: merge_request_milestones
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 feature_categories: []
 description: TODO
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/22043
diff --git a/db/docs/deleted_tables/metrics_dashboard_annotations.yml b/db/docs/deleted_tables/metrics_dashboard_annotations.yml
index 76e852fef39f1c..55f05c1ca9cc88 100644
--- a/db/docs/deleted_tables/metrics_dashboard_annotations.yml
+++ b/db/docs/deleted_tables/metrics_dashboard_annotations.yml
@@ -6,7 +6,7 @@ feature_categories:
 description: TODO
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27583
 milestone: '13.0'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 table_size: small
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/194965
 removed_in_milestone: '18.2'
diff --git a/db/docs/deleted_tables/namespace_onboarding_actions.yml b/db/docs/deleted_tables/namespace_onboarding_actions.yml
index da3f42f3f2facf..d8537d59e2e3c2 100644
--- a/db/docs/deleted_tables/namespace_onboarding_actions.yml
+++ b/db/docs/deleted_tables/namespace_onboarding_actions.yml
@@ -1,6 +1,6 @@
 ---
 table_name: namespace_onboarding_actions
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 feature_categories: []
 description: TODO
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48018
diff --git a/db/docs/deleted_tables/operations_feature_flag_scopes.yml b/db/docs/deleted_tables/operations_feature_flag_scopes.yml
index 121dbd67f18e68..e994cbcb8188ac 100644
--- a/db/docs/deleted_tables/operations_feature_flag_scopes.yml
+++ b/db/docs/deleted_tables/operations_feature_flag_scopes.yml
@@ -6,7 +6,7 @@ feature_categories:
 description: Deprecated in favor of `operations_scopes`. To be dropped.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/9110
 milestone: '11.8'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 table_size: small
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/197233
 removed_in_milestone: '18.2'
diff --git a/db/docs/deleted_tables/packages_events.yml b/db/docs/deleted_tables/packages_events.yml
index 0758ea58e04f4e..f629b191f6e418 100644
--- a/db/docs/deleted_tables/packages_events.yml
+++ b/db/docs/deleted_tables/packages_events.yml
@@ -7,6 +7,6 @@ feature_categories:
 description: Package tracking events (deprecated)
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41846
 milestone: '13.5'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/114947
 removed_in_milestone: '15.11'
diff --git a/db/docs/deleted_tables/partitioned_foreign_keys.yml b/db/docs/deleted_tables/partitioned_foreign_keys.yml
index 3c107f1eaed54f..04797e85426d18 100644
--- a/db/docs/deleted_tables/partitioned_foreign_keys.yml
+++ b/db/docs/deleted_tables/partitioned_foreign_keys.yml
@@ -6,6 +6,6 @@ feature_categories:
 description:
 introduced_by_url:
 milestone:
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82215
 removed_in_milestone: 14.9
diff --git a/db/docs/deleted_tables/post_migration_test_table.yml b/db/docs/deleted_tables/post_migration_test_table.yml
index f8dd5242d4bb92..8b7fdd6b876dc3 100644
--- a/db/docs/deleted_tables/post_migration_test_table.yml
+++ b/db/docs/deleted_tables/post_migration_test_table.yml
@@ -6,6 +6,6 @@ feature_categories:
 description: Test table to verify the behavior of the post-deploy independent pipeline
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91119
 milestone: '15.2'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92571
 removed_in_milestone: '15.2'
diff --git a/db/docs/deleted_tables/product_analytics_events_experimental.yml b/db/docs/deleted_tables/product_analytics_events_experimental.yml
index 5ea50a1147d54e..355c29d0e266e2 100644
--- a/db/docs/deleted_tables/product_analytics_events_experimental.yml
+++ b/db/docs/deleted_tables/product_analytics_events_experimental.yml
@@ -6,6 +6,6 @@ feature_categories:
 description: Table for original PoC for product analytics
 introduced_by_url:
 milestone: '16.10'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/144626
 removed_in_milestone: '16.10'
diff --git a/db/docs/deleted_tables/project_tracing_settings.yml b/db/docs/deleted_tables/project_tracing_settings.yml
index 3dd5c9605986cb..93a1e75cf22015 100644
--- a/db/docs/deleted_tables/project_tracing_settings.yml
+++ b/db/docs/deleted_tables/project_tracing_settings.yml
@@ -7,6 +7,6 @@ feature_categories:
 description:
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/7903
 milestone: '15.5'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91679
 removed_in_milestone: '15.2'
diff --git a/db/docs/deleted_tables/project_wiki_repository_states.yml b/db/docs/deleted_tables/project_wiki_repository_states.yml
index 9b117e4c4caedb..b36f0f42f1231f 100644
--- a/db/docs/deleted_tables/project_wiki_repository_states.yml
+++ b/db/docs/deleted_tables/project_wiki_repository_states.yml
@@ -7,6 +7,6 @@ feature_categories:
 description: Separate table for project wikis containing Geo verification metadata.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/99168
 milestone: '15.5'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/122936
 removed_in_milestone: '16.1'
diff --git a/db/docs/deleted_tables/prometheus_metrics.yml b/db/docs/deleted_tables/prometheus_metrics.yml
index 35bacc490f6e66..9101bf2a89cea6 100644
--- a/db/docs/deleted_tables/prometheus_metrics.yml
+++ b/db/docs/deleted_tables/prometheus_metrics.yml
@@ -7,7 +7,7 @@ feature_categories:
 description: TODO
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/3799
 milestone: '9.3'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/465327
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/164288
 removed_in_milestone: '17.4'
diff --git a/db/docs/deleted_tables/sbom_vulnerable_component_versions.yml b/db/docs/deleted_tables/sbom_vulnerable_component_versions.yml
index 7642cb5ea53eee..e27b0d54454adb 100644
--- a/db/docs/deleted_tables/sbom_vulnerable_component_versions.yml
+++ b/db/docs/deleted_tables/sbom_vulnerable_component_versions.yml
@@ -9,4 +9,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95622
 milestone: '15.4'
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/125426
 removed_in_milestone: '16.2'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
diff --git a/db/docs/deleted_tables/schema_inconsistencies.yml b/db/docs/deleted_tables/schema_inconsistencies.yml
index 0358ee8e5b154f..5ef536ab0a5005 100644
--- a/db/docs/deleted_tables/schema_inconsistencies.yml
+++ b/db/docs/deleted_tables/schema_inconsistencies.yml
@@ -9,4 +9,4 @@ classes:
 - Gitlab::Database::SchemaValidation::SchemaInconsistency
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/126479
 removed_in_milestone: '16.3'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
diff --git a/db/docs/deleted_tables/serverless_domain_cluster.yml b/db/docs/deleted_tables/serverless_domain_cluster.yml
index be80f6ed5db648..0e3dbf45f33768 100644
--- a/db/docs/deleted_tables/serverless_domain_cluster.yml
+++ b/db/docs/deleted_tables/serverless_domain_cluster.yml
@@ -5,6 +5,6 @@ feature_categories:
 description: "(Deprecated) A custom domain for a GitLab managed Knative installation"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/19835
 milestone: '12.6'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119543
 removed_in_milestone: '16.0'
diff --git a/db/docs/deleted_tables/services.yml b/db/docs/deleted_tables/services.yml
index cc05b0e615b8a5..d35b5158227d1c 100644
--- a/db/docs/deleted_tables/services.yml
+++ b/db/docs/deleted_tables/services.yml
@@ -1,6 +1,6 @@
 ---
 table_name: services
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 feature_categories: []
 description: TODO
 introduced_by_url: TODO
diff --git a/db/docs/deleted_tables/terraform_state_registry.yml b/db/docs/deleted_tables/terraform_state_registry.yml
index e8b5e1f857d2ce..5c37b834368cd7 100644
--- a/db/docs/deleted_tables/terraform_state_registry.yml
+++ b/db/docs/deleted_tables/terraform_state_registry.yml
@@ -1,6 +1,6 @@
 ---
 table_name: terraform_state_registry
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 feature_categories: []
 description: TODO
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/36594
diff --git a/db/docs/deleted_tables/tmp_fingerprint_sha256_migration.yml b/db/docs/deleted_tables/tmp_fingerprint_sha256_migration.yml
index 42b3f7d379e089..43dc8abf8f0f13 100644
--- a/db/docs/deleted_tables/tmp_fingerprint_sha256_migration.yml
+++ b/db/docs/deleted_tables/tmp_fingerprint_sha256_migration.yml
@@ -1,6 +1,6 @@
 ---
 table_name: tmp_fingerprint_sha256_migration
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 feature_categories: []
 description: TODO
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/21579
diff --git a/db/docs/deleted_tables/u2f_registrations.yml b/db/docs/deleted_tables/u2f_registrations.yml
index a41f0f092b7c9a..68aa402c04fcba 100644
--- a/db/docs/deleted_tables/u2f_registrations.yml
+++ b/db/docs/deleted_tables/u2f_registrations.yml
@@ -9,4 +9,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/791cc9138be6ea1
 milestone: '8.9'
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/114576
 removed_in_milestone: '16.1'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
diff --git a/db/docs/deleted_tables/vulnerability_advisories.yml b/db/docs/deleted_tables/vulnerability_advisories.yml
index 613ab678f35cab..915d98a00b5121 100644
--- a/db/docs/deleted_tables/vulnerability_advisories.yml
+++ b/db/docs/deleted_tables/vulnerability_advisories.yml
@@ -10,4 +10,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95622
 milestone: '15.4'
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/125426
 removed_in_milestone: '16.2'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
diff --git a/db/docs/deleted_tables/vulnerability_export_registry.yml b/db/docs/deleted_tables/vulnerability_export_registry.yml
index 90ae84ed128bb1..ebf5c262e07e9f 100644
--- a/db/docs/deleted_tables/vulnerability_export_registry.yml
+++ b/db/docs/deleted_tables/vulnerability_export_registry.yml
@@ -1,6 +1,6 @@
 ---
 table_name: vulnerability_export_registry
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 feature_categories: []
 description: TODO
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/36620
diff --git a/db/docs/deleted_tables/vulnerability_export_verification_status.yml b/db/docs/deleted_tables/vulnerability_export_verification_status.yml
index ed9cced468d380..94bb63b54ef2bb 100644
--- a/db/docs/deleted_tables/vulnerability_export_verification_status.yml
+++ b/db/docs/deleted_tables/vulnerability_export_verification_status.yml
@@ -1,6 +1,6 @@
 ---
 table_name: vulnerability_export_verification_status
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 feature_categories: []
 description: TODO
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/36620
diff --git a/db/docs/deleted_tables/vulnerability_finding_evidence_assets.yml b/db/docs/deleted_tables/vulnerability_finding_evidence_assets.yml
index 32e23058cf1951..8a72bad9d8c89c 100644
--- a/db/docs/deleted_tables/vulnerability_finding_evidence_assets.yml
+++ b/db/docs/deleted_tables/vulnerability_finding_evidence_assets.yml
@@ -6,6 +6,6 @@ feature_categories:
 description:
 introduced_by_url:
 milestone:
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76697
 removed_in_milestone: 14.7
diff --git a/db/docs/deleted_tables/vulnerability_finding_evidence_headers.yml b/db/docs/deleted_tables/vulnerability_finding_evidence_headers.yml
index 172c099801b5d0..c52af82664bf92 100644
--- a/db/docs/deleted_tables/vulnerability_finding_evidence_headers.yml
+++ b/db/docs/deleted_tables/vulnerability_finding_evidence_headers.yml
@@ -6,6 +6,6 @@ feature_categories:
 description:
 introduced_by_url:
 milestone:
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76697
 removed_in_milestone: 14.7
diff --git a/db/docs/deleted_tables/vulnerability_finding_evidence_requests.yml b/db/docs/deleted_tables/vulnerability_finding_evidence_requests.yml
index adfb524f1faa29..8ef1698af4705b 100644
--- a/db/docs/deleted_tables/vulnerability_finding_evidence_requests.yml
+++ b/db/docs/deleted_tables/vulnerability_finding_evidence_requests.yml
@@ -6,6 +6,6 @@ feature_categories:
 description:
 introduced_by_url:
 milestone:
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76697
 removed_in_milestone: 14.7
diff --git a/db/docs/deleted_tables/vulnerability_finding_evidence_responses.yml b/db/docs/deleted_tables/vulnerability_finding_evidence_responses.yml
index dfa4ae7947a943..07bcf8a7395dcf 100644
--- a/db/docs/deleted_tables/vulnerability_finding_evidence_responses.yml
+++ b/db/docs/deleted_tables/vulnerability_finding_evidence_responses.yml
@@ -6,6 +6,6 @@ feature_categories:
 description:
 introduced_by_url:
 milestone:
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76697
 removed_in_milestone: 14.7
diff --git a/db/docs/deleted_tables/vulnerability_finding_evidence_sources.yml b/db/docs/deleted_tables/vulnerability_finding_evidence_sources.yml
index b1355169751e8b..af3d3ab7e0dbc3 100644
--- a/db/docs/deleted_tables/vulnerability_finding_evidence_sources.yml
+++ b/db/docs/deleted_tables/vulnerability_finding_evidence_sources.yml
@@ -6,6 +6,6 @@ feature_categories:
 description:
 introduced_by_url:
 milestone:
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76697
 removed_in_milestone: 14.7
diff --git a/db/docs/deleted_tables/vulnerability_finding_evidence_supporting_messages.yml b/db/docs/deleted_tables/vulnerability_finding_evidence_supporting_messages.yml
index 685f3c3fa958f8..22cecba26416a6 100644
--- a/db/docs/deleted_tables/vulnerability_finding_evidence_supporting_messages.yml
+++ b/db/docs/deleted_tables/vulnerability_finding_evidence_supporting_messages.yml
@@ -6,6 +6,6 @@ feature_categories:
 description:
 introduced_by_url:
 milestone:
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76697
 removed_in_milestone: 14.7
diff --git a/db/docs/deleted_tables/vulnerability_finding_fingerprints.yml b/db/docs/deleted_tables/vulnerability_finding_fingerprints.yml
index dbcf8312d5a474..53de5912a9752a 100644
--- a/db/docs/deleted_tables/vulnerability_finding_fingerprints.yml
+++ b/db/docs/deleted_tables/vulnerability_finding_fingerprints.yml
@@ -1,6 +1,6 @@
 ---
 table_name: vulnerability_finding_fingerprints
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 feature_categories: []
 description: TODO
 introduced_by_url: TODO
diff --git a/db/docs/deleted_tables/web_hook_logs_archived.yml b/db/docs/deleted_tables/web_hook_logs_archived.yml
index a55b9db157bff8..bbd39959766fdb 100644
--- a/db/docs/deleted_tables/web_hook_logs_archived.yml
+++ b/db/docs/deleted_tables/web_hook_logs_archived.yml
@@ -1,6 +1,6 @@
 ---
 table_name: web_hook_logs_archived
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 feature_categories: []
 description: TODO
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60184
diff --git a/db/docs/deleted_tables/web_hook_logs_part_0c5294f417.yml b/db/docs/deleted_tables/web_hook_logs_part_0c5294f417.yml
index 21867b7b2aa6b5..2d774e5aef2c4a 100644
--- a/db/docs/deleted_tables/web_hook_logs_part_0c5294f417.yml
+++ b/db/docs/deleted_tables/web_hook_logs_part_0c5294f417.yml
@@ -1,6 +1,6 @@
 ---
 table_name: web_hook_logs_part_0c5294f417
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 feature_categories: []
 description: TODO
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55938
diff --git a/db/docs/deleted_tables/work_item_hierarchy_restrictions.yml b/db/docs/deleted_tables/work_item_hierarchy_restrictions.yml
index b2ff03319d6f3e..249dd9f083f877 100644
--- a/db/docs/deleted_tables/work_item_hierarchy_restrictions.yml
+++ b/db/docs/deleted_tables/work_item_hierarchy_restrictions.yml
@@ -8,7 +8,7 @@ description: Restrictions applied to parent/child relationships. Currently one o
   a predefined set but in future will support custom types.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103796
 milestone: '15.7'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 table_size: small
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/553477
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/205114
diff --git a/db/docs/deleted_tables/work_item_related_link_restrictions.yml b/db/docs/deleted_tables/work_item_related_link_restrictions.yml
index 1d046118e976e2..97d31cd3f90700 100644
--- a/db/docs/deleted_tables/work_item_related_link_restrictions.yml
+++ b/db/docs/deleted_tables/work_item_related_link_restrictions.yml
@@ -9,6 +9,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/133044
 milestone: '16.5'
 removed_in_milestone: '18.4'
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/200707
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 table_size: small
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/553478
diff --git a/db/docs/instance_integrations.yml b/db/docs/instance_integrations.yml
index 9249b57ee6cab1..bf84f71763d979 100644
--- a/db/docs/instance_integrations.yml
+++ b/db/docs/instance_integrations.yml
@@ -6,6 +6,6 @@ feature_categories:
 description: Support 3rd party instance-wide integrations
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/164503
 milestone: '17.4'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 table_size: small
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/555797
diff --git a/db/docs/ldap_admin_role_links.yml b/db/docs/ldap_admin_role_links.yml
index f21806cebd7ee1..fbab5d4dd6093f 100644
--- a/db/docs/ldap_admin_role_links.yml
+++ b/db/docs/ldap_admin_role_links.yml
@@ -7,6 +7,6 @@ feature_categories:
 description: Stores mapping between LDAP server and admin member roles
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/184606
 milestone: '17.11'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 table_size: small
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/553464
diff --git a/db/docs/plans.yml b/db/docs/plans.yml
index 34abb5796d51e2..a258b44ef8c14a 100644
--- a/db/docs/plans.yml
+++ b/db/docs/plans.yml
@@ -7,6 +7,6 @@ feature_categories:
 description: Contains information about purchasable Plans for GitLab namespaces
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/39ca951a0f28d147d4689379bbe48a9c14d55d9f
 milestone: '9.5'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 table_size: small
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/553467
diff --git a/db/docs/programming_languages.yml b/db/docs/programming_languages.yml
index 471d448c4da678..e4d8a692893515 100644
--- a/db/docs/programming_languages.yml
+++ b/db/docs/programming_languages.yml
@@ -7,6 +7,6 @@ feature_categories:
 description: Contains known programming languages and their assigned colors
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/19480
 milestone: '11.2'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 table_size: small
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/553468
diff --git a/db/docs/scim_oauth_access_tokens.yml b/db/docs/scim_oauth_access_tokens.yml
index d204bf75744700..e2564f318d4850 100644
--- a/db/docs/scim_oauth_access_tokens.yml
+++ b/db/docs/scim_oauth_access_tokens.yml
@@ -8,6 +8,6 @@ description: Bearer token used  for authenticating SCIM requests. This is table
   for Instance SCIM
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/e9b2253fe3538234d1c4d173c4549a955233d836
 milestone: '11.10'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/553107
 table_size: small
diff --git a/db/docs/security_training_providers.yml b/db/docs/security_training_providers.yml
index 3082d8b99e1ada..9f4358dc982d75 100644
--- a/db/docs/security_training_providers.yml
+++ b/db/docs/security_training_providers.yml
@@ -7,6 +7,6 @@ feature_categories:
 description: Stores information about the available security training providers
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78195
 milestone: '14.7'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 table_size: small
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/553469
diff --git a/db/docs/slack_api_scopes.yml b/db/docs/slack_api_scopes.yml
index fd84c9f464f753..3fd07253103caf 100644
--- a/db/docs/slack_api_scopes.yml
+++ b/db/docs/slack_api_scopes.yml
@@ -7,6 +7,6 @@ feature_categories:
 description: Data related to the Slack application integration.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105439
 milestone: '15.7'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/558262
 table_size: small
diff --git a/db/docs/subscription_add_ons.yml b/db/docs/subscription_add_ons.yml
index b4789ad95e1487..0a400652d3c8ab 100644
--- a/db/docs/subscription_add_ons.yml
+++ b/db/docs/subscription_add_ons.yml
@@ -7,6 +7,6 @@ feature_categories:
 - subscription_management
 classes:
 - GitlabSubscriptions::AddOn
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 table_size: small
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/553471
diff --git a/db/docs/user_permission_export_upload_uploads.yml b/db/docs/user_permission_export_upload_uploads.yml
index d1ce1d5853bc26..f7ce0b20502498 100644
--- a/db/docs/user_permission_export_upload_uploads.yml
+++ b/db/docs/user_permission_export_upload_uploads.yml
@@ -9,5 +9,5 @@ description: Stores uploads fro UserPermissionExportUpload model
 introduced_by_url:
 milestone: '17.11'
 table_size: small
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/553474
diff --git a/db/docs/views/group_wikis_routes_view.yml b/db/docs/views/group_wikis_routes_view.yml
index b2dfd79ff83de7..aee929e43462b8 100644
--- a/db/docs/views/group_wikis_routes_view.yml
+++ b/db/docs/views/group_wikis_routes_view.yml
@@ -6,5 +6,5 @@ feature_categories:
 description: Group wiki references and its related routes
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/179454
 milestone: '17.11'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 table_size: small
diff --git a/db/docs/views/personal_snippets_view.yml b/db/docs/views/personal_snippets_view.yml
index 1a5aaaf1c97ff4..2b8ffc7974625e 100644
--- a/db/docs/views/personal_snippets_view.yml
+++ b/db/docs/views/personal_snippets_view.yml
@@ -6,5 +6,5 @@ feature_categories:
 description: Personal snippet references and its repository metadata
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/179451
 milestone: '17.11'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 table_size: small
diff --git a/db/docs/views/project_design_management_routes_view.yml b/db/docs/views/project_design_management_routes_view.yml
index 9181ec048caf04..b65a3c144a00fb 100644
--- a/db/docs/views/project_design_management_routes_view.yml
+++ b/db/docs/views/project_design_management_routes_view.yml
@@ -6,5 +6,5 @@ feature_categories:
 description: Project design repository references and its related routes
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/179449
 milestone: '17.9'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 table_size: small
diff --git a/db/docs/views/project_snippets_routes_view.yml b/db/docs/views/project_snippets_routes_view.yml
index b25568122d9b8c..be27b8132c1b62 100644
--- a/db/docs/views/project_snippets_routes_view.yml
+++ b/db/docs/views/project_snippets_routes_view.yml
@@ -6,5 +6,5 @@ feature_categories:
 description: Project snippet references and its repository metadata
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/179452
 milestone: '17.11'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 table_size: small
diff --git a/db/docs/work_item_types.yml b/db/docs/work_item_types.yml
index 1b5e06c2fd6624..892296cdabf993 100644
--- a/db/docs/work_item_types.yml
+++ b/db/docs/work_item_types.yml
@@ -10,6 +10,6 @@ description: The work item type related to an issue. Currently one of a predefin
   set but in future will support custom types.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55705
 milestone: '14.2'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 table_size: small
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/553411
diff --git a/db/docs/work_item_widget_definitions.yml b/db/docs/work_item_widget_definitions.yml
index 85d235aaa34d9d..645d697c74f27b 100644
--- a/db/docs/work_item_widget_definitions.yml
+++ b/db/docs/work_item_widget_definitions.yml
@@ -10,6 +10,6 @@ description: Mapping of widgets for each work item type. Currently one of a pred
   set but in future will support custom types.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107582
 milestone: '15.9'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_org
 table_size: small
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/553479
diff --git a/db/migrate/20240228144013_migrate_custom_permissions.rb b/db/migrate/20240228144013_migrate_custom_permissions.rb
index 25254efa3eca5c..7eadbfe49ecd15 100644
--- a/db/migrate/20240228144013_migrate_custom_permissions.rb
+++ b/db/migrate/20240228144013_migrate_custom_permissions.rb
@@ -2,7 +2,7 @@
 
 class MigrateCustomPermissions < Gitlab::Database::Migration[2.2]
   milestone '16.11'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
 
   PERMISSION_COLUMNS = %w[
diff --git a/db/migrate/20240327110521_migrate_zoekt_settings_in_application_settings.rb b/db/migrate/20240327110521_migrate_zoekt_settings_in_application_settings.rb
index ec646d74d8570b..823ba1ce2aa7d7 100644
--- a/db/migrate/20240327110521_migrate_zoekt_settings_in_application_settings.rb
+++ b/db/migrate/20240327110521_migrate_zoekt_settings_in_application_settings.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class MigrateZoektSettingsInApplicationSettings < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '16.11'
 
   class ApplicationSetting < MigrationRecord
diff --git a/db/migrate/20240327214545_add_development_widget_to_work_item_types.rb b/db/migrate/20240327214545_add_development_widget_to_work_item_types.rb
index fc9980c7b76b90..01756678188965 100644
--- a/db/migrate/20240327214545_add_development_widget_to_work_item_types.rb
+++ b/db/migrate/20240327214545_add_development_widget_to_work_item_types.rb
@@ -9,7 +9,7 @@ class WidgetDefinition < MigrationRecord
     self.table_name = 'work_item_widget_definitions'
   end
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
   milestone '16.11'
 
diff --git a/db/migrate/20240404134450_insert_active_versioned_pages_deployments_limit_by_namespace.rb b/db/migrate/20240404134450_insert_active_versioned_pages_deployments_limit_by_namespace.rb
index 6e3799a71dbd82..661a82e44f9b80 100644
--- a/db/migrate/20240404134450_insert_active_versioned_pages_deployments_limit_by_namespace.rb
+++ b/db/migrate/20240404134450_insert_active_versioned_pages_deployments_limit_by_namespace.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class InsertActiveVersionedPagesDeploymentsLimitByNamespace < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '16.11'
 
   def up
diff --git a/db/migrate/20240405090010_update_throttle_unauthenticated_git_http_in_application_settings.rb b/db/migrate/20240405090010_update_throttle_unauthenticated_git_http_in_application_settings.rb
index d4458912262d09..ace421018d5ca8 100644
--- a/db/migrate/20240405090010_update_throttle_unauthenticated_git_http_in_application_settings.rb
+++ b/db/migrate/20240405090010_update_throttle_unauthenticated_git_http_in_application_settings.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class UpdateThrottleUnauthenticatedGitHttpInApplicationSettings < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '17.0'
 
diff --git a/db/migrate/20240424091018_disable_allow_runner_registration_for_self_managed.rb b/db/migrate/20240424091018_disable_allow_runner_registration_for_self_managed.rb
index c49ac2ce86cdef..304a77c7515286 100644
--- a/db/migrate/20240424091018_disable_allow_runner_registration_for_self_managed.rb
+++ b/db/migrate/20240424091018_disable_allow_runner_registration_for_self_managed.rb
@@ -2,7 +2,7 @@
 
 class DisableAllowRunnerRegistrationForSelfManaged < Gitlab::Database::Migration[2.2]
   milestone '17.0'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   class TmpApplicationSetting < MigrationRecord
     self.table_name = 'application_settings'
diff --git a/db/migrate/20240430150200_insert_active_versioned_pages_deployments_limit_by_namespace_for_gold_plan.rb b/db/migrate/20240430150200_insert_active_versioned_pages_deployments_limit_by_namespace_for_gold_plan.rb
index c2d9bdd6217a2c..98142e9d5b0838 100644
--- a/db/migrate/20240430150200_insert_active_versioned_pages_deployments_limit_by_namespace_for_gold_plan.rb
+++ b/db/migrate/20240430150200_insert_active_versioned_pages_deployments_limit_by_namespace_for_gold_plan.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class InsertActiveVersionedPagesDeploymentsLimitByNamespaceForGoldPlan < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.0'
 
   def up
diff --git a/db/migrate/20240501113440_extend_gitlabcom_duo_pro_trials.rb b/db/migrate/20240501113440_extend_gitlabcom_duo_pro_trials.rb
index 28f846cf8e92a2..595b5e888c8106 100644
--- a/db/migrate/20240501113440_extend_gitlabcom_duo_pro_trials.rb
+++ b/db/migrate/20240501113440_extend_gitlabcom_duo_pro_trials.rb
@@ -2,7 +2,7 @@
 
 class ExtendGitlabcomDuoProTrials < Gitlab::Database::Migration[2.2]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.0'
 
   class AddOn < MigrationRecord
diff --git a/db/migrate/20240502194436_update_pipeline_triggers_premium_ultimate_plan_limits.rb b/db/migrate/20240502194436_update_pipeline_triggers_premium_ultimate_plan_limits.rb
index e09de8c027682c..3f4c972c6b3846 100644
--- a/db/migrate/20240502194436_update_pipeline_triggers_premium_ultimate_plan_limits.rb
+++ b/db/migrate/20240502194436_update_pipeline_triggers_premium_ultimate_plan_limits.rb
@@ -3,7 +3,7 @@
 class UpdatePipelineTriggersPremiumUltimatePlanLimits < Gitlab::Database::Migration[2.2]
   milestone '17.0'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     return unless Gitlab.com?
diff --git a/db/migrate/20240510125400_increase_quantity_for_gitlabcom_duo_pro_trials.rb b/db/migrate/20240510125400_increase_quantity_for_gitlabcom_duo_pro_trials.rb
index 63ec0f9b57729b..96f7c9c7ebf610 100644
--- a/db/migrate/20240510125400_increase_quantity_for_gitlabcom_duo_pro_trials.rb
+++ b/db/migrate/20240510125400_increase_quantity_for_gitlabcom_duo_pro_trials.rb
@@ -2,7 +2,7 @@
 
 class IncreaseQuantityForGitlabcomDuoProTrials < Gitlab::Database::Migration[2.2]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.1'
 
   class AddOn < MigrationRecord
diff --git a/db/migrate/20240611202115_add_cargo_purl_type_to_application_setting.rb b/db/migrate/20240611202115_add_cargo_purl_type_to_application_setting.rb
index c1c86d3f911fac..0d85e3b940efe2 100644
--- a/db/migrate/20240611202115_add_cargo_purl_type_to_application_setting.rb
+++ b/db/migrate/20240611202115_add_cargo_purl_type_to_application_setting.rb
@@ -3,7 +3,7 @@
 class AddCargoPurlTypeToApplicationSetting < Gitlab::Database::Migration[2.2]
   milestone '17.2'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   class ApplicationSetting < MigrationRecord
   end
diff --git a/db/migrate/20240627231742_update_weight_widget_definitions.rb b/db/migrate/20240627231742_update_weight_widget_definitions.rb
index c34f9af6a47d75..102f8c613de601 100644
--- a/db/migrate/20240627231742_update_weight_widget_definitions.rb
+++ b/db/migrate/20240627231742_update_weight_widget_definitions.rb
@@ -3,7 +3,7 @@
 class UpdateWeightWidgetDefinitions < Gitlab::Database::Migration[2.2]
   milestone '17.2'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
 
   EPIC_TYPE_ENUM = 7
diff --git a/db/migrate/20240628203616_update_scheduled_scans_max_concurrency_in_application_settings_for_self_managed.rb b/db/migrate/20240628203616_update_scheduled_scans_max_concurrency_in_application_settings_for_self_managed.rb
index f4c8aad65ab25c..bc791f75aeada5 100644
--- a/db/migrate/20240628203616_update_scheduled_scans_max_concurrency_in_application_settings_for_self_managed.rb
+++ b/db/migrate/20240628203616_update_scheduled_scans_max_concurrency_in_application_settings_for_self_managed.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class UpdateScheduledScansMaxConcurrencyInApplicationSettingsForSelfManaged < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '17.2'
 
diff --git a/db/migrate/20240708122901_add_crm_contacts_widget_to_work_item_types.rb b/db/migrate/20240708122901_add_crm_contacts_widget_to_work_item_types.rb
index e9ea8f4e05626d..5ff60ee5963a47 100644
--- a/db/migrate/20240708122901_add_crm_contacts_widget_to_work_item_types.rb
+++ b/db/migrate/20240708122901_add_crm_contacts_widget_to_work_item_types.rb
@@ -9,7 +9,7 @@ class WidgetDefinition < MigrationRecord
     self.table_name = 'work_item_widget_definitions'
   end
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
   milestone '17.3'
 
diff --git a/db/migrate/20240728213927_cap_workspaces_max_termination_to_one_year.rb b/db/migrate/20240728213927_cap_workspaces_max_termination_to_one_year.rb
index c1b652f27125cc..22dd927bfb368b 100644
--- a/db/migrate/20240728213927_cap_workspaces_max_termination_to_one_year.rb
+++ b/db/migrate/20240728213927_cap_workspaces_max_termination_to_one_year.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class CapWorkspacesMaxTerminationToOneYear < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '17.4'
   # NOTE: see the following issue for the reasoning behind this value being the hard maximum termination limit:
diff --git a/db/migrate/20240729034109_set_import_placeholder_limits_for_plan_limits.rb b/db/migrate/20240729034109_set_import_placeholder_limits_for_plan_limits.rb
index 0eecb1976058bc..37bbae64eaee3d 100644
--- a/db/migrate/20240729034109_set_import_placeholder_limits_for_plan_limits.rb
+++ b/db/migrate/20240729034109_set_import_placeholder_limits_for_plan_limits.rb
@@ -3,7 +3,7 @@
 class SetImportPlaceholderLimitsForPlanLimits < Gitlab::Database::Migration[2.2]
   milestone '17.4'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   LOW_LIMITS = ([200] * 4).freeze
   MID_LIMITS = [500, 2_000, 4_000, 6_000].freeze
diff --git a/db/migrate/20240806100120_remove_records_without_project_from_project_saved_replies_table.rb b/db/migrate/20240806100120_remove_records_without_project_from_project_saved_replies_table.rb
index f827ddec0274cf..0cc9981ba363f3 100644
--- a/db/migrate/20240806100120_remove_records_without_project_from_project_saved_replies_table.rb
+++ b/db/migrate/20240806100120_remove_records_without_project_from_project_saved_replies_table.rb
@@ -5,7 +5,7 @@ class RemoveRecordsWithoutProjectFromProjectSavedRepliesTable < Gitlab::Database
 
   milestone '17.3'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   class ProjectsSavedReply < MigrationRecord
     self.table_name = 'project_saved_replies'
diff --git a/db/migrate/20240806222106_add_dev_widget_to_tasks.rb b/db/migrate/20240806222106_add_dev_widget_to_tasks.rb
index 1e9b32451177aa..7c84aa07bec372 100644
--- a/db/migrate/20240806222106_add_dev_widget_to_tasks.rb
+++ b/db/migrate/20240806222106_add_dev_widget_to_tasks.rb
@@ -9,7 +9,7 @@ class WidgetDefinition < MigrationRecord
     self.table_name = 'work_item_widget_definitions'
   end
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
   milestone '17.3'
 
diff --git a/db/migrate/20240807143914_remove_crm_contacts_widget_from_work_item_types.rb b/db/migrate/20240807143914_remove_crm_contacts_widget_from_work_item_types.rb
index ebdc10bd7b8922..4dda6795fb33ea 100644
--- a/db/migrate/20240807143914_remove_crm_contacts_widget_from_work_item_types.rb
+++ b/db/migrate/20240807143914_remove_crm_contacts_widget_from_work_item_types.rb
@@ -9,7 +9,7 @@ class WidgetDefinition < MigrationRecord
     self.table_name = 'work_item_widget_definitions'
   end
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
   milestone '17.4'
 
diff --git a/db/migrate/20240812040747_remote_deplicated_agent_config.rb b/db/migrate/20240812040747_remote_deplicated_agent_config.rb
index ae6cbfa42f6713..b3019c946230cc 100644
--- a/db/migrate/20240812040747_remote_deplicated_agent_config.rb
+++ b/db/migrate/20240812040747_remote_deplicated_agent_config.rb
@@ -2,7 +2,7 @@
 
 class RemoteDeplicatedAgentConfig < Gitlab::Database::Migration[2.2]
   milestone '17.4'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   class RemoteDevelopmentAgentConfig < MigrationRecord
     self.table_name = 'remote_development_agent_configs'
diff --git a/db/migrate/20240825000005_migrate_remote_development_agent_configs_to_workspaces_agent_configs.rb b/db/migrate/20240825000005_migrate_remote_development_agent_configs_to_workspaces_agent_configs.rb
index 241a7952b10d0a..5c0d21cb41124b 100644
--- a/db/migrate/20240825000005_migrate_remote_development_agent_configs_to_workspaces_agent_configs.rb
+++ b/db/migrate/20240825000005_migrate_remote_development_agent_configs_to_workspaces_agent_configs.rb
@@ -4,7 +4,7 @@ class MigrateRemoteDevelopmentAgentConfigsToWorkspacesAgentConfigs < Gitlab::Dat
   milestone "17.4"
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   SELECTED_COLUMNS = %w[
     created_at
diff --git a/db/migrate/20240916084832_delete_invalid_pages_domains_records.rb b/db/migrate/20240916084832_delete_invalid_pages_domains_records.rb
index b072148d9d059d..d48b02f4b9ef66 100644
--- a/db/migrate/20240916084832_delete_invalid_pages_domains_records.rb
+++ b/db/migrate/20240916084832_delete_invalid_pages_domains_records.rb
@@ -2,7 +2,7 @@
 
 class DeleteInvalidPagesDomainsRecords < Gitlab::Database::Migration[2.2]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.5'
 
   BATCH_SIZE = 1000
diff --git a/db/migrate/20241008140250_add_email_participants_widget_definition.rb b/db/migrate/20241008140250_add_email_participants_widget_definition.rb
index 8c5c82b10bf1ee..6aa6d1ed3d276c 100644
--- a/db/migrate/20241008140250_add_email_participants_widget_definition.rb
+++ b/db/migrate/20241008140250_add_email_participants_widget_definition.rb
@@ -5,7 +5,7 @@
 # but has been reverted with https://gitlab.com/gitlab-org/gitlab/-/merge_requests/165219
 # because of a renamed index.
 class AddEmailParticipantsWidgetDefinition < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
   milestone '17.6'
 
diff --git a/db/migrate/20241017160504_generate_ci_job_token_signing_key.rb b/db/migrate/20241017160504_generate_ci_job_token_signing_key.rb
index 1ab1446dc02b4e..89512586b6895a 100644
--- a/db/migrate/20241017160504_generate_ci_job_token_signing_key.rb
+++ b/db/migrate/20241017160504_generate_ci_job_token_signing_key.rb
@@ -2,7 +2,7 @@
 
 class GenerateCiJobTokenSigningKey < Gitlab::Database::Migration[2.2]
   milestone '17.7'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   class ApplicationSetting < MigrationRecord
     include Gitlab::EncryptedAttribute
diff --git a/db/migrate/20241017160505_regenerate_ci_job_token_signing_key.rb b/db/migrate/20241017160505_regenerate_ci_job_token_signing_key.rb
index 54f0db9746bf5e..e49ee4c5425573 100644
--- a/db/migrate/20241017160505_regenerate_ci_job_token_signing_key.rb
+++ b/db/migrate/20241017160505_regenerate_ci_job_token_signing_key.rb
@@ -5,7 +5,7 @@
 # signing key. Redo the migration if there is no key.
 class RegenerateCiJobTokenSigningKey < Gitlab::Database::Migration[2.2]
   milestone '17.7'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   class ApplicationSetting < MigrationRecord
     include Gitlab::EncryptedAttribute
diff --git a/db/migrate/20241021105736_insert_opensource_pages_deployments_limit.rb b/db/migrate/20241021105736_insert_opensource_pages_deployments_limit.rb
index aa9efbd7bdfc96..59cf56ac542c66 100644
--- a/db/migrate/20241021105736_insert_opensource_pages_deployments_limit.rb
+++ b/db/migrate/20241021105736_insert_opensource_pages_deployments_limit.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class InsertOpensourcePagesDeploymentsLimit < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.6'
 
   def up
diff --git a/db/migrate/20241022175028_increase_gitlab_com_concurrent_relation_batch_export_limit.rb b/db/migrate/20241022175028_increase_gitlab_com_concurrent_relation_batch_export_limit.rb
index dc544dfccf5aff..1339026d8624e1 100644
--- a/db/migrate/20241022175028_increase_gitlab_com_concurrent_relation_batch_export_limit.rb
+++ b/db/migrate/20241022175028_increase_gitlab_com_concurrent_relation_batch_export_limit.rb
@@ -3,7 +3,7 @@
 class IncreaseGitlabComConcurrentRelationBatchExportLimit < Gitlab::Database::Migration[2.2]
   milestone '17.6'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   class ApplicationSetting < MigrationRecord; end
 
diff --git a/db/migrate/20241029184904_update_admin_bot_user_confirmed.rb b/db/migrate/20241029184904_update_admin_bot_user_confirmed.rb
index 9d8142fc6ff430..6d068ccab3eb5a 100644
--- a/db/migrate/20241029184904_update_admin_bot_user_confirmed.rb
+++ b/db/migrate/20241029184904_update_admin_bot_user_confirmed.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class UpdateAdminBotUserConfirmed < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '17.6'
 
diff --git a/db/migrate/20241111092153_clean_trial_gitlab_subscriptions_date_attributes.rb b/db/migrate/20241111092153_clean_trial_gitlab_subscriptions_date_attributes.rb
index ccb4a11bea22b0..e81d36d2e85317 100644
--- a/db/migrate/20241111092153_clean_trial_gitlab_subscriptions_date_attributes.rb
+++ b/db/migrate/20241111092153_clean_trial_gitlab_subscriptions_date_attributes.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class CleanTrialGitlabSubscriptionsDateAttributes < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.7'
 
   def up
diff --git a/db/migrate/20241112123436_update_seat_control_in_application_settings.rb b/db/migrate/20241112123436_update_seat_control_in_application_settings.rb
index 0e486249818ed4..eb7e7e355b5b6b 100644
--- a/db/migrate/20241112123436_update_seat_control_in_application_settings.rb
+++ b/db/migrate/20241112123436_update_seat_control_in_application_settings.rb
@@ -3,7 +3,7 @@
 class UpdateSeatControlInApplicationSettings < Gitlab::Database::Migration[2.2]
   milestone '17.7'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     execute <<~SQL
diff --git a/db/migrate/20241114232506_move_all_ready_zoekt_indices_to_pending.rb b/db/migrate/20241114232506_move_all_ready_zoekt_indices_to_pending.rb
index 3482296807fb23..3e9892174feae4 100644
--- a/db/migrate/20241114232506_move_all_ready_zoekt_indices_to_pending.rb
+++ b/db/migrate/20241114232506_move_all_ready_zoekt_indices_to_pending.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class MoveAllReadyZoektIndicesToPending < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
 
   milestone '17.7'
diff --git a/db/migrate/20241126104935_move_elasticsearch_application_settings_to_elasticsearch_column.rb b/db/migrate/20241126104935_move_elasticsearch_application_settings_to_elasticsearch_column.rb
index 68134931832e02..4eae8448587e8c 100644
--- a/db/migrate/20241126104935_move_elasticsearch_application_settings_to_elasticsearch_column.rb
+++ b/db/migrate/20241126104935_move_elasticsearch_application_settings_to_elasticsearch_column.rb
@@ -2,7 +2,7 @@
 
 class MoveElasticsearchApplicationSettingsToElasticsearchColumn < Gitlab::Database::Migration[2.2]
   milestone '17.8'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   ELASTIC_SEARCH_REGEX = /^elasticsearch_/
 
diff --git a/db/migrate/20241127161525_add_designs_and_development_widgets_to_ticket_work_item_type.rb b/db/migrate/20241127161525_add_designs_and_development_widgets_to_ticket_work_item_type.rb
index ab56a1a616994d..17460a8c5b6243 100644
--- a/db/migrate/20241127161525_add_designs_and_development_widgets_to_ticket_work_item_type.rb
+++ b/db/migrate/20241127161525_add_designs_and_development_widgets_to_ticket_work_item_type.rb
@@ -3,7 +3,7 @@
 class AddDesignsAndDevelopmentWidgetsToTicketWorkItemType < Gitlab::Database::Migration[2.2]
   include Gitlab::Database::MigrationHelpers::WorkItems::Widgets
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
   milestone '17.7'
 
diff --git a/db/migrate/20241218091609_add_widgets_to_incidents_for_parity_with_issues.rb b/db/migrate/20241218091609_add_widgets_to_incidents_for_parity_with_issues.rb
index 191933283f7f1d..4d52f9005423c6 100644
--- a/db/migrate/20241218091609_add_widgets_to_incidents_for_parity_with_issues.rb
+++ b/db/migrate/20241218091609_add_widgets_to_incidents_for_parity_with_issues.rb
@@ -3,7 +3,7 @@
 class AddWidgetsToIncidentsForParityWithIssues < Gitlab::Database::Migration[2.2]
   include Gitlab::Database::MigrationHelpers::WorkItems::Widgets
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
   milestone '17.8'
 
diff --git a/db/migrate/20250103061005_add_custom_status_widget_to_work_item_types.rb b/db/migrate/20250103061005_add_custom_status_widget_to_work_item_types.rb
index 638f06e694bde1..a18ce981183add 100644
--- a/db/migrate/20250103061005_add_custom_status_widget_to_work_item_types.rb
+++ b/db/migrate/20250103061005_add_custom_status_widget_to_work_item_types.rb
@@ -3,7 +3,7 @@
 class AddCustomStatusWidgetToWorkItemTypes < Gitlab::Database::Migration[2.2]
   include Gitlab::Database::MigrationHelpers::WorkItems::Widgets
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
   milestone '17.8'
 
diff --git a/db/migrate/20250107125943_repopulate_elasticsearch_application_settings_from_jsonb.rb b/db/migrate/20250107125943_repopulate_elasticsearch_application_settings_from_jsonb.rb
index 591a142a7b75ef..b901849bee1397 100644
--- a/db/migrate/20250107125943_repopulate_elasticsearch_application_settings_from_jsonb.rb
+++ b/db/migrate/20250107125943_repopulate_elasticsearch_application_settings_from_jsonb.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class RepopulateElasticsearchApplicationSettingsFromJsonb < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.8'
 
   class ApplicationSetting < MigrationRecord
diff --git a/db/migrate/20250109055316_migrate_global_search_settings_in_application_settings.rb b/db/migrate/20250109055316_migrate_global_search_settings_in_application_settings.rb
index 0b079c18034a9f..c3a82b6f0c1751 100644
--- a/db/migrate/20250109055316_migrate_global_search_settings_in_application_settings.rb
+++ b/db/migrate/20250109055316_migrate_global_search_settings_in_application_settings.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class MigrateGlobalSearchSettingsInApplicationSettings < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.9'
 
   class ApplicationSetting < MigrationRecord
diff --git a/db/migrate/20250114194610_backfill_user_provided_workspace_variables.rb b/db/migrate/20250114194610_backfill_user_provided_workspace_variables.rb
index 187625cea7b6ac..f2e1c542e17323 100644
--- a/db/migrate/20250114194610_backfill_user_provided_workspace_variables.rb
+++ b/db/migrate/20250114194610_backfill_user_provided_workspace_variables.rb
@@ -3,7 +3,7 @@
 class BackfillUserProvidedWorkspaceVariables < Gitlab::Database::Migration[2.2]
   milestone '17.9'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   class WorkspaceVariable < MigrationRecord
     self.table_name = :workspace_variables
diff --git a/db/migrate/20250121163545_add_custom_fields_widget_to_work_item_types.rb b/db/migrate/20250121163545_add_custom_fields_widget_to_work_item_types.rb
index 53b6bb08fdc4fb..b6407f90d75e25 100644
--- a/db/migrate/20250121163545_add_custom_fields_widget_to_work_item_types.rb
+++ b/db/migrate/20250121163545_add_custom_fields_widget_to_work_item_types.rb
@@ -3,7 +3,7 @@
 class AddCustomFieldsWidgetToWorkItemTypes < Gitlab::Database::Migration[2.2]
   include Gitlab::Database::MigrationHelpers::WorkItems::Widgets
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
   milestone '17.9'
 
diff --git a/db/migrate/20250127181504_insert_forgotten_active_versioned_pages_deployments_limit_by_namespace.rb b/db/migrate/20250127181504_insert_forgotten_active_versioned_pages_deployments_limit_by_namespace.rb
index c0640a55806ddd..5ace5ebfb3f492 100644
--- a/db/migrate/20250127181504_insert_forgotten_active_versioned_pages_deployments_limit_by_namespace.rb
+++ b/db/migrate/20250127181504_insert_forgotten_active_versioned_pages_deployments_limit_by_namespace.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class InsertForgottenActiveVersionedPagesDeploymentsLimitByNamespace < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.9'
 
   def up
diff --git a/db/migrate/20250128163345_add_error_tracking_to_work_item_widget.rb b/db/migrate/20250128163345_add_error_tracking_to_work_item_widget.rb
index 98b542753f7124..c0f71b225f4ac2 100644
--- a/db/migrate/20250128163345_add_error_tracking_to_work_item_widget.rb
+++ b/db/migrate/20250128163345_add_error_tracking_to_work_item_widget.rb
@@ -3,7 +3,7 @@
 class AddErrorTrackingToWorkItemWidget < Gitlab::Database::Migration[2.2]
   include Gitlab::Database::MigrationHelpers::WorkItems::Widgets
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
   milestone '17.9'
 
diff --git a/db/migrate/20250129114448_remove_duplicate_user_member_roles.rb b/db/migrate/20250129114448_remove_duplicate_user_member_roles.rb
index 4e9cd07dc8bcd2..8c5111a360c675 100644
--- a/db/migrate/20250129114448_remove_duplicate_user_member_roles.rb
+++ b/db/migrate/20250129114448_remove_duplicate_user_member_roles.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class RemoveDuplicateUserMemberRoles < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.9'
 
   def up
diff --git a/db/migrate/20250129135025_seed_cloud_connector_keys_new.rb b/db/migrate/20250129135025_seed_cloud_connector_keys_new.rb
index ae022951c17bbb..bae70f98a01161 100644
--- a/db/migrate/20250129135025_seed_cloud_connector_keys_new.rb
+++ b/db/migrate/20250129135025_seed_cloud_connector_keys_new.rb
@@ -2,7 +2,7 @@
 
 class SeedCloudConnectorKeysNew < Gitlab::Database::Migration[2.2]
   milestone '17.9'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   class CloudConnectorKeys < MigrationRecord
     self.table_name = 'cloud_connector_keys'
diff --git a/db/migrate/20250130162000_remove_package_protection_rules_on_down_migration.rb b/db/migrate/20250130162000_remove_package_protection_rules_on_down_migration.rb
index e5ac915e1e1892..2cda9ccfdad82b 100644
--- a/db/migrate/20250130162000_remove_package_protection_rules_on_down_migration.rb
+++ b/db/migrate/20250130162000_remove_package_protection_rules_on_down_migration.rb
@@ -10,7 +10,7 @@ class RemovePackageProtectionRulesOnDownMigration < Gitlab::Database::Migration[
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   class PackagesProtectionRule < MigrationRecord
     self.table_name = "packages_protection_rules"
diff --git a/db/migrate/20250131184001_remove_start_and_due_date_widget_from_incident.rb b/db/migrate/20250131184001_remove_start_and_due_date_widget_from_incident.rb
index b2962cdf3aeef6..874e7548bf3639 100644
--- a/db/migrate/20250131184001_remove_start_and_due_date_widget_from_incident.rb
+++ b/db/migrate/20250131184001_remove_start_and_due_date_widget_from_incident.rb
@@ -3,7 +3,7 @@
 class RemoveStartAndDueDateWidgetFromIncident < Gitlab::Database::Migration[2.2]
   include Gitlab::Database::MigrationHelpers::WorkItems::Widgets
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
   milestone '17.9'
 
diff --git a/db/migrate/20250203192931_add_linked_resources_widget_to_work_item_types.rb b/db/migrate/20250203192931_add_linked_resources_widget_to_work_item_types.rb
index 24519275c0dee7..de5822d2f6d9be 100644
--- a/db/migrate/20250203192931_add_linked_resources_widget_to_work_item_types.rb
+++ b/db/migrate/20250203192931_add_linked_resources_widget_to_work_item_types.rb
@@ -3,7 +3,7 @@
 class AddLinkedResourcesWidgetToWorkItemTypes < Gitlab::Database::Migration[2.2]
   include Gitlab::Database::MigrationHelpers::WorkItems::Widgets
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
   milestone '17.9'
 
diff --git a/db/migrate/20250207141159_backfill_default_pages_deployment_limit.rb b/db/migrate/20250207141159_backfill_default_pages_deployment_limit.rb
index 764f0733107f75..867bebf493ce50 100644
--- a/db/migrate/20250207141159_backfill_default_pages_deployment_limit.rb
+++ b/db/migrate/20250207141159_backfill_default_pages_deployment_limit.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class BackfillDefaultPagesDeploymentLimit < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.9'
 
   def up
diff --git a/db/migrate/20250207143820_add_swift_purl_type_to_application_setting.rb b/db/migrate/20250207143820_add_swift_purl_type_to_application_setting.rb
index 4c768d3aea4dd8..725b5122ff7869 100644
--- a/db/migrate/20250207143820_add_swift_purl_type_to_application_setting.rb
+++ b/db/migrate/20250207143820_add_swift_purl_type_to_application_setting.rb
@@ -3,7 +3,7 @@
 class AddSwiftPurlTypeToApplicationSetting < Gitlab::Database::Migration[2.2]
   milestone '17.9'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   class ApplicationSetting < MigrationRecord
   end
diff --git a/db/migrate/20250209173756_add_milestone_widget_to_epic_work_item.rb b/db/migrate/20250209173756_add_milestone_widget_to_epic_work_item.rb
index bf1f6d8b074ae1..78261fa3f1f827 100644
--- a/db/migrate/20250209173756_add_milestone_widget_to_epic_work_item.rb
+++ b/db/migrate/20250209173756_add_milestone_widget_to_epic_work_item.rb
@@ -3,7 +3,7 @@
 class AddMilestoneWidgetToEpicWorkItem < Gitlab::Database::Migration[2.2]
   include Gitlab::Database::MigrationHelpers::WorkItems::Widgets
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction
   milestone '17.10'
 
diff --git a/db/migrate/20250225223553_rename_status_widget_to_verification_status_widget.rb b/db/migrate/20250225223553_rename_status_widget_to_verification_status_widget.rb
index 47a356e850dffe..f6d79833bbe35c 100644
--- a/db/migrate/20250225223553_rename_status_widget_to_verification_status_widget.rb
+++ b/db/migrate/20250225223553_rename_status_widget_to_verification_status_widget.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class RenameStatusWidgetToVerificationStatusWidget < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
 
   milestone '17.10'
diff --git a/db/migrate/20250228183319_migrate_vscode_extension_marketplace_feature_flag_to_data.rb b/db/migrate/20250228183319_migrate_vscode_extension_marketplace_feature_flag_to_data.rb
index d2dbc3a1bba94e..e33e6da5df2093 100644
--- a/db/migrate/20250228183319_migrate_vscode_extension_marketplace_feature_flag_to_data.rb
+++ b/db/migrate/20250228183319_migrate_vscode_extension_marketplace_feature_flag_to_data.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class MigrateVSCodeExtensionMarketplaceFeatureFlagToData < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.10'
 
   def up
diff --git a/db/migrate/20250302110537_rename_custom_status_widget_to_status_widget.rb b/db/migrate/20250302110537_rename_custom_status_widget_to_status_widget.rb
index 48ed6815564556..c9d329797dc46d 100644
--- a/db/migrate/20250302110537_rename_custom_status_widget_to_status_widget.rb
+++ b/db/migrate/20250302110537_rename_custom_status_widget_to_status_widget.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class RenameCustomStatusWidgetToStatusWidget < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
 
   milestone '17.10'
diff --git a/db/migrate/20250305122633_add_vulnerabilities_widget_to_work_item_types.rb b/db/migrate/20250305122633_add_vulnerabilities_widget_to_work_item_types.rb
index 1020a8acce0a6b..a817c87aec8311 100644
--- a/db/migrate/20250305122633_add_vulnerabilities_widget_to_work_item_types.rb
+++ b/db/migrate/20250305122633_add_vulnerabilities_widget_to_work_item_types.rb
@@ -3,7 +3,7 @@
 class AddVulnerabilitiesWidgetToWorkItemTypes < Gitlab::Database::Migration[2.2]
   include Gitlab::Database::MigrationHelpers::WorkItems::Widgets
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
   milestone '17.10'
 
diff --git a/db/migrate/20250306092736_remove_product_usage_data_enabled_from_service_ping_settings.rb b/db/migrate/20250306092736_remove_product_usage_data_enabled_from_service_ping_settings.rb
index a2fcf95e2827b1..39fcc990285c7c 100644
--- a/db/migrate/20250306092736_remove_product_usage_data_enabled_from_service_ping_settings.rb
+++ b/db/migrate/20250306092736_remove_product_usage_data_enabled_from_service_ping_settings.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class RemoveProductUsageDataEnabledFromServicePingSettings < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '17.10'
   class ApplicationSetting < MigrationRecord
diff --git a/db/migrate/20250324092854_cleanup_records_with_null_namespace_id_from_seat_assignments.rb b/db/migrate/20250324092854_cleanup_records_with_null_namespace_id_from_seat_assignments.rb
index 6658afb16c7a10..c7118453dfe8ff 100644
--- a/db/migrate/20250324092854_cleanup_records_with_null_namespace_id_from_seat_assignments.rb
+++ b/db/migrate/20250324092854_cleanup_records_with_null_namespace_id_from_seat_assignments.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class CleanupRecordsWithNullNamespaceIdFromSeatAssignments < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
   milestone '17.11'
 
diff --git a/db/migrate/20250327134942_move_package_registry_application_settings_to_jsonb_column.rb b/db/migrate/20250327134942_move_package_registry_application_settings_to_jsonb_column.rb
index 71c0bf8688ab9f..826330e6109d6f 100644
--- a/db/migrate/20250327134942_move_package_registry_application_settings_to_jsonb_column.rb
+++ b/db/migrate/20250327134942_move_package_registry_application_settings_to_jsonb_column.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class MovePackageRegistryApplicationSettingsToJsonbColumn < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.11'
 
   PACKAGE_REGISTRY_COLUMNS = %w[
diff --git a/db/migrate/20250331055316_migrate_global_search_settings_in_application_settings_v2.rb b/db/migrate/20250331055316_migrate_global_search_settings_in_application_settings_v2.rb
index 71eff7713fa62c..4459bfbc80be5d 100644
--- a/db/migrate/20250331055316_migrate_global_search_settings_in_application_settings_v2.rb
+++ b/db/migrate/20250331055316_migrate_global_search_settings_in_application_settings_v2.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class MigrateGlobalSearchSettingsInApplicationSettingsV2 < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.11'
 
   class ApplicationSetting < MigrationRecord
diff --git a/db/migrate/20250410080824_disable_ai_events_backfill_to_ch_for_com.rb b/db/migrate/20250410080824_disable_ai_events_backfill_to_ch_for_com.rb
index 90049ae0b46268..ddadb5a912331e 100644
--- a/db/migrate/20250410080824_disable_ai_events_backfill_to_ch_for_com.rb
+++ b/db/migrate/20250410080824_disable_ai_events_backfill_to_ch_for_com.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class DisableAiEventsBackfillToChForCom < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '17.11'
 
diff --git a/db/migrate/20250414125030_update_application_setting_default_scan_execution_policies_action_limit.rb b/db/migrate/20250414125030_update_application_setting_default_scan_execution_policies_action_limit.rb
index 1f3a8dd37468dd..626b24851ce7b5 100644
--- a/db/migrate/20250414125030_update_application_setting_default_scan_execution_policies_action_limit.rb
+++ b/db/migrate/20250414125030_update_application_setting_default_scan_execution_policies_action_limit.rb
@@ -3,7 +3,7 @@
 class UpdateApplicationSettingDefaultScanExecutionPoliciesActionLimit < Gitlab::Database::Migration[2.2]
   milestone "18.0"
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     execute <<~SQL
diff --git a/db/migrate/20250417141927_add_pub_purl_type_to_application_setting.rb b/db/migrate/20250417141927_add_pub_purl_type_to_application_setting.rb
index 3fe26d507f58d8..9c4b7486e1e822 100644
--- a/db/migrate/20250417141927_add_pub_purl_type_to_application_setting.rb
+++ b/db/migrate/20250417141927_add_pub_purl_type_to_application_setting.rb
@@ -3,7 +3,7 @@
 class AddPubPurlTypeToApplicationSetting < Gitlab::Database::Migration[2.2]
   milestone '18.0'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   class ApplicationSetting < MigrationRecord
   end
diff --git a/db/migrate/20250421120553_migrate_require_email_verification_feature_flag_to_application_setting.rb b/db/migrate/20250421120553_migrate_require_email_verification_feature_flag_to_application_setting.rb
index 6ac0570f573d66..d30ac059c4c38a 100644
--- a/db/migrate/20250421120553_migrate_require_email_verification_feature_flag_to_application_setting.rb
+++ b/db/migrate/20250421120553_migrate_require_email_verification_feature_flag_to_application_setting.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class MigrateRequireEmailVerificationFeatureFlagToApplicationSetting < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '18.1'
 
   def up
diff --git a/db/migrate/20250423075634_cleanup_backfill_missing_namespace_id_on_notes.rb b/db/migrate/20250423075634_cleanup_backfill_missing_namespace_id_on_notes.rb
index 4e039b98167428..fde127bf76c8d8 100644
--- a/db/migrate/20250423075634_cleanup_backfill_missing_namespace_id_on_notes.rb
+++ b/db/migrate/20250423075634_cleanup_backfill_missing_namespace_id_on_notes.rb
@@ -5,7 +5,7 @@ class CleanupBackfillMissingNamespaceIdOnNotes < Gitlab::Database::Migration[2.2
 
   MIGRATION = 'BackfillMissingNamespaceIdOnNotes'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     # rubocop:disable Migration/BatchMigrationsPostOnly -- Delete in a migration rather than post_migration
diff --git a/db/migrate/20250502052327_disable_product_usage_data_collection_for_offline_licenses.rb b/db/migrate/20250502052327_disable_product_usage_data_collection_for_offline_licenses.rb
index 83a46c2aa606ff..e278a961df8771 100644
--- a/db/migrate/20250502052327_disable_product_usage_data_collection_for_offline_licenses.rb
+++ b/db/migrate/20250502052327_disable_product_usage_data_collection_for_offline_licenses.rb
@@ -3,7 +3,7 @@
 class DisableProductUsageDataCollectionForOfflineLicenses < Gitlab::Database::Migration[2.3]
   milestone '18.0'
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     return unless Gitlab.ee?
diff --git a/db/migrate/20250514054305_add_status_widget_definition_to_issues.rb b/db/migrate/20250514054305_add_status_widget_definition_to_issues.rb
index 547b5f0cebcdd2..0c943d98937561 100644
--- a/db/migrate/20250514054305_add_status_widget_definition_to_issues.rb
+++ b/db/migrate/20250514054305_add_status_widget_definition_to_issues.rb
@@ -3,7 +3,7 @@
 class AddStatusWidgetDefinitionToIssues < Gitlab::Database::Migration[2.3]
   include Gitlab::Database::MigrationHelpers::WorkItems::Widgets
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
   milestone '18.1'
 
diff --git a/db/migrate/20250527063245_update_pipeline_role_setting_on_gitlab_com.rb b/db/migrate/20250527063245_update_pipeline_role_setting_on_gitlab_com.rb
index 50c43ccff17a94..70c73c7a54713f 100644
--- a/db/migrate/20250527063245_update_pipeline_role_setting_on_gitlab_com.rb
+++ b/db/migrate/20250527063245_update_pipeline_role_setting_on_gitlab_com.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class UpdatePipelineRoleSettingOnGitlabCom < Gitlab::Database::Migration[2.3]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '18.1'
 
diff --git a/db/migrate/20250605135109_migrate_delay_delete_own_user_feature_flag_to_application_setting.rb b/db/migrate/20250605135109_migrate_delay_delete_own_user_feature_flag_to_application_setting.rb
index 238b752a4345ac..d0e262309f5138 100644
--- a/db/migrate/20250605135109_migrate_delay_delete_own_user_feature_flag_to_application_setting.rb
+++ b/db/migrate/20250605135109_migrate_delay_delete_own_user_feature_flag_to_application_setting.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class MigrateDelayDeleteOwnUserFeatureFlagToApplicationSetting < Gitlab::Database::Migration[2.3]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '18.2'
 
   def up
diff --git a/db/migrate/20250618010103_cleanup_records_with_null_project_ids_from_duo_workflows_workflows.rb b/db/migrate/20250618010103_cleanup_records_with_null_project_ids_from_duo_workflows_workflows.rb
index 49819b24d356d4..d7324ad6a9b1ea 100644
--- a/db/migrate/20250618010103_cleanup_records_with_null_project_ids_from_duo_workflows_workflows.rb
+++ b/db/migrate/20250618010103_cleanup_records_with_null_project_ids_from_duo_workflows_workflows.rb
@@ -3,7 +3,7 @@
 class CleanupRecordsWithNullProjectIdsFromDuoWorkflowsWorkflows < Gitlab::Database::Migration[2.3]
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '18.2'
 
diff --git a/db/migrate/20250618010203_cleanup_records_with_null_project_ids_from_duo_workflows_checkpoints.rb b/db/migrate/20250618010203_cleanup_records_with_null_project_ids_from_duo_workflows_checkpoints.rb
index 68456c1e185f88..aa509b482c66b1 100644
--- a/db/migrate/20250618010203_cleanup_records_with_null_project_ids_from_duo_workflows_checkpoints.rb
+++ b/db/migrate/20250618010203_cleanup_records_with_null_project_ids_from_duo_workflows_checkpoints.rb
@@ -3,7 +3,7 @@
 class CleanupRecordsWithNullProjectIdsFromDuoWorkflowsCheckpoints < Gitlab::Database::Migration[2.3]
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '18.2'
 
diff --git a/db/migrate/20250618010303_cleanup_records_with_null_project_ids_from_duo_workflows_events.rb b/db/migrate/20250618010303_cleanup_records_with_null_project_ids_from_duo_workflows_events.rb
index 2a37aece7a1a92..026b86c313c55e 100644
--- a/db/migrate/20250618010303_cleanup_records_with_null_project_ids_from_duo_workflows_events.rb
+++ b/db/migrate/20250618010303_cleanup_records_with_null_project_ids_from_duo_workflows_events.rb
@@ -3,7 +3,7 @@
 class CleanupRecordsWithNullProjectIdsFromDuoWorkflowsEvents < Gitlab::Database::Migration[2.3]
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '18.2'
 
diff --git a/db/migrate/20250618010403_cleanup_records_with_null_project_ids_from_duo_workflows_checkpoint_writes.rb b/db/migrate/20250618010403_cleanup_records_with_null_project_ids_from_duo_workflows_checkpoint_writes.rb
index 6227e99dee2c21..f2f4c664673949 100644
--- a/db/migrate/20250618010403_cleanup_records_with_null_project_ids_from_duo_workflows_checkpoint_writes.rb
+++ b/db/migrate/20250618010403_cleanup_records_with_null_project_ids_from_duo_workflows_checkpoint_writes.rb
@@ -3,7 +3,7 @@
 class CleanupRecordsWithNullProjectIdsFromDuoWorkflowsCheckpointWrites < Gitlab::Database::Migration[2.3]
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '18.2'
 
diff --git a/db/migrate/20250623064640_add_linked_resources_widget_to_work_item_types_v2.rb b/db/migrate/20250623064640_add_linked_resources_widget_to_work_item_types_v2.rb
index 5da79c709331c4..75c8dc60351c8c 100644
--- a/db/migrate/20250623064640_add_linked_resources_widget_to_work_item_types_v2.rb
+++ b/db/migrate/20250623064640_add_linked_resources_widget_to_work_item_types_v2.rb
@@ -3,7 +3,7 @@
 class AddLinkedResourcesWidgetToWorkItemTypesV2 < Gitlab::Database::Migration[2.3]
   include Gitlab::Database::MigrationHelpers::WorkItems::Widgets
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
   milestone '18.2'
 
diff --git a/db/migrate/20250721155137_add_model_prompt_cache_enabled_to_application_settings.rb b/db/migrate/20250721155137_add_model_prompt_cache_enabled_to_application_settings.rb
index cd4a5c946c4387..e9a531ebf4ec37 100644
--- a/db/migrate/20250721155137_add_model_prompt_cache_enabled_to_application_settings.rb
+++ b/db/migrate/20250721155137_add_model_prompt_cache_enabled_to_application_settings.rb
@@ -5,7 +5,7 @@ class AddModelPromptCacheEnabledToApplicationSettings < Gitlab::Database::Migrat
 
   milestone '18.3'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     execute <<~SQL
diff --git a/db/migrate/20250729115449_add_lock_model_prompt_cache_enabled_to_application_settings.rb b/db/migrate/20250729115449_add_lock_model_prompt_cache_enabled_to_application_settings.rb
index 157949d2a2e713..2477e3c59418a5 100644
--- a/db/migrate/20250729115449_add_lock_model_prompt_cache_enabled_to_application_settings.rb
+++ b/db/migrate/20250729115449_add_lock_model_prompt_cache_enabled_to_application_settings.rb
@@ -3,7 +3,7 @@
 class AddLockModelPromptCacheEnabledToApplicationSettings < Gitlab::Database::Migration[2.3]
   # disable_ddl_transaction!
   #
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '18.3'
 
diff --git a/db/migrate/20250729233543_update_wiki_page_max_content_bytes_to_5_megabytes.rb b/db/migrate/20250729233543_update_wiki_page_max_content_bytes_to_5_megabytes.rb
index f4b5b73c2dbdc5..17c16ca19ecf9a 100644
--- a/db/migrate/20250729233543_update_wiki_page_max_content_bytes_to_5_megabytes.rb
+++ b/db/migrate/20250729233543_update_wiki_page_max_content_bytes_to_5_megabytes.rb
@@ -3,7 +3,7 @@
 class UpdateWikiPageMaxContentBytesTo5Megabytes < Gitlab::Database::Migration[2.3]
   milestone '18.3'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     execute <<-SQL
diff --git a/db/migrate/20250914215222_cleanup_null_records_for_prometheus_in_conversational_development_index_metrics.rb b/db/migrate/20250914215222_cleanup_null_records_for_prometheus_in_conversational_development_index_metrics.rb
index 36e0071a469ed3..1786ad15556a4b 100644
--- a/db/migrate/20250914215222_cleanup_null_records_for_prometheus_in_conversational_development_index_metrics.rb
+++ b/db/migrate/20250914215222_cleanup_null_records_for_prometheus_in_conversational_development_index_metrics.rb
@@ -3,7 +3,7 @@
 class CleanupNullRecordsForPrometheusInConversationalDevelopmentIndexMetrics < Gitlab::Database::Migration[2.3]
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '18.5'
 
diff --git a/db/post_migrate/20240307051421_update_occupies_seat_on_member_roles.rb b/db/post_migrate/20240307051421_update_occupies_seat_on_member_roles.rb
index e3bef4b7628d47..87aaf19773d6d0 100644
--- a/db/post_migrate/20240307051421_update_occupies_seat_on_member_roles.rb
+++ b/db/post_migrate/20240307051421_update_occupies_seat_on_member_roles.rb
@@ -5,7 +5,7 @@ class UpdateOccupiesSeatOnMemberRoles < Gitlab::Database::Migration[2.2]
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     sql = <<~SQL
diff --git a/db/post_migrate/20240318150930_finalize_backfill_onboarding_status_step_url.rb b/db/post_migrate/20240318150930_finalize_backfill_onboarding_status_step_url.rb
index 3a556c2b40e188..c10e6c56b21b3a 100644
--- a/db/post_migrate/20240318150930_finalize_backfill_onboarding_status_step_url.rb
+++ b/db/post_migrate/20240318150930_finalize_backfill_onboarding_status_step_url.rb
@@ -4,7 +4,7 @@ class FinalizeBackfillOnboardingStatusStepUrl < Gitlab::Database::Migration[2.2]
   disable_ddl_transaction!
 
   milestone '16.11'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     # params match the queueing migration in db/post_migrate/20240226174509_queue_backfill_onboarding_status_step_url.rb
diff --git a/db/post_migrate/20240321045306_finalize_backfill_default_organization_owners_again.rb b/db/post_migrate/20240321045306_finalize_backfill_default_organization_owners_again.rb
index c08ed373331c7a..a2e67986e2e199 100644
--- a/db/post_migrate/20240321045306_finalize_backfill_default_organization_owners_again.rb
+++ b/db/post_migrate/20240321045306_finalize_backfill_default_organization_owners_again.rb
@@ -5,7 +5,7 @@ class FinalizeBackfillDefaultOrganizationOwnersAgain < Gitlab::Database::Migrati
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20240325131114_move_self_managed_cr_to_instance.rb b/db/post_migrate/20240325131114_move_self_managed_cr_to_instance.rb
index d41d6af4f7d335..b5724e69c079ca 100644
--- a/db/post_migrate/20240325131114_move_self_managed_cr_to_instance.rb
+++ b/db/post_migrate/20240325131114_move_self_managed_cr_to_instance.rb
@@ -5,7 +5,7 @@ class MoveSelfManagedCrToInstance < Gitlab::Database::Migration[2.2]
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     # the migration needs to run only on self-managed
diff --git a/db/post_migrate/20240329125210_finalize_has_issues_backfilling.rb b/db/post_migrate/20240329125210_finalize_has_issues_backfilling.rb
index 4f0f40d29af74f..bc77f3f156b1aa 100644
--- a/db/post_migrate/20240329125210_finalize_has_issues_backfilling.rb
+++ b/db/post_migrate/20240329125210_finalize_has_issues_backfilling.rb
@@ -4,7 +4,7 @@ class FinalizeHasIssuesBackfilling < Gitlab::Database::Migration[2.2]
   milestone '16.11'
 
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillHasIssuesForExternalIssueLinks"
 
diff --git a/db/post_migrate/20240402080706_finalize_backfill_vs_code_settings_version.rb b/db/post_migrate/20240402080706_finalize_backfill_vs_code_settings_version.rb
index 84136de6507b43..2a12b091631b8f 100644
--- a/db/post_migrate/20240402080706_finalize_backfill_vs_code_settings_version.rb
+++ b/db/post_migrate/20240402080706_finalize_backfill_vs_code_settings_version.rb
@@ -3,7 +3,7 @@
 class FinalizeBackfillVsCodeSettingsVersion < Gitlab::Database::Migration[2.2]
   milestone '16.11'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
 
   TABLE_NAME = 'vs_code_settings'
diff --git a/db/post_migrate/20240402143848_queue_backfill_jira_tracker_data_project_keys.rb b/db/post_migrate/20240402143848_queue_backfill_jira_tracker_data_project_keys.rb
index 0fe98f42cc5a38..c08a6ddb20b1f8 100644
--- a/db/post_migrate/20240402143848_queue_backfill_jira_tracker_data_project_keys.rb
+++ b/db/post_migrate/20240402143848_queue_backfill_jira_tracker_data_project_keys.rb
@@ -3,7 +3,7 @@
 class QueueBackfillJiraTrackerDataProjectKeys < Gitlab::Database::Migration[2.2]
   milestone '17.0'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillJiraTrackerDataProjectKeys"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20240403121221_migrate_inputs_to_spec_on_catalog_resource_components.rb b/db/post_migrate/20240403121221_migrate_inputs_to_spec_on_catalog_resource_components.rb
index 414a20df3f1e46..ca7f220adfa079 100644
--- a/db/post_migrate/20240403121221_migrate_inputs_to_spec_on_catalog_resource_components.rb
+++ b/db/post_migrate/20240403121221_migrate_inputs_to_spec_on_catalog_resource_components.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class MigrateInputsToSpecOnCatalogResourceComponents < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '16.11'
 
diff --git a/db/post_migrate/20240404083904_backfill_merge_request_metrics_pipeline_id_bigint.rb b/db/post_migrate/20240404083904_backfill_merge_request_metrics_pipeline_id_bigint.rb
index 45b661678ffbf2..afb13a2a5f0aea 100644
--- a/db/post_migrate/20240404083904_backfill_merge_request_metrics_pipeline_id_bigint.rb
+++ b/db/post_migrate/20240404083904_backfill_merge_request_metrics_pipeline_id_bigint.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class BackfillMergeRequestMetricsPipelineIdBigint < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '16.11'
 
   TABLE = :merge_request_metrics
diff --git a/db/post_migrate/20240404084004_backfill_merge_requests_head_pipeline_id_bigint.rb b/db/post_migrate/20240404084004_backfill_merge_requests_head_pipeline_id_bigint.rb
index b11c825a4c02d0..c8c10b3ff25240 100644
--- a/db/post_migrate/20240404084004_backfill_merge_requests_head_pipeline_id_bigint.rb
+++ b/db/post_migrate/20240404084004_backfill_merge_requests_head_pipeline_id_bigint.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class BackfillMergeRequestsHeadPipelineIdBigint < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '16.11'
 
   TABLE = :merge_requests
diff --git a/db/post_migrate/20240404084104_backfill_merge_trains_pipeline_id_bigint.rb b/db/post_migrate/20240404084104_backfill_merge_trains_pipeline_id_bigint.rb
index 987e4440c1e661..5c4ca5fe89867f 100644
--- a/db/post_migrate/20240404084104_backfill_merge_trains_pipeline_id_bigint.rb
+++ b/db/post_migrate/20240404084104_backfill_merge_trains_pipeline_id_bigint.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class BackfillMergeTrainsPipelineIdBigint < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '16.11'
 
   TABLE = :merge_trains
diff --git a/db/post_migrate/20240404084204_backfill_packages_build_infos_pipeline_id_bigint.rb b/db/post_migrate/20240404084204_backfill_packages_build_infos_pipeline_id_bigint.rb
index e09fbeb2fdd696..4e254a3add586f 100644
--- a/db/post_migrate/20240404084204_backfill_packages_build_infos_pipeline_id_bigint.rb
+++ b/db/post_migrate/20240404084204_backfill_packages_build_infos_pipeline_id_bigint.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class BackfillPackagesBuildInfosPipelineIdBigint < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '16.11'
 
   TABLE = :packages_build_infos
diff --git a/db/post_migrate/20240404084304_backfill_vulnerability_feedback_pipeline_id_bigint.rb b/db/post_migrate/20240404084304_backfill_vulnerability_feedback_pipeline_id_bigint.rb
index 44e8aa827863f5..6d7ade9bed2869 100644
--- a/db/post_migrate/20240404084304_backfill_vulnerability_feedback_pipeline_id_bigint.rb
+++ b/db/post_migrate/20240404084304_backfill_vulnerability_feedback_pipeline_id_bigint.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class BackfillVulnerabilityFeedbackPipelineIdBigint < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '16.11'
 
   TABLE = :vulnerability_feedback
diff --git a/db/post_migrate/20240409023046_queue_fix_corrupted_scanner_ids_of_vulnerability_reads.rb b/db/post_migrate/20240409023046_queue_fix_corrupted_scanner_ids_of_vulnerability_reads.rb
index a7809140b0bf8b..142254f58ef4d2 100644
--- a/db/post_migrate/20240409023046_queue_fix_corrupted_scanner_ids_of_vulnerability_reads.rb
+++ b/db/post_migrate/20240409023046_queue_fix_corrupted_scanner_ids_of_vulnerability_reads.rb
@@ -9,7 +9,7 @@ class QueueFixCorruptedScannerIdsOfVulnerabilityReads < Gitlab::Database::Migrat
   SUB_BATCH_SIZE = 100
 
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     Gitlab::Database::QueryAnalyzers::Base.suppress_schema_issues_for_decomposed_tables do
diff --git a/db/post_migrate/20240409140739_requeue_backfill_archived_and_traversal_ids_to_vulnerability_reads.rb b/db/post_migrate/20240409140739_requeue_backfill_archived_and_traversal_ids_to_vulnerability_reads.rb
index acb7604d185aa0..e728ce5973b744 100644
--- a/db/post_migrate/20240409140739_requeue_backfill_archived_and_traversal_ids_to_vulnerability_reads.rb
+++ b/db/post_migrate/20240409140739_requeue_backfill_archived_and_traversal_ids_to_vulnerability_reads.rb
@@ -3,7 +3,7 @@
 class RequeueBackfillArchivedAndTraversalIdsToVulnerabilityReads < Gitlab::Database::Migration[2.2]
   milestone '16.11'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillArchivedAndTraversalIdsToVulnerabilityReads"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20240415130318_migrate_application_settings_help_text.rb b/db/post_migrate/20240415130318_migrate_application_settings_help_text.rb
index 768b88aaa45f92..2192e41ba77afd 100644
--- a/db/post_migrate/20240415130318_migrate_application_settings_help_text.rb
+++ b/db/post_migrate/20240415130318_migrate_application_settings_help_text.rb
@@ -2,7 +2,7 @@
 
 class MigrateApplicationSettingsHelpText < Gitlab::Database::Migration[2.2]
   milestone '17.0'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   class MigrationApplicationSettings < MigrationRecord
     self.table_name = 'application_settings'
diff --git a/db/post_migrate/20240416103114_ensure_backfill_packages_build_infos_pipeline_id_convert_to_bigint_is_completed.rb b/db/post_migrate/20240416103114_ensure_backfill_packages_build_infos_pipeline_id_convert_to_bigint_is_completed.rb
index b2d331ad506b6e..7a000730df214e 100644
--- a/db/post_migrate/20240416103114_ensure_backfill_packages_build_infos_pipeline_id_convert_to_bigint_is_completed.rb
+++ b/db/post_migrate/20240416103114_ensure_backfill_packages_build_infos_pipeline_id_convert_to_bigint_is_completed.rb
@@ -2,7 +2,7 @@
 
 class EnsureBackfillPackagesBuildInfosPipelineIdConvertToBigintIsCompleted < Gitlab::Database::Migration[2.2]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.0'
 
   TABLE_NAME = :packages_build_infos
diff --git a/db/post_migrate/20240416110447_ensure_backfill_merge_trains_pipeline_id_convert_to_bigint_is_completed.rb b/db/post_migrate/20240416110447_ensure_backfill_merge_trains_pipeline_id_convert_to_bigint_is_completed.rb
index ed30d4e292e1f9..0a7bdf8a8e3f2f 100644
--- a/db/post_migrate/20240416110447_ensure_backfill_merge_trains_pipeline_id_convert_to_bigint_is_completed.rb
+++ b/db/post_migrate/20240416110447_ensure_backfill_merge_trains_pipeline_id_convert_to_bigint_is_completed.rb
@@ -2,7 +2,7 @@
 
 class EnsureBackfillMergeTrainsPipelineIdConvertToBigintIsCompleted < Gitlab::Database::Migration[2.2]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.0'
 
   TABLE_NAME = :merge_trains
diff --git a/db/post_migrate/20240416111927_ensure_backfill_vulnerability_feedback_id_convert_to_bigint_is_completed.rb b/db/post_migrate/20240416111927_ensure_backfill_vulnerability_feedback_id_convert_to_bigint_is_completed.rb
index 692532021a8e99..56c179d7e1377f 100644
--- a/db/post_migrate/20240416111927_ensure_backfill_vulnerability_feedback_id_convert_to_bigint_is_completed.rb
+++ b/db/post_migrate/20240416111927_ensure_backfill_vulnerability_feedback_id_convert_to_bigint_is_completed.rb
@@ -2,7 +2,7 @@
 
 class EnsureBackfillVulnerabilityFeedbackIdConvertToBigintIsCompleted < Gitlab::Database::Migration[2.2]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.0'
 
   TABLE_NAME = :vulnerability_feedback
diff --git a/db/post_migrate/20240416144510_migrate_container_protection_rules_minimum_access_level.rb b/db/post_migrate/20240416144510_migrate_container_protection_rules_minimum_access_level.rb
index 1c71512f880f1f..d0a366f95fb656 100644
--- a/db/post_migrate/20240416144510_migrate_container_protection_rules_minimum_access_level.rb
+++ b/db/post_migrate/20240416144510_migrate_container_protection_rules_minimum_access_level.rb
@@ -3,7 +3,7 @@
 class MigrateContainerProtectionRulesMinimumAccessLevel < Gitlab::Database::Migration[2.2]
   milestone '17.0'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   DEVELOPER = 30
   MAINTAINER = 40
diff --git a/db/post_migrate/20240422163959_queue_disable_allow_runner_registration_on_namespace_settings_for_gitlab_com.rb b/db/post_migrate/20240422163959_queue_disable_allow_runner_registration_on_namespace_settings_for_gitlab_com.rb
index 9c3802d5564b3b..42c825528d3aba 100644
--- a/db/post_migrate/20240422163959_queue_disable_allow_runner_registration_on_namespace_settings_for_gitlab_com.rb
+++ b/db/post_migrate/20240422163959_queue_disable_allow_runner_registration_on_namespace_settings_for_gitlab_com.rb
@@ -3,7 +3,7 @@
 class QueueDisableAllowRunnerRegistrationOnNamespaceSettingsForGitlabCom < Gitlab::Database::Migration[2.2]
   milestone '17.0'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = 'DisableAllowRunnerRegistrationOnNamespaceSettingsForGitlabCom'
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20240422165035_update_kustomization_api_version.rb b/db/post_migrate/20240422165035_update_kustomization_api_version.rb
index 8a038668dc355c..4b09c66340515f 100644
--- a/db/post_migrate/20240422165035_update_kustomization_api_version.rb
+++ b/db/post_migrate/20240422165035_update_kustomization_api_version.rb
@@ -2,7 +2,7 @@
 
 class UpdateKustomizationApiVersion < Gitlab::Database::Migration[2.2]
   milestone '17.0'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
 
   OLD_VERSION = 'kustomize.toolkit.fluxcd.io/v1beta1'
diff --git a/db/post_migrate/20240424100836_ensure_backfill_merge_request_metrics_pipeline_id_convert_to_bigint_is_completed.rb b/db/post_migrate/20240424100836_ensure_backfill_merge_request_metrics_pipeline_id_convert_to_bigint_is_completed.rb
index a5ba4a46991eca..c7e18dca67ee06 100644
--- a/db/post_migrate/20240424100836_ensure_backfill_merge_request_metrics_pipeline_id_convert_to_bigint_is_completed.rb
+++ b/db/post_migrate/20240424100836_ensure_backfill_merge_request_metrics_pipeline_id_convert_to_bigint_is_completed.rb
@@ -2,7 +2,7 @@
 
 class EnsureBackfillMergeRequestMetricsPipelineIdConvertToBigintIsCompleted < Gitlab::Database::Migration[2.2]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.0'
 
   TABLE_NAME = :merge_request_metrics
diff --git a/db/post_migrate/20240424183213_backfill_deployment_approval_data.rb b/db/post_migrate/20240424183213_backfill_deployment_approval_data.rb
index 12cebc50ef7efe..27adef7a14d6eb 100644
--- a/db/post_migrate/20240424183213_backfill_deployment_approval_data.rb
+++ b/db/post_migrate/20240424183213_backfill_deployment_approval_data.rb
@@ -2,7 +2,7 @@
 
 class BackfillDeploymentApprovalData < Gitlab::Database::Migration[2.2]
   milestone '17.0'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
 
   BATCH_SIZE = 500
diff --git a/db/post_migrate/20240425133709_finalize_feedback_to_state_transition_migration.rb b/db/post_migrate/20240425133709_finalize_feedback_to_state_transition_migration.rb
index 1a879d74a62b70..c709257f6316e6 100644
--- a/db/post_migrate/20240425133709_finalize_feedback_to_state_transition_migration.rb
+++ b/db/post_migrate/20240425133709_finalize_feedback_to_state_transition_migration.rb
@@ -2,7 +2,7 @@
 
 class FinalizeFeedbackToStateTransitionMigration < Gitlab::Database::Migration[2.2]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.0'
 
   MIGRATION_NAME = "MigrateVulnerabilitiesFeedbackToVulnerabilitiesStateTransition"
diff --git a/db/post_migrate/20240425140717_finalize_vulnerability_links_creation.rb b/db/post_migrate/20240425140717_finalize_vulnerability_links_creation.rb
index 4560b271df917a..25cab793408473 100644
--- a/db/post_migrate/20240425140717_finalize_vulnerability_links_creation.rb
+++ b/db/post_migrate/20240425140717_finalize_vulnerability_links_creation.rb
@@ -2,7 +2,7 @@
 
 class FinalizeVulnerabilityLinksCreation < Gitlab::Database::Migration[2.2]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.0'
 
   MIGRATION_NAME = "CreateVulnerabilityLinks"
diff --git a/db/post_migrate/20240429113537_ensure_backfill_vulnerability_occurrence_pipelines_id_to_bigint_is_completed.rb b/db/post_migrate/20240429113537_ensure_backfill_vulnerability_occurrence_pipelines_id_to_bigint_is_completed.rb
index 29c664d8d2b210..384db882c3a4fa 100644
--- a/db/post_migrate/20240429113537_ensure_backfill_vulnerability_occurrence_pipelines_id_to_bigint_is_completed.rb
+++ b/db/post_migrate/20240429113537_ensure_backfill_vulnerability_occurrence_pipelines_id_to_bigint_is_completed.rb
@@ -2,7 +2,7 @@
 
 class EnsureBackfillVulnerabilityOccurrencePipelinesIdToBigintIsCompleted < Gitlab::Database::Migration[2.2]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.0'
 
   TABLE_NAME = :vulnerability_occurrence_pipelines
diff --git a/db/post_migrate/20240430004051_finalize_backfill_has_remediations_of_vulnerability_reads.rb b/db/post_migrate/20240430004051_finalize_backfill_has_remediations_of_vulnerability_reads.rb
index 4ad442df96f561..c78242ccb30caf 100644
--- a/db/post_migrate/20240430004051_finalize_backfill_has_remediations_of_vulnerability_reads.rb
+++ b/db/post_migrate/20240430004051_finalize_backfill_has_remediations_of_vulnerability_reads.rb
@@ -5,7 +5,7 @@ class FinalizeBackfillHasRemediationsOfVulnerabilityReads < Gitlab::Database::Mi
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20240430111455_finalize_backfill_vulnerability_reads_cluster_agent_migration.rb b/db/post_migrate/20240430111455_finalize_backfill_vulnerability_reads_cluster_agent_migration.rb
index a51d319f0c85df..43dc2e13b888a8 100644
--- a/db/post_migrate/20240430111455_finalize_backfill_vulnerability_reads_cluster_agent_migration.rb
+++ b/db/post_migrate/20240430111455_finalize_backfill_vulnerability_reads_cluster_agent_migration.rb
@@ -6,7 +6,7 @@ class FinalizeBackfillVulnerabilityReadsClusterAgentMigration < Gitlab::Database
   disable_ddl_transaction!
   milestone '17.0'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20240503103337_queue_backfill_epic_basic_fields_to_work_item_record.rb b/db/post_migrate/20240503103337_queue_backfill_epic_basic_fields_to_work_item_record.rb
index 83d00e4f96b14c..3037d4176898e9 100644
--- a/db/post_migrate/20240503103337_queue_backfill_epic_basic_fields_to_work_item_record.rb
+++ b/db/post_migrate/20240503103337_queue_backfill_epic_basic_fields_to_work_item_record.rb
@@ -3,7 +3,7 @@
 class QueueBackfillEpicBasicFieldsToWorkItemRecord < Gitlab::Database::Migration[2.2]
   milestone '17.0'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
 
   MIGRATION = "BackfillEpicBasicFieldsToWorkItemRecord"
diff --git a/db/post_migrate/20240508231959_finalize_backfill_nuget_normalized_version.rb b/db/post_migrate/20240508231959_finalize_backfill_nuget_normalized_version.rb
index 7ea1dd827a7021..6fe244e4962418 100644
--- a/db/post_migrate/20240508231959_finalize_backfill_nuget_normalized_version.rb
+++ b/db/post_migrate/20240508231959_finalize_backfill_nuget_normalized_version.rb
@@ -5,7 +5,7 @@ class FinalizeBackfillNugetNormalizedVersion < Gitlab::Database::Migration[2.2]
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20240510113339_finalize_backfill_epic_basic_fields_to_work_item_record.rb b/db/post_migrate/20240510113339_finalize_backfill_epic_basic_fields_to_work_item_record.rb
index 488a262dd2f544..91f912e84924df 100644
--- a/db/post_migrate/20240510113339_finalize_backfill_epic_basic_fields_to_work_item_record.rb
+++ b/db/post_migrate/20240510113339_finalize_backfill_epic_basic_fields_to_work_item_record.rb
@@ -8,7 +8,7 @@
 # db/post_migrate/20240510113340_finalize_backfill_epic_basic_fields_to_work_item_record_corrected.rb
 class FinalizeBackfillEpicBasicFieldsToWorkItemRecord < Gitlab::Database::Migration[2.2]
   milestone '17.1'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   disable_ddl_transaction!
 
diff --git a/db/post_migrate/20240510113340_finalize_backfill_epic_basic_fields_to_work_item_record_corrected.rb b/db/post_migrate/20240510113340_finalize_backfill_epic_basic_fields_to_work_item_record_corrected.rb
index 8bb8301904263a..0101e9c4e865c5 100644
--- a/db/post_migrate/20240510113340_finalize_backfill_epic_basic_fields_to_work_item_record_corrected.rb
+++ b/db/post_migrate/20240510113340_finalize_backfill_epic_basic_fields_to_work_item_record_corrected.rb
@@ -4,7 +4,7 @@
 # db/post_migrate/20240510113339_finalize_backfill_epic_basic_fields_to_work_item_record.rb
 class FinalizeBackfillEpicBasicFieldsToWorkItemRecordCorrected < Gitlab::Database::Migration[2.2]
   milestone '17.1'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   disable_ddl_transaction!
 
diff --git a/db/post_migrate/20240513231841_finalize_backfill_archived_and_traversal_ids_to_vulnerability_reads.rb b/db/post_migrate/20240513231841_finalize_backfill_archived_and_traversal_ids_to_vulnerability_reads.rb
index dd697bc5a648ce..ea7858b5ba9b3c 100644
--- a/db/post_migrate/20240513231841_finalize_backfill_archived_and_traversal_ids_to_vulnerability_reads.rb
+++ b/db/post_migrate/20240513231841_finalize_backfill_archived_and_traversal_ids_to_vulnerability_reads.rb
@@ -5,7 +5,7 @@ class FinalizeBackfillArchivedAndTraversalIdsToVulnerabilityReads < Gitlab::Data
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20240515094240_delete_invalid_path_locks_records.rb b/db/post_migrate/20240515094240_delete_invalid_path_locks_records.rb
index 3b2a68db3a545a..965a98359445e5 100644
--- a/db/post_migrate/20240515094240_delete_invalid_path_locks_records.rb
+++ b/db/post_migrate/20240515094240_delete_invalid_path_locks_records.rb
@@ -2,7 +2,7 @@
 
 class DeleteInvalidPathLocksRecords < Gitlab::Database::Migration[2.2]
   milestone '17.1'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
 
   BATCH_SIZE = 1000
diff --git a/db/post_migrate/20240515102108_persist_usage_data_keys_that_should_not_expire.rb b/db/post_migrate/20240515102108_persist_usage_data_keys_that_should_not_expire.rb
index 312583934910dc..45658dcc8a5434 100644
--- a/db/post_migrate/20240515102108_persist_usage_data_keys_that_should_not_expire.rb
+++ b/db/post_migrate/20240515102108_persist_usage_data_keys_that_should_not_expire.rb
@@ -4,7 +4,7 @@ class PersistUsageDataKeysThatShouldNotExpire < Gitlab::Database::Migration[2.2]
   milestone '17.1'
 
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   REDIS_PREFIX = '{event_counters}'
 
diff --git a/db/post_migrate/20240516140819_finalize_backfill_issue_search_data_namespace_id.rb b/db/post_migrate/20240516140819_finalize_backfill_issue_search_data_namespace_id.rb
index d2b015b88651ef..6510a60a79c3a4 100644
--- a/db/post_migrate/20240516140819_finalize_backfill_issue_search_data_namespace_id.rb
+++ b/db/post_migrate/20240516140819_finalize_backfill_issue_search_data_namespace_id.rb
@@ -4,7 +4,7 @@ class FinalizeBackfillIssueSearchDataNamespaceId < Gitlab::Database::Migration[2
   milestone '17.1'
 
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillIssueSearchDataNamespaceId"
 
diff --git a/db/post_migrate/20240516160731_queue_backfill_default_branch_protection_settings.rb b/db/post_migrate/20240516160731_queue_backfill_default_branch_protection_settings.rb
index 6a97a813a26d0f..967b1058a9fbae 100644
--- a/db/post_migrate/20240516160731_queue_backfill_default_branch_protection_settings.rb
+++ b/db/post_migrate/20240516160731_queue_backfill_default_branch_protection_settings.rb
@@ -9,7 +9,7 @@ class QueueBackfillDefaultBranchProtectionSettings < Gitlab::Database::Migration
   SUB_BATCH_SIZE = 1000
 
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     queue_batched_background_migration(
diff --git a/db/post_migrate/20240517061424_enable_cross_hierarchy_for_hierarchy_restrictions.rb b/db/post_migrate/20240517061424_enable_cross_hierarchy_for_hierarchy_restrictions.rb
index b0f133a5a2e7c9..a25b70723fdf6f 100644
--- a/db/post_migrate/20240517061424_enable_cross_hierarchy_for_hierarchy_restrictions.rb
+++ b/db/post_migrate/20240517061424_enable_cross_hierarchy_for_hierarchy_restrictions.rb
@@ -4,7 +4,7 @@ class EnableCrossHierarchyForHierarchyRestrictions < Gitlab::Database::Migration
   disable_ddl_transaction!
   milestone '17.1'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   class MigrationWorkItemType < MigrationRecord
     self.table_name = 'work_item_types'
diff --git a/db/post_migrate/20240517131715_queue_backfill_related_epic_links_to_issue_links.rb b/db/post_migrate/20240517131715_queue_backfill_related_epic_links_to_issue_links.rb
index 573b5809b13898..7c03a93be7ed54 100644
--- a/db/post_migrate/20240517131715_queue_backfill_related_epic_links_to_issue_links.rb
+++ b/db/post_migrate/20240517131715_queue_backfill_related_epic_links_to_issue_links.rb
@@ -3,7 +3,7 @@
 class QueueBackfillRelatedEpicLinksToIssueLinks < Gitlab::Database::Migration[2.2]
   milestone '17.0'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillRelatedEpicLinksToIssueLinks"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20240517141003_queue_backfill_work_item_hierarchy_for_epics.rb b/db/post_migrate/20240517141003_queue_backfill_work_item_hierarchy_for_epics.rb
index c6a3ca8c6d26b2..217e4ef6bb253b 100644
--- a/db/post_migrate/20240517141003_queue_backfill_work_item_hierarchy_for_epics.rb
+++ b/db/post_migrate/20240517141003_queue_backfill_work_item_hierarchy_for_epics.rb
@@ -3,7 +3,7 @@
 class QueueBackfillWorkItemHierarchyForEpics < Gitlab::Database::Migration[2.2]
   milestone '17.1'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
 
   MIGRATION = "BackfillWorkItemHierarchyForEpics"
diff --git a/db/post_migrate/20240521051045_delete_invalid_releases_records.rb b/db/post_migrate/20240521051045_delete_invalid_releases_records.rb
index 7c787eb9a1f2da..f794b8186722d8 100644
--- a/db/post_migrate/20240521051045_delete_invalid_releases_records.rb
+++ b/db/post_migrate/20240521051045_delete_invalid_releases_records.rb
@@ -2,7 +2,7 @@
 
 class DeleteInvalidReleasesRecords < Gitlab::Database::Migration[2.2]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.1'
 
   BATCH_SIZE = 1000
diff --git a/db/post_migrate/20240522183910_queue_backfill_epic_issues_into_work_item_parent_links.rb b/db/post_migrate/20240522183910_queue_backfill_epic_issues_into_work_item_parent_links.rb
index b0653cd9960c1c..cf43987fc709ed 100644
--- a/db/post_migrate/20240522183910_queue_backfill_epic_issues_into_work_item_parent_links.rb
+++ b/db/post_migrate/20240522183910_queue_backfill_epic_issues_into_work_item_parent_links.rb
@@ -3,7 +3,7 @@
 class QueueBackfillEpicIssuesIntoWorkItemParentLinks < Gitlab::Database::Migration[2.2]
   milestone '17.1'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillEpicIssuesIntoWorkItemParentLinks"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20240523045216_finalize_fix_corrupted_scanner_ids_of_vulnerability_reads.rb b/db/post_migrate/20240523045216_finalize_fix_corrupted_scanner_ids_of_vulnerability_reads.rb
index 1a992bf85d14d6..12bd94115da083 100644
--- a/db/post_migrate/20240523045216_finalize_fix_corrupted_scanner_ids_of_vulnerability_reads.rb
+++ b/db/post_migrate/20240523045216_finalize_fix_corrupted_scanner_ids_of_vulnerability_reads.rb
@@ -4,7 +4,7 @@ class FinalizeFixCorruptedScannerIdsOfVulnerabilityReads < Gitlab::Database::Mig
   MIGRATION = "FixCorruptedScannerIdsOfVulnerabilityReads"
 
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.1'
 
   def up
diff --git a/db/post_migrate/20240523083208_delete_invalid_remote_mirrors_records.rb b/db/post_migrate/20240523083208_delete_invalid_remote_mirrors_records.rb
index a8a4da52e78784..f96b1faee55e9b 100644
--- a/db/post_migrate/20240523083208_delete_invalid_remote_mirrors_records.rb
+++ b/db/post_migrate/20240523083208_delete_invalid_remote_mirrors_records.rb
@@ -2,7 +2,7 @@
 
 class DeleteInvalidRemoteMirrorsRecords < Gitlab::Database::Migration[2.2]
   milestone '17.1'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
 
   BATCH_SIZE = 1000
diff --git a/db/post_migrate/20240526231839_finalize_backfill_catalog_resource_version_sem_ver.rb b/db/post_migrate/20240526231839_finalize_backfill_catalog_resource_version_sem_ver.rb
index 767f7f439dd317..c7ac3f35f932f7 100644
--- a/db/post_migrate/20240526231839_finalize_backfill_catalog_resource_version_sem_ver.rb
+++ b/db/post_migrate/20240526231839_finalize_backfill_catalog_resource_version_sem_ver.rb
@@ -5,7 +5,7 @@ class FinalizeBackfillCatalogResourceVersionSemVer < Gitlab::Database::Migration
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20240528000010_migrate_packages_protection_rules_minimum_access_level.rb b/db/post_migrate/20240528000010_migrate_packages_protection_rules_minimum_access_level.rb
index c80008d0f592fc..188dc194c0a734 100644
--- a/db/post_migrate/20240528000010_migrate_packages_protection_rules_minimum_access_level.rb
+++ b/db/post_migrate/20240528000010_migrate_packages_protection_rules_minimum_access_level.rb
@@ -3,7 +3,7 @@
 class MigratePackagesProtectionRulesMinimumAccessLevel < Gitlab::Database::Migration[2.2]
   milestone '17.1'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   DEVELOPER = 30
   MAINTAINER = 40
diff --git a/db/post_migrate/20240528112758_queue_resync_basic_epic_fields_to_work_item.rb b/db/post_migrate/20240528112758_queue_resync_basic_epic_fields_to_work_item.rb
index a5e57bae8cc406..965437acbc9f09 100644
--- a/db/post_migrate/20240528112758_queue_resync_basic_epic_fields_to_work_item.rb
+++ b/db/post_migrate/20240528112758_queue_resync_basic_epic_fields_to_work_item.rb
@@ -3,7 +3,7 @@
 class QueueResyncBasicEpicFieldsToWorkItem < Gitlab::Database::Migration[2.2]
   milestone '17.1'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
 
   MIGRATION = "ResyncBasicEpicFieldsToWorkItem"
diff --git a/db/post_migrate/20240531113402_queue_backfill_epic_dates_to_work_item_dates_sources.rb b/db/post_migrate/20240531113402_queue_backfill_epic_dates_to_work_item_dates_sources.rb
index bbf62c57102f1a..0588c7058934dc 100644
--- a/db/post_migrate/20240531113402_queue_backfill_epic_dates_to_work_item_dates_sources.rb
+++ b/db/post_migrate/20240531113402_queue_backfill_epic_dates_to_work_item_dates_sources.rb
@@ -3,7 +3,7 @@
 class QueueBackfillEpicDatesToWorkItemDatesSources < Gitlab::Database::Migration[2.2]
   milestone '17.1'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillEpicDatesToWorkItemDatesSources"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20240603152046_delete_bitbucket_identities_with_untrusted_extern_uid.rb b/db/post_migrate/20240603152046_delete_bitbucket_identities_with_untrusted_extern_uid.rb
index 8e66300d0fd4fe..b51f06d1e70262 100644
--- a/db/post_migrate/20240603152046_delete_bitbucket_identities_with_untrusted_extern_uid.rb
+++ b/db/post_migrate/20240603152046_delete_bitbucket_identities_with_untrusted_extern_uid.rb
@@ -3,7 +3,7 @@
 class DeleteBitbucketIdentitiesWithUntrustedExternUid < Gitlab::Database::Migration[2.2]
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '17.1'
 
diff --git a/db/post_migrate/20240604205241_delete_abuse_report_records_from_notes.rb b/db/post_migrate/20240604205241_delete_abuse_report_records_from_notes.rb
index 14b1051f2687be..ce84a930dcbdcd 100644
--- a/db/post_migrate/20240604205241_delete_abuse_report_records_from_notes.rb
+++ b/db/post_migrate/20240604205241_delete_abuse_report_records_from_notes.rb
@@ -2,7 +2,7 @@
 
 class DeleteAbuseReportRecordsFromNotes < Gitlab::Database::Migration[2.2]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.2'
 
   def up
diff --git a/db/post_migrate/20240610105705_ensure_backfill_merge_requests_head_pipeline_id_is_completed.rb b/db/post_migrate/20240610105705_ensure_backfill_merge_requests_head_pipeline_id_is_completed.rb
index 6ed8d4f68d5b81..9284c5a5056b3a 100644
--- a/db/post_migrate/20240610105705_ensure_backfill_merge_requests_head_pipeline_id_is_completed.rb
+++ b/db/post_migrate/20240610105705_ensure_backfill_merge_requests_head_pipeline_id_is_completed.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class EnsureBackfillMergeRequestsHeadPipelineIdIsCompleted < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
   milestone '17.1'
 
diff --git a/db/post_migrate/20240611102931_set_missing_traversal_ids_for_vulnerability_reads.rb b/db/post_migrate/20240611102931_set_missing_traversal_ids_for_vulnerability_reads.rb
index 2b2166c543f6c5..05de2a11a0ac41 100644
--- a/db/post_migrate/20240611102931_set_missing_traversal_ids_for_vulnerability_reads.rb
+++ b/db/post_migrate/20240611102931_set_missing_traversal_ids_for_vulnerability_reads.rb
@@ -4,7 +4,7 @@ class SetMissingTraversalIdsForVulnerabilityReads < Gitlab::Database::Migration[
   disable_ddl_transaction!
   milestone '17.1'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   class VulnerabilityRead < MigrationRecord
     include EachBatch
diff --git a/db/post_migrate/20240612132220_delete_invalid_merge_request_context_commits_records.rb b/db/post_migrate/20240612132220_delete_invalid_merge_request_context_commits_records.rb
index 05a816c3557a84..ae5bd234806f09 100644
--- a/db/post_migrate/20240612132220_delete_invalid_merge_request_context_commits_records.rb
+++ b/db/post_migrate/20240612132220_delete_invalid_merge_request_context_commits_records.rb
@@ -2,7 +2,7 @@
 
 class DeleteInvalidMergeRequestContextCommitsRecords < Gitlab::Database::Migration[2.2]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.2'
 
   BATCH_SIZE = 1000
diff --git a/db/post_migrate/20240617114649_remove_subscription_history_with_null_namespace_id.rb b/db/post_migrate/20240617114649_remove_subscription_history_with_null_namespace_id.rb
index 3792dd5fe2341b..84d014fa293d3f 100644
--- a/db/post_migrate/20240617114649_remove_subscription_history_with_null_namespace_id.rb
+++ b/db/post_migrate/20240617114649_remove_subscription_history_with_null_namespace_id.rb
@@ -4,7 +4,7 @@ class RemoveSubscriptionHistoryWithNullNamespaceId < Gitlab::Database::Migration
   disable_ddl_transaction!
   milestone '17.2'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   BATCH_SIZE = 10_000
 
diff --git a/db/post_migrate/20240618093306_queue_fix_synced_epic_work_item_parent_links.rb b/db/post_migrate/20240618093306_queue_fix_synced_epic_work_item_parent_links.rb
index c9755f825afe4f..5194ac4fa89919 100644
--- a/db/post_migrate/20240618093306_queue_fix_synced_epic_work_item_parent_links.rb
+++ b/db/post_migrate/20240618093306_queue_fix_synced_epic_work_item_parent_links.rb
@@ -2,7 +2,7 @@
 
 class QueueFixSyncedEpicWorkItemParentLinks < Gitlab::Database::Migration[2.2]
   milestone '17.2'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "FixSyncedEpicWorkItemParentLinks"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20240621054244_finalize_backfill_users_color_mode_id.rb b/db/post_migrate/20240621054244_finalize_backfill_users_color_mode_id.rb
index 56ed878cdfef09..725dfb67e0a376 100644
--- a/db/post_migrate/20240621054244_finalize_backfill_users_color_mode_id.rb
+++ b/db/post_migrate/20240621054244_finalize_backfill_users_color_mode_id.rb
@@ -5,7 +5,7 @@ class FinalizeBackfillUsersColorModeId < Gitlab::Database::Migration[2.2]
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20240626143430_finalize_backfill_related_epic_links_to_issue_links.rb b/db/post_migrate/20240626143430_finalize_backfill_related_epic_links_to_issue_links.rb
index 3f9a2a143f3647..9e7c1762069cd4 100644
--- a/db/post_migrate/20240626143430_finalize_backfill_related_epic_links_to_issue_links.rb
+++ b/db/post_migrate/20240626143430_finalize_backfill_related_epic_links_to_issue_links.rb
@@ -4,7 +4,7 @@ class FinalizeBackfillRelatedEpicLinksToIssueLinks < Gitlab::Database::Migration
   milestone '17.2'
 
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20240626231944_finalize_backfill_sbom_occurrences_traversal_ids_and_archived.rb b/db/post_migrate/20240626231944_finalize_backfill_sbom_occurrences_traversal_ids_and_archived.rb
index d1ad7d9d4f2405..5175328025ab32 100644
--- a/db/post_migrate/20240626231944_finalize_backfill_sbom_occurrences_traversal_ids_and_archived.rb
+++ b/db/post_migrate/20240626231944_finalize_backfill_sbom_occurrences_traversal_ids_and_archived.rb
@@ -5,7 +5,7 @@ class FinalizeBackfillSbomOccurrencesTraversalIdsAndArchived < Gitlab::Database:
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20240627151711_queue_backfill_identifier_external_ids_of_vulnerability_reads.rb b/db/post_migrate/20240627151711_queue_backfill_identifier_external_ids_of_vulnerability_reads.rb
index d13e1f9e1943a1..4f62725d1287cb 100644
--- a/db/post_migrate/20240627151711_queue_backfill_identifier_external_ids_of_vulnerability_reads.rb
+++ b/db/post_migrate/20240627151711_queue_backfill_identifier_external_ids_of_vulnerability_reads.rb
@@ -3,7 +3,7 @@
 class QueueBackfillIdentifierExternalIdsOfVulnerabilityReads < Gitlab::Database::Migration[2.2]
   milestone '17.2'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillIdentifierExternalIdsOfVulnerabilityReads"
 
diff --git a/db/post_migrate/20240629011500_queue_backfill_zoekt_replicas.rb b/db/post_migrate/20240629011500_queue_backfill_zoekt_replicas.rb
index d7667613e03c12..e6d13a6a75ce3f 100644
--- a/db/post_migrate/20240629011500_queue_backfill_zoekt_replicas.rb
+++ b/db/post_migrate/20240629011500_queue_backfill_zoekt_replicas.rb
@@ -3,7 +3,7 @@
 class QueueBackfillZoektReplicas < Gitlab::Database::Migration[2.2]
   milestone '17.2'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = 'BackfillZoektReplicas'
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20240630231802_finalize_convert_credit_card_validation_data_to_hashes.rb b/db/post_migrate/20240630231802_finalize_convert_credit_card_validation_data_to_hashes.rb
index 0a40304a5121a6..11fb9047a2a21f 100644
--- a/db/post_migrate/20240630231802_finalize_convert_credit_card_validation_data_to_hashes.rb
+++ b/db/post_migrate/20240630231802_finalize_convert_credit_card_validation_data_to_hashes.rb
@@ -5,7 +5,7 @@ class FinalizeConvertCreditCardValidationDataToHashes < Gitlab::Database::Migrat
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20240701182755_finalize_backfill_epic_issues_into_work_item_parent_links.rb b/db/post_migrate/20240701182755_finalize_backfill_epic_issues_into_work_item_parent_links.rb
index 8a3cf6a4a07053..bfc2d9414bbdc4 100644
--- a/db/post_migrate/20240701182755_finalize_backfill_epic_issues_into_work_item_parent_links.rb
+++ b/db/post_migrate/20240701182755_finalize_backfill_epic_issues_into_work_item_parent_links.rb
@@ -4,7 +4,7 @@ class FinalizeBackfillEpicIssuesIntoWorkItemParentLinks < Gitlab::Database::Migr
   milestone '17.2'
 
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20240701195831_finalize_backfill_work_item_hierarchy_for_epics.rb b/db/post_migrate/20240701195831_finalize_backfill_work_item_hierarchy_for_epics.rb
index 03608de6336c77..e5e525d9a59b8c 100644
--- a/db/post_migrate/20240701195831_finalize_backfill_work_item_hierarchy_for_epics.rb
+++ b/db/post_migrate/20240701195831_finalize_backfill_work_item_hierarchy_for_epics.rb
@@ -4,7 +4,7 @@ class FinalizeBackfillWorkItemHierarchyForEpics < Gitlab::Database::Migration[2.
   milestone '17.2'
 
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20240702092809_finalize_backfill_epic_dates_to_work_item_dates_sources.rb b/db/post_migrate/20240702092809_finalize_backfill_epic_dates_to_work_item_dates_sources.rb
index ea01ce327a5ac3..4984250af1259c 100644
--- a/db/post_migrate/20240702092809_finalize_backfill_epic_dates_to_work_item_dates_sources.rb
+++ b/db/post_migrate/20240702092809_finalize_backfill_epic_dates_to_work_item_dates_sources.rb
@@ -2,7 +2,7 @@
 
 class FinalizeBackfillEpicDatesToWorkItemDatesSources < Gitlab::Database::Migration[2.2]
   milestone '17.2'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   disable_ddl_transaction!
 
diff --git a/db/post_migrate/20240702212015_queue_backfill_issues_dates_with_work_item_dates_sources.rb b/db/post_migrate/20240702212015_queue_backfill_issues_dates_with_work_item_dates_sources.rb
index 82379aad76a127..1739b60aea7b53 100644
--- a/db/post_migrate/20240702212015_queue_backfill_issues_dates_with_work_item_dates_sources.rb
+++ b/db/post_migrate/20240702212015_queue_backfill_issues_dates_with_work_item_dates_sources.rb
@@ -3,7 +3,7 @@
 class QueueBackfillIssuesDatesWithWorkItemDatesSources < Gitlab::Database::Migration[2.2]
   milestone '17.2'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillIssuesDatesWithWorkItemDatesSources"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20240704030747_queue_backfill_new_audit_event_tables.rb b/db/post_migrate/20240704030747_queue_backfill_new_audit_event_tables.rb
index 726c390ab5ff08..d6d2a9f00ffde7 100644
--- a/db/post_migrate/20240704030747_queue_backfill_new_audit_event_tables.rb
+++ b/db/post_migrate/20240704030747_queue_backfill_new_audit_event_tables.rb
@@ -2,7 +2,7 @@
 
 class QueueBackfillNewAuditEventTables < Gitlab::Database::Migration[2.2]
   milestone '17.3'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillNewAuditEventTables"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20240704184634_finalize_resync_basic_epic_fields_to_work_item.rb b/db/post_migrate/20240704184634_finalize_resync_basic_epic_fields_to_work_item.rb
index 9fb816fe4b5287..378b97d0fc6ded 100644
--- a/db/post_migrate/20240704184634_finalize_resync_basic_epic_fields_to_work_item.rb
+++ b/db/post_migrate/20240704184634_finalize_resync_basic_epic_fields_to_work_item.rb
@@ -2,7 +2,7 @@
 
 class FinalizeResyncBasicEpicFieldsToWorkItem < Gitlab::Database::Migration[2.2]
   milestone '17.2'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   disable_ddl_transaction!
 
diff --git a/db/post_migrate/20240707231815_finalize_create_compliance_standards_adherence.rb b/db/post_migrate/20240707231815_finalize_create_compliance_standards_adherence.rb
index aa85209e3c3f09..d90c5ff5584ca5 100644
--- a/db/post_migrate/20240707231815_finalize_create_compliance_standards_adherence.rb
+++ b/db/post_migrate/20240707231815_finalize_create_compliance_standards_adherence.rb
@@ -5,7 +5,7 @@ class FinalizeCreateComplianceStandardsAdherence < Gitlab::Database::Migration[2
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20240708161802_sync_group_merge_request_settings.rb b/db/post_migrate/20240708161802_sync_group_merge_request_settings.rb
index 80e7a6093d8ad9..5427611412aa0f 100644
--- a/db/post_migrate/20240708161802_sync_group_merge_request_settings.rb
+++ b/db/post_migrate/20240708161802_sync_group_merge_request_settings.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class SyncGroupMergeRequestSettings < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   disable_ddl_transaction!
   milestone '17.2'
diff --git a/db/post_migrate/20240712093230_update_hierarchy_restriction_subepics_maximum_depth.rb b/db/post_migrate/20240712093230_update_hierarchy_restriction_subepics_maximum_depth.rb
index d8e5e2864df5e1..3a50d20e7037e2 100644
--- a/db/post_migrate/20240712093230_update_hierarchy_restriction_subepics_maximum_depth.rb
+++ b/db/post_migrate/20240712093230_update_hierarchy_restriction_subepics_maximum_depth.rb
@@ -3,7 +3,7 @@
 class UpdateHierarchyRestrictionSubepicsMaximumDepth < Gitlab::Database::Migration[2.2]
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '17.3'
 
diff --git a/db/post_migrate/20240712121006_queue_create_jira_cloud_app_integration_for_jira_connect_subscription.rb b/db/post_migrate/20240712121006_queue_create_jira_cloud_app_integration_for_jira_connect_subscription.rb
index 368f9007a88973..8f92e418c1ec32 100644
--- a/db/post_migrate/20240712121006_queue_create_jira_cloud_app_integration_for_jira_connect_subscription.rb
+++ b/db/post_migrate/20240712121006_queue_create_jira_cloud_app_integration_for_jira_connect_subscription.rb
@@ -3,7 +3,7 @@
 class QueueCreateJiraCloudAppIntegrationForJiraConnectSubscription < Gitlab::Database::Migration[2.2]
   milestone '17.3'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "CreateJiraCloudAppIntegrationForJiraConnectSubscription"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20240714231920_finalize_delete_orphans_approval_merge_request_rules2.rb b/db/post_migrate/20240714231920_finalize_delete_orphans_approval_merge_request_rules2.rb
index c731676193a7a6..0371bcfff1ac73 100644
--- a/db/post_migrate/20240714231920_finalize_delete_orphans_approval_merge_request_rules2.rb
+++ b/db/post_migrate/20240714231920_finalize_delete_orphans_approval_merge_request_rules2.rb
@@ -5,7 +5,7 @@ class FinalizeDeleteOrphansApprovalMergeRequestRules2 < Gitlab::Database::Migrat
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20240716182330_sync_namespace_settings_seat_control_with_user_cap.rb b/db/post_migrate/20240716182330_sync_namespace_settings_seat_control_with_user_cap.rb
index 2407c61556d48f..9a1e073a01a556 100644
--- a/db/post_migrate/20240716182330_sync_namespace_settings_seat_control_with_user_cap.rb
+++ b/db/post_migrate/20240716182330_sync_namespace_settings_seat_control_with_user_cap.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class SyncNamespaceSettingsSeatControlWithUserCap < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   disable_ddl_transaction!
 
diff --git a/db/post_migrate/20240716191121_queue_backfill_user_details.rb b/db/post_migrate/20240716191121_queue_backfill_user_details.rb
index 9c25b3ec543680..0f88955ee3b994 100644
--- a/db/post_migrate/20240716191121_queue_backfill_user_details.rb
+++ b/db/post_migrate/20240716191121_queue_backfill_user_details.rb
@@ -3,7 +3,7 @@
 class QueueBackfillUserDetails < Gitlab::Database::Migration[2.2]
   milestone '17.3'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillUserDetails"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20240717040239_queue_backfill_deploy_tokens_sharding_key.rb b/db/post_migrate/20240717040239_queue_backfill_deploy_tokens_sharding_key.rb
index 83b54c7fada623..221152c9c74705 100644
--- a/db/post_migrate/20240717040239_queue_backfill_deploy_tokens_sharding_key.rb
+++ b/db/post_migrate/20240717040239_queue_backfill_deploy_tokens_sharding_key.rb
@@ -2,7 +2,7 @@
 
 class QueueBackfillDeployTokensShardingKey < Gitlab::Database::Migration[2.2]
   milestone '17.3'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillDeployTokensShardingKey"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20240722104700_queue_recalculate_dora_deployment_frequency_score.rb b/db/post_migrate/20240722104700_queue_recalculate_dora_deployment_frequency_score.rb
index 493f2cb1b7c269..f0f237a9d89457 100644
--- a/db/post_migrate/20240722104700_queue_recalculate_dora_deployment_frequency_score.rb
+++ b/db/post_migrate/20240722104700_queue_recalculate_dora_deployment_frequency_score.rb
@@ -3,7 +3,7 @@
 class QueueRecalculateDoraDeploymentFrequencyScore < Gitlab::Database::Migration[2.2]
   milestone '17.3'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "RecalculateDoraDeploymentFrequencyScore"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20240722144720_queue_fix_namespace_id_for_work_item_parent_links.rb b/db/post_migrate/20240722144720_queue_fix_namespace_id_for_work_item_parent_links.rb
index f27127c9f3dce4..ba186dad6d1d54 100644
--- a/db/post_migrate/20240722144720_queue_fix_namespace_id_for_work_item_parent_links.rb
+++ b/db/post_migrate/20240722144720_queue_fix_namespace_id_for_work_item_parent_links.rb
@@ -3,7 +3,7 @@
 class QueueFixNamespaceIdForWorkItemParentLinks < Gitlab::Database::Migration[2.2]
   milestone '17.3'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "FixNamespaceIdForWorkItemParentLinks"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20240726081618_queue_nullify_organization_id_for_snippets.rb b/db/post_migrate/20240726081618_queue_nullify_organization_id_for_snippets.rb
index 5406b2b0bdfa9b..87c5d92869acda 100644
--- a/db/post_migrate/20240726081618_queue_nullify_organization_id_for_snippets.rb
+++ b/db/post_migrate/20240726081618_queue_nullify_organization_id_for_snippets.rb
@@ -3,7 +3,7 @@
 class QueueNullifyOrganizationIdForSnippets < Gitlab::Database::Migration[2.2]
   milestone '17.3'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "NullifyOrganizationIdForSnippets"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20240729124632_queue_make_security_policy_bots_private.rb b/db/post_migrate/20240729124632_queue_make_security_policy_bots_private.rb
index 031d47e6a8764e..85a1e31944e2a2 100644
--- a/db/post_migrate/20240729124632_queue_make_security_policy_bots_private.rb
+++ b/db/post_migrate/20240729124632_queue_make_security_policy_bots_private.rb
@@ -3,7 +3,7 @@
 class QueueMakeSecurityPolicyBotsPrivate < Gitlab::Database::Migration[2.2]
   milestone '17.3'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "MakeSecurityPolicyBotsPrivate"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20240729133817_queue_alter_webhook_deleted_audit_event.rb b/db/post_migrate/20240729133817_queue_alter_webhook_deleted_audit_event.rb
index 0e54ad633efe82..5bc37c88d0d21a 100644
--- a/db/post_migrate/20240729133817_queue_alter_webhook_deleted_audit_event.rb
+++ b/db/post_migrate/20240729133817_queue_alter_webhook_deleted_audit_event.rb
@@ -2,7 +2,7 @@
 
 class QueueAlterWebhookDeletedAuditEvent < Gitlab::Database::Migration[2.2]
   milestone '17.3'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "AlterWebhookDeletedAuditEvent"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20240801070404_update_max_total_yaml_size_bytes_value.rb b/db/post_migrate/20240801070404_update_max_total_yaml_size_bytes_value.rb
index 8ddcb49df69bfa..5e22878341bc8d 100644
--- a/db/post_migrate/20240801070404_update_max_total_yaml_size_bytes_value.rb
+++ b/db/post_migrate/20240801070404_update_max_total_yaml_size_bytes_value.rb
@@ -3,7 +3,7 @@
 class UpdateMaxTotalYamlSizeBytesValue < Gitlab::Database::Migration[2.2]
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '17.3'
 
diff --git a/db/post_migrate/20240801072839_update_ci_max_total_yaml_size_bytes_new_default_value.rb b/db/post_migrate/20240801072839_update_ci_max_total_yaml_size_bytes_new_default_value.rb
index 152ddb16355cdb..68fc2d2a583163 100644
--- a/db/post_migrate/20240801072839_update_ci_max_total_yaml_size_bytes_new_default_value.rb
+++ b/db/post_migrate/20240801072839_update_ci_max_total_yaml_size_bytes_new_default_value.rb
@@ -3,7 +3,7 @@
 class UpdateCiMaxTotalYamlSizeBytesNewDefaultValue < Gitlab::Database::Migration[2.2]
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '17.3'
 
diff --git a/db/post_migrate/20240801195253_queue_backfill_reserved_storage_bytes.rb b/db/post_migrate/20240801195253_queue_backfill_reserved_storage_bytes.rb
index dc694063d68870..651302ec3c522a 100644
--- a/db/post_migrate/20240801195253_queue_backfill_reserved_storage_bytes.rb
+++ b/db/post_migrate/20240801195253_queue_backfill_reserved_storage_bytes.rb
@@ -3,7 +3,7 @@
 class QueueBackfillReservedStorageBytes < Gitlab::Database::Migration[2.2]
   milestone '17.3'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = 'BackfillReservedStorageBytes'
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20240806143319_finalize_dora_df_scores_migration.rb b/db/post_migrate/20240806143319_finalize_dora_df_scores_migration.rb
index 5ebf2b7767b80e..6a2f59d7c91c60 100644
--- a/db/post_migrate/20240806143319_finalize_dora_df_scores_migration.rb
+++ b/db/post_migrate/20240806143319_finalize_dora_df_scores_migration.rb
@@ -5,7 +5,7 @@ class FinalizeDoraDfScoresMigration < Gitlab::Database::Migration[2.2]
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.4'
 
   def up
diff --git a/db/post_migrate/20240806193258_queue_resync_epic_dates_to_work_items_dates_sources.rb b/db/post_migrate/20240806193258_queue_resync_epic_dates_to_work_items_dates_sources.rb
index 2d9b71d5830b48..e4a5715668e943 100644
--- a/db/post_migrate/20240806193258_queue_resync_epic_dates_to_work_items_dates_sources.rb
+++ b/db/post_migrate/20240806193258_queue_resync_epic_dates_to_work_items_dates_sources.rb
@@ -3,7 +3,7 @@
 class QueueResyncEpicDatesToWorkItemsDatesSources < Gitlab::Database::Migration[2.2]
   milestone '17.3'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
 
   MIGRATION = "ResyncEpicDatesToWorkItemsDatesSources"
diff --git a/db/post_migrate/20240806205657_queue_update_owasp_top10_default_of_vulnerability_reads.rb b/db/post_migrate/20240806205657_queue_update_owasp_top10_default_of_vulnerability_reads.rb
index 4f90d4ac6e998c..eb6d3e942e26b1 100644
--- a/db/post_migrate/20240806205657_queue_update_owasp_top10_default_of_vulnerability_reads.rb
+++ b/db/post_migrate/20240806205657_queue_update_owasp_top10_default_of_vulnerability_reads.rb
@@ -3,7 +3,7 @@
 class QueueUpdateOwaspTop10DefaultOfVulnerabilityReads < Gitlab::Database::Migration[2.2]
   milestone '17.4'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "UpdateOwaspTop10DefaultOfVulnerabilityReads"
   DELAY_INTERVAL = 120.seconds
diff --git a/db/post_migrate/20240808125149_queue_deduplicate_lfs_objects_projects.rb b/db/post_migrate/20240808125149_queue_deduplicate_lfs_objects_projects.rb
index b5005e897d7c77..ff0039d63b87cb 100644
--- a/db/post_migrate/20240808125149_queue_deduplicate_lfs_objects_projects.rb
+++ b/db/post_migrate/20240808125149_queue_deduplicate_lfs_objects_projects.rb
@@ -11,7 +11,7 @@ class QueueDeduplicateLfsObjectsProjects < Gitlab::Database::Migration[2.2]
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   # To be re-enqueued by db/post_migrate/20240827204855_reenqueue_deduplicate_lfs_objects_projects.rb
   def up
diff --git a/db/post_migrate/20240808165039_cleanup_backfill_identifier_external_ids_of_vulnerability_reads.rb b/db/post_migrate/20240808165039_cleanup_backfill_identifier_external_ids_of_vulnerability_reads.rb
index 3ff81b73b66a4e..5dc99570ba0d76 100644
--- a/db/post_migrate/20240808165039_cleanup_backfill_identifier_external_ids_of_vulnerability_reads.rb
+++ b/db/post_migrate/20240808165039_cleanup_backfill_identifier_external_ids_of_vulnerability_reads.rb
@@ -3,7 +3,7 @@
 class CleanupBackfillIdentifierExternalIdsOfVulnerabilityReads < Gitlab::Database::Migration[2.2]
   milestone '17.3'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillIdentifierExternalIdsOfVulnerabilityReads"
 
diff --git a/db/post_migrate/20240813190312_queue_populate_detumbled_email_in_emails.rb b/db/post_migrate/20240813190312_queue_populate_detumbled_email_in_emails.rb
index 98d9023d5f01f8..fa0e3df1abd25c 100644
--- a/db/post_migrate/20240813190312_queue_populate_detumbled_email_in_emails.rb
+++ b/db/post_migrate/20240813190312_queue_populate_detumbled_email_in_emails.rb
@@ -3,7 +3,7 @@
 class QueuePopulateDetumbledEmailInEmails < Gitlab::Database::Migration[2.2]
   milestone '17.4'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "PopulateDetumbledEmailInEmails"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20240814025044_queue_delete_orphaned_deploy_tokens.rb b/db/post_migrate/20240814025044_queue_delete_orphaned_deploy_tokens.rb
index f86ce0cc571b28..445714051e44e7 100644
--- a/db/post_migrate/20240814025044_queue_delete_orphaned_deploy_tokens.rb
+++ b/db/post_migrate/20240814025044_queue_delete_orphaned_deploy_tokens.rb
@@ -3,7 +3,7 @@
 class QueueDeleteOrphanedDeployTokens < Gitlab::Database::Migration[2.2]
   milestone '17.4'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "DeleteOrphanedDeployTokens"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20240814145204_finalize_backfill_user_details.rb b/db/post_migrate/20240814145204_finalize_backfill_user_details.rb
index 4d924d67d73665..618e4792e48ba6 100644
--- a/db/post_migrate/20240814145204_finalize_backfill_user_details.rb
+++ b/db/post_migrate/20240814145204_finalize_backfill_user_details.rb
@@ -5,7 +5,7 @@ class FinalizeBackfillUserDetails < Gitlab::Database::Migration[2.2]
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '17.6'
 
diff --git a/db/post_migrate/20240814151504_clean_time_tracking_widget_definitions.rb b/db/post_migrate/20240814151504_clean_time_tracking_widget_definitions.rb
index d582eade6de2f2..cda4fbcc3bd5bb 100644
--- a/db/post_migrate/20240814151504_clean_time_tracking_widget_definitions.rb
+++ b/db/post_migrate/20240814151504_clean_time_tracking_widget_definitions.rb
@@ -3,7 +3,7 @@
 class CleanTimeTrackingWidgetDefinitions < Gitlab::Database::Migration[2.2]
   milestone '17.4'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   WIDGET_NAME = 'Time tracking'
   WIDGET_ENUM_VALUE = 21
diff --git a/db/post_migrate/20240815172551_remove_visual_review_bot.rb b/db/post_migrate/20240815172551_remove_visual_review_bot.rb
index 831657b06883bb..14d68912c14973 100644
--- a/db/post_migrate/20240815172551_remove_visual_review_bot.rb
+++ b/db/post_migrate/20240815172551_remove_visual_review_bot.rb
@@ -2,7 +2,7 @@
 
 class RemoveVisualReviewBot < Gitlab::Database::Migration[2.2]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '17.4'
   VISUAL_REVIEW_BOT_TYPE_ID = 3
diff --git a/db/post_migrate/20240816110844_queue_rerun_epic_dates_to_work_item_dates_sources_sync.rb b/db/post_migrate/20240816110844_queue_rerun_epic_dates_to_work_item_dates_sources_sync.rb
index da617cc5f80f7f..0e02644c226ace 100644
--- a/db/post_migrate/20240816110844_queue_rerun_epic_dates_to_work_item_dates_sources_sync.rb
+++ b/db/post_migrate/20240816110844_queue_rerun_epic_dates_to_work_item_dates_sources_sync.rb
@@ -2,7 +2,7 @@
 
 class QueueRerunEpicDatesToWorkItemDatesSourcesSync < Gitlab::Database::Migration[2.2]
   milestone '17.4'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "RerunEpicDatesToWorkItemDatesSourcesSync"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20240819001112_requeue_backfill_deploy_tokens_sharding_key.rb b/db/post_migrate/20240819001112_requeue_backfill_deploy_tokens_sharding_key.rb
index 73c5b393161051..1a54af17bae20d 100644
--- a/db/post_migrate/20240819001112_requeue_backfill_deploy_tokens_sharding_key.rb
+++ b/db/post_migrate/20240819001112_requeue_backfill_deploy_tokens_sharding_key.rb
@@ -2,7 +2,7 @@
 
 class RequeueBackfillDeployTokensShardingKey < Gitlab::Database::Migration[2.2]
   milestone '17.4'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillDeployTokensShardingKey"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20240819232045_finalize_delete_orphans_approval_project_rules2.rb b/db/post_migrate/20240819232045_finalize_delete_orphans_approval_project_rules2.rb
index 2f881263315753..64d43d82dae76f 100644
--- a/db/post_migrate/20240819232045_finalize_delete_orphans_approval_project_rules2.rb
+++ b/db/post_migrate/20240819232045_finalize_delete_orphans_approval_project_rules2.rb
@@ -5,7 +5,7 @@ class FinalizeDeleteOrphansApprovalProjectRules2 < Gitlab::Database::Migration[2
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20240820085247_backfill_catalog_resource_versions_published_by_id.rb b/db/post_migrate/20240820085247_backfill_catalog_resource_versions_published_by_id.rb
index 5f6c5eec807f29..cbedca3bc9f274 100644
--- a/db/post_migrate/20240820085247_backfill_catalog_resource_versions_published_by_id.rb
+++ b/db/post_migrate/20240820085247_backfill_catalog_resource_versions_published_by_id.rb
@@ -2,7 +2,7 @@
 
 class BackfillCatalogResourceVersionsPublishedById < Gitlab::Database::Migration[2.2]
   milestone '17.4'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
 
   BATCH_SIZE = 250
diff --git a/db/post_migrate/20240822220027_queue_backfill_missing_namespace_id_on_notes.rb b/db/post_migrate/20240822220027_queue_backfill_missing_namespace_id_on_notes.rb
index 9928b5dbd6e387..e928ab56e15890 100644
--- a/db/post_migrate/20240822220027_queue_backfill_missing_namespace_id_on_notes.rb
+++ b/db/post_migrate/20240822220027_queue_backfill_missing_namespace_id_on_notes.rb
@@ -8,7 +8,7 @@
 class QueueBackfillMissingNamespaceIdOnNotes < Gitlab::Database::Migration[2.2]
   milestone '17.5'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillMissingNamespaceIdOnNotes"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20240827204855_reenqueue_deduplicate_lfs_objects_projects.rb b/db/post_migrate/20240827204855_reenqueue_deduplicate_lfs_objects_projects.rb
index 871c2af4e070fc..56c987134717f5 100644
--- a/db/post_migrate/20240827204855_reenqueue_deduplicate_lfs_objects_projects.rb
+++ b/db/post_migrate/20240827204855_reenqueue_deduplicate_lfs_objects_projects.rb
@@ -11,7 +11,7 @@ class ReenqueueDeduplicateLfsObjectsProjects < Gitlab::Database::Migration[2.2]
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   # To be re-enqueued by:
   # db/post_migrate/20240927202948_reenqueue_deduplicate_lfs_objects_projects_with_null_repository_types.rb
diff --git a/db/post_migrate/20240828162042_finalize_pep_503_sbom_component_normalization_migrations.rb b/db/post_migrate/20240828162042_finalize_pep_503_sbom_component_normalization_migrations.rb
index deb4256232f064..e083ea0b563b9b 100644
--- a/db/post_migrate/20240828162042_finalize_pep_503_sbom_component_normalization_migrations.rb
+++ b/db/post_migrate/20240828162042_finalize_pep_503_sbom_component_normalization_migrations.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class FinalizePep503SbomComponentNormalizationMigrations < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '17.4'
 
diff --git a/db/post_migrate/20240906080833_requeue_backfill_packages_dependencies_project_id.rb b/db/post_migrate/20240906080833_requeue_backfill_packages_dependencies_project_id.rb
index b4b926240f47ec..791a00254ba0de 100644
--- a/db/post_migrate/20240906080833_requeue_backfill_packages_dependencies_project_id.rb
+++ b/db/post_migrate/20240906080833_requeue_backfill_packages_dependencies_project_id.rb
@@ -3,7 +3,7 @@
 class RequeueBackfillPackagesDependenciesProjectId < Gitlab::Database::Migration[2.2]
   milestone '17.4'
   disable_ddl_transaction
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = 'BackfillPackagesDependenciesProjectId'
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20240906133040_fix_non_nullable_snippets.rb b/db/post_migrate/20240906133040_fix_non_nullable_snippets.rb
index 67d485986c198e..4f76687c148f70 100644
--- a/db/post_migrate/20240906133040_fix_non_nullable_snippets.rb
+++ b/db/post_migrate/20240906133040_fix_non_nullable_snippets.rb
@@ -3,7 +3,7 @@
 class FixNonNullableSnippets < Gitlab::Database::Migration[2.2]
   milestone '17.4'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
 
   def up
diff --git a/db/post_migrate/20240906133341_finalize_nullify_organization_id_for_snippets.rb b/db/post_migrate/20240906133341_finalize_nullify_organization_id_for_snippets.rb
index b5f620250f7adf..abb15e5f47225c 100644
--- a/db/post_migrate/20240906133341_finalize_nullify_organization_id_for_snippets.rb
+++ b/db/post_migrate/20240906133341_finalize_nullify_organization_id_for_snippets.rb
@@ -3,7 +3,7 @@
 class FinalizeNullifyOrganizationIdForSnippets < Gitlab::Database::Migration[2.2]
   milestone '17.4'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
 
   def up
diff --git a/db/post_migrate/20240908225334_queue_mark_duplicate_issuable_resource_links.rb b/db/post_migrate/20240908225334_queue_mark_duplicate_issuable_resource_links.rb
index f48f5b76b06fed..1c68fa7a7e0e42 100644
--- a/db/post_migrate/20240908225334_queue_mark_duplicate_issuable_resource_links.rb
+++ b/db/post_migrate/20240908225334_queue_mark_duplicate_issuable_resource_links.rb
@@ -2,7 +2,7 @@
 
 class QueueMarkDuplicateIssuableResourceLinks < Gitlab::Database::Migration[2.2]
   milestone '17.6'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "MarkDuplicateIssuableResourceLinks"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20240909204952_finalize_os_sbom_component_normalization_migration.rb b/db/post_migrate/20240909204952_finalize_os_sbom_component_normalization_migration.rb
index 658fe0b8aea95b..027e641c8ce1bd 100644
--- a/db/post_migrate/20240909204952_finalize_os_sbom_component_normalization_migration.rb
+++ b/db/post_migrate/20240909204952_finalize_os_sbom_component_normalization_migration.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class FinalizeOsSbomComponentNormalizationMigration < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '17.4'
 
diff --git a/db/post_migrate/20240909222743_queue_backfill_personal_access_token_seven_days_notification_sent.rb b/db/post_migrate/20240909222743_queue_backfill_personal_access_token_seven_days_notification_sent.rb
index 4f0999a99b848d..f3121c486535e9 100644
--- a/db/post_migrate/20240909222743_queue_backfill_personal_access_token_seven_days_notification_sent.rb
+++ b/db/post_migrate/20240909222743_queue_backfill_personal_access_token_seven_days_notification_sent.rb
@@ -2,7 +2,7 @@
 
 class QueueBackfillPersonalAccessTokenSevenDaysNotificationSent < Gitlab::Database::Migration[2.2]
   milestone '17.5'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillPersonalAccessTokenSevenDaysNotificationSent"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20240911101712_queue_mark_single_issuable_resource_links.rb b/db/post_migrate/20240911101712_queue_mark_single_issuable_resource_links.rb
index d2fbe4898488e9..e97dddb1714e27 100644
--- a/db/post_migrate/20240911101712_queue_mark_single_issuable_resource_links.rb
+++ b/db/post_migrate/20240911101712_queue_mark_single_issuable_resource_links.rb
@@ -7,7 +7,7 @@
 
 class QueueMarkSingleIssuableResourceLinks < Gitlab::Database::Migration[2.2]
   milestone '17.6'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "MarkSingleIssuableResourceLinks"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20240911115256_queue_delete_stale_packages_npm_metadata_caches.rb b/db/post_migrate/20240911115256_queue_delete_stale_packages_npm_metadata_caches.rb
index 03c67fa4caaea7..c2843e875fcf12 100644
--- a/db/post_migrate/20240911115256_queue_delete_stale_packages_npm_metadata_caches.rb
+++ b/db/post_migrate/20240911115256_queue_delete_stale_packages_npm_metadata_caches.rb
@@ -3,7 +3,7 @@
 class QueueDeleteStalePackagesNpmMetadataCaches < Gitlab::Database::Migration[2.2]
   milestone '17.5'
   disable_ddl_transaction
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = 'DeleteStalePackagesNpmMetadataCaches'
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20240911173549_queue_backfill_packages_nuget_symbols_project_id.rb b/db/post_migrate/20240911173549_queue_backfill_packages_nuget_symbols_project_id.rb
index 850f139687851b..ee399d55b5a04d 100644
--- a/db/post_migrate/20240911173549_queue_backfill_packages_nuget_symbols_project_id.rb
+++ b/db/post_migrate/20240911173549_queue_backfill_packages_nuget_symbols_project_id.rb
@@ -3,7 +3,7 @@
 class QueueBackfillPackagesNugetSymbolsProjectId < Gitlab::Database::Migration[2.2]
   milestone '17.6'
   disable_ddl_transaction
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = 'BackfillPackagesNugetSymbolsProjectId'
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20240912062955_backfill_workspaces_agent_config_version_with_latest_agent_config_version.rb b/db/post_migrate/20240912062955_backfill_workspaces_agent_config_version_with_latest_agent_config_version.rb
index d5c78bc441ea29..9e0c32b4a8f6fd 100644
--- a/db/post_migrate/20240912062955_backfill_workspaces_agent_config_version_with_latest_agent_config_version.rb
+++ b/db/post_migrate/20240912062955_backfill_workspaces_agent_config_version_with_latest_agent_config_version.rb
@@ -2,7 +2,7 @@
 
 class BackfillWorkspacesAgentConfigVersionWithLatestAgentConfigVersion < Gitlab::Database::Migration[2.2]
   milestone '17.5'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     execute(<<-SQL)
diff --git a/db/post_migrate/20240912184158_queue_backfill_has_vulnerability_resolution.rb b/db/post_migrate/20240912184158_queue_backfill_has_vulnerability_resolution.rb
index 3a7a2d8efbfec4..5e2ae6af81aa45 100644
--- a/db/post_migrate/20240912184158_queue_backfill_has_vulnerability_resolution.rb
+++ b/db/post_migrate/20240912184158_queue_backfill_has_vulnerability_resolution.rb
@@ -3,7 +3,7 @@
 class QueueBackfillHasVulnerabilityResolution < Gitlab::Database::Migration[2.2]
   milestone '17.5'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillHasVulnerabilityResolution"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20240913004547_remove_placeholder_memberships.rb b/db/post_migrate/20240913004547_remove_placeholder_memberships.rb
index 9d37b8422fa7f6..b600d7e12e3b42 100644
--- a/db/post_migrate/20240913004547_remove_placeholder_memberships.rb
+++ b/db/post_migrate/20240913004547_remove_placeholder_memberships.rb
@@ -3,7 +3,7 @@
 class RemovePlaceholderMemberships < Gitlab::Database::Migration[2.2]
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '17.5'
 
diff --git a/db/post_migrate/20240918204510_set_correct_id_to_existing_work_item_types.rb b/db/post_migrate/20240918204510_set_correct_id_to_existing_work_item_types.rb
index 5f8d110c5db175..4d7441a6112e85 100644
--- a/db/post_migrate/20240918204510_set_correct_id_to_existing_work_item_types.rb
+++ b/db/post_migrate/20240918204510_set_correct_id_to_existing_work_item_types.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class SetCorrectIdToExistingWorkItemTypes < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '17.5'
 
diff --git a/db/post_migrate/20240920083708_queue_backfill_members_request_accepted_at.rb b/db/post_migrate/20240920083708_queue_backfill_members_request_accepted_at.rb
index f5f076ca646eea..53690017b7b151 100644
--- a/db/post_migrate/20240920083708_queue_backfill_members_request_accepted_at.rb
+++ b/db/post_migrate/20240920083708_queue_backfill_members_request_accepted_at.rb
@@ -2,7 +2,7 @@
 
 class QueueBackfillMembersRequestAcceptedAt < Gitlab::Database::Migration[2.2]
   milestone '17.5'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillMembersRequestAcceptedAt"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20240924214435_finalize_workspaces_config_version3_migration.rb b/db/post_migrate/20240924214435_finalize_workspaces_config_version3_migration.rb
index cfae892afe2fbd..0250e6e8cd3078 100644
--- a/db/post_migrate/20240924214435_finalize_workspaces_config_version3_migration.rb
+++ b/db/post_migrate/20240924214435_finalize_workspaces_config_version3_migration.rb
@@ -5,7 +5,7 @@ class FinalizeWorkspacesConfigVersion3Migration < Gitlab::Database::Migration[2.
   MIGRATION = 'UpdateWorkspacesConfigVersion3'
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20240926061349_lock_duo_features_enabled_update.rb b/db/post_migrate/20240926061349_lock_duo_features_enabled_update.rb
index b12a3a3a20a2c5..6f1ac88927f6bc 100644
--- a/db/post_migrate/20240926061349_lock_duo_features_enabled_update.rb
+++ b/db/post_migrate/20240926061349_lock_duo_features_enabled_update.rb
@@ -3,7 +3,7 @@
 class LockDuoFeaturesEnabledUpdate < Gitlab::Database::Migration[2.2]
   milestone '17.5'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   TABLE_NAME = :namespace_settings
 
diff --git a/db/post_migrate/20240927202948_reenqueue_deduplicate_lfs_objects_projects_with_null_repository_types.rb b/db/post_migrate/20240927202948_reenqueue_deduplicate_lfs_objects_projects_with_null_repository_types.rb
index 2e34779de6ae2b..b4e1a7ca9f4f09 100644
--- a/db/post_migrate/20240927202948_reenqueue_deduplicate_lfs_objects_projects_with_null_repository_types.rb
+++ b/db/post_migrate/20240927202948_reenqueue_deduplicate_lfs_objects_projects_with_null_repository_types.rb
@@ -11,7 +11,7 @@ class ReenqueueDeduplicateLfsObjectsProjectsWithNullRepositoryTypes < Gitlab::Da
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     delete_batched_background_migration(MIGRATION, :lfs_objects_projects, :id, [])
diff --git a/db/post_migrate/20241002185804_queue_backfill_issues_correct_work_item_type_id.rb b/db/post_migrate/20241002185804_queue_backfill_issues_correct_work_item_type_id.rb
index 9600bfc8e3d315..5a3a7c7f89daac 100644
--- a/db/post_migrate/20241002185804_queue_backfill_issues_correct_work_item_type_id.rb
+++ b/db/post_migrate/20241002185804_queue_backfill_issues_correct_work_item_type_id.rb
@@ -4,7 +4,7 @@ class QueueBackfillIssuesCorrectWorkItemTypeId < Gitlab::Database::Migration[2.2
   milestone '17.5'
 
   # Select the applicable gitlab schema for your batched background migration
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillIssuesCorrectWorkItemTypeId"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20241003061916_queue_recover_deleted_ml_model_version_packages.rb b/db/post_migrate/20241003061916_queue_recover_deleted_ml_model_version_packages.rb
index 206b2ced8a0828..58a1bef50adc85 100644
--- a/db/post_migrate/20241003061916_queue_recover_deleted_ml_model_version_packages.rb
+++ b/db/post_migrate/20241003061916_queue_recover_deleted_ml_model_version_packages.rb
@@ -3,7 +3,7 @@
 class QueueRecoverDeletedMlModelVersionPackages < Gitlab::Database::Migration[2.2]
   milestone '17.5'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "RecoverDeletedMlModelVersionPackages"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20241003120559_finalize_fix_vulnerability_reads_has_issues.rb b/db/post_migrate/20241003120559_finalize_fix_vulnerability_reads_has_issues.rb
index c0855b5fc762ef..523ca8c62163f3 100644
--- a/db/post_migrate/20241003120559_finalize_fix_vulnerability_reads_has_issues.rb
+++ b/db/post_migrate/20241003120559_finalize_fix_vulnerability_reads_has_issues.rb
@@ -2,7 +2,7 @@
 
 class FinalizeFixVulnerabilityReadsHasIssues < Gitlab::Database::Migration[2.2]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.5'
 
   def up
diff --git a/db/post_migrate/20241007034738_cleanup_events_personal_namespace_id_gitlab_com.rb b/db/post_migrate/20241007034738_cleanup_events_personal_namespace_id_gitlab_com.rb
index 620d3ff67e8b2f..8a3e4a51631c06 100644
--- a/db/post_migrate/20241007034738_cleanup_events_personal_namespace_id_gitlab_com.rb
+++ b/db/post_migrate/20241007034738_cleanup_events_personal_namespace_id_gitlab_com.rb
@@ -5,7 +5,7 @@ class CleanupEventsPersonalNamespaceIdGitlabCom < Gitlab::Database::Migration[2.
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   class PersonalNamespace < MigrationRecord
     self.table_name = 'namespaces'
diff --git a/db/post_migrate/20241008030404_queue_backfill_events_personal_namespace_id.rb b/db/post_migrate/20241008030404_queue_backfill_events_personal_namespace_id.rb
index a012d689db4931..30f9e39472a6ee 100644
--- a/db/post_migrate/20241008030404_queue_backfill_events_personal_namespace_id.rb
+++ b/db/post_migrate/20241008030404_queue_backfill_events_personal_namespace_id.rb
@@ -3,7 +3,7 @@
 class QueueBackfillEventsPersonalNamespaceId < Gitlab::Database::Migration[2.2]
   milestone '17.5'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = 'BackfillEventsShardingKey'
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20241010094853_delete_project_import_data_without_project_id.rb b/db/post_migrate/20241010094853_delete_project_import_data_without_project_id.rb
index 6d84da509c05c9..02574ada9b3636 100644
--- a/db/post_migrate/20241010094853_delete_project_import_data_without_project_id.rb
+++ b/db/post_migrate/20241010094853_delete_project_import_data_without_project_id.rb
@@ -3,7 +3,7 @@
 class DeleteProjectImportDataWithoutProjectId < Gitlab::Database::Migration[2.2]
   milestone '17.6'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     execute("DELETE FROM project_import_data WHERE project_id IS NULL")
diff --git a/db/post_migrate/20241010101254_delete_import_export_uploads_without_project_id_or_group_id.rb b/db/post_migrate/20241010101254_delete_import_export_uploads_without_project_id_or_group_id.rb
index 4881cb74c98ac8..d4c46399ee0bf6 100644
--- a/db/post_migrate/20241010101254_delete_import_export_uploads_without_project_id_or_group_id.rb
+++ b/db/post_migrate/20241010101254_delete_import_export_uploads_without_project_id_or_group_id.rb
@@ -3,7 +3,7 @@
 class DeleteImportExportUploadsWithoutProjectIdOrGroupId < Gitlab::Database::Migration[2.2]
   milestone '17.6'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     define_batchable_model('import_export_uploads').each_batch(of: 10_000) do |batch|
diff --git a/db/post_migrate/20241016070006_finalize_backfill_packages_dependencies_project_id.rb b/db/post_migrate/20241016070006_finalize_backfill_packages_dependencies_project_id.rb
index 73510098b4ab5c..b3c4643aab9dec 100644
--- a/db/post_migrate/20241016070006_finalize_backfill_packages_dependencies_project_id.rb
+++ b/db/post_migrate/20241016070006_finalize_backfill_packages_dependencies_project_id.rb
@@ -2,7 +2,7 @@
 
 class FinalizeBackfillPackagesDependenciesProjectId < Gitlab::Database::Migration[2.2]
   milestone '17.6'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
 
   MIGRATION = 'BackfillPackagesDependenciesProjectId'
diff --git a/db/post_migrate/20241016074421_finalize_delete_stale_packages_npm_metadata_caches.rb b/db/post_migrate/20241016074421_finalize_delete_stale_packages_npm_metadata_caches.rb
index ae40658260f0e1..1701dae524019a 100644
--- a/db/post_migrate/20241016074421_finalize_delete_stale_packages_npm_metadata_caches.rb
+++ b/db/post_migrate/20241016074421_finalize_delete_stale_packages_npm_metadata_caches.rb
@@ -2,7 +2,7 @@
 
 class FinalizeDeleteStalePackagesNpmMetadataCaches < Gitlab::Database::Migration[2.2]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.6'
 
   MIGRATION = 'DeleteStalePackagesNpmMetadataCaches'
diff --git a/db/post_migrate/20241016215438_finalize_delete_orphaned_deploy_tokens.rb b/db/post_migrate/20241016215438_finalize_delete_orphaned_deploy_tokens.rb
index 21c591cef2b2f3..b02c5f2b1837ad 100644
--- a/db/post_migrate/20241016215438_finalize_delete_orphaned_deploy_tokens.rb
+++ b/db/post_migrate/20241016215438_finalize_delete_orphaned_deploy_tokens.rb
@@ -2,7 +2,7 @@
 
 class FinalizeDeleteOrphanedDeployTokens < Gitlab::Database::Migration[2.2]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '17.6'
 
diff --git a/db/post_migrate/20241016215758_finalize_backfill_deploy_tokens_sharding_key.rb b/db/post_migrate/20241016215758_finalize_backfill_deploy_tokens_sharding_key.rb
index fde73f1c6b005c..17eae0b535cdd8 100644
--- a/db/post_migrate/20241016215758_finalize_backfill_deploy_tokens_sharding_key.rb
+++ b/db/post_migrate/20241016215758_finalize_backfill_deploy_tokens_sharding_key.rb
@@ -2,7 +2,7 @@
 
 class FinalizeBackfillDeployTokensShardingKey < Gitlab::Database::Migration[2.2]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '17.6'
 
diff --git a/db/post_migrate/20241017194016_finalize_populate_detumbled_email_in_emails.rb b/db/post_migrate/20241017194016_finalize_populate_detumbled_email_in_emails.rb
index 1794f861073964..446cad9f873f21 100644
--- a/db/post_migrate/20241017194016_finalize_populate_detumbled_email_in_emails.rb
+++ b/db/post_migrate/20241017194016_finalize_populate_detumbled_email_in_emails.rb
@@ -7,7 +7,7 @@ class FinalizePopulateDetumbledEmailInEmails < Gitlab::Database::Migration[2.2]
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20241022092741_remove_new_ultimate_trial_plan_from_community_edition_plans.rb b/db/post_migrate/20241022092741_remove_new_ultimate_trial_plan_from_community_edition_plans.rb
index 2afe9463e02f3b..cc300cb717950e 100644
--- a/db/post_migrate/20241022092741_remove_new_ultimate_trial_plan_from_community_edition_plans.rb
+++ b/db/post_migrate/20241022092741_remove_new_ultimate_trial_plan_from_community_edition_plans.rb
@@ -5,7 +5,7 @@ class RemoveNewUltimateTrialPlanFromCommunityEditionPlans < Gitlab::Database::Mi
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     return unless should_run?
diff --git a/db/post_migrate/20241022155022_finalize_recover_deleted_ml_model_version_packages.rb b/db/post_migrate/20241022155022_finalize_recover_deleted_ml_model_version_packages.rb
index a4a19ec233a049..aa480ed3aef536 100644
--- a/db/post_migrate/20241022155022_finalize_recover_deleted_ml_model_version_packages.rb
+++ b/db/post_migrate/20241022155022_finalize_recover_deleted_ml_model_version_packages.rb
@@ -5,7 +5,7 @@ class FinalizeRecoverDeletedMlModelVersionPackages < Gitlab::Database::Migration
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20241024062434_queue_create_missing_external_links_for_vulnerabilities.rb b/db/post_migrate/20241024062434_queue_create_missing_external_links_for_vulnerabilities.rb
index c4108b202488bf..dcbb9ee5b91d31 100644
--- a/db/post_migrate/20241024062434_queue_create_missing_external_links_for_vulnerabilities.rb
+++ b/db/post_migrate/20241024062434_queue_create_missing_external_links_for_vulnerabilities.rb
@@ -2,7 +2,7 @@
 
 class QueueCreateMissingExternalLinksForVulnerabilities < Gitlab::Database::Migration[2.2]
   milestone '17.6'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "CreateMissingExternalLinksForVulnerabilities"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20241024111813_backfill_abuse_reports_for_bigint_conversion.rb b/db/post_migrate/20241024111813_backfill_abuse_reports_for_bigint_conversion.rb
index a60ac5afcb0475..ae9850d6c6ea67 100644
--- a/db/post_migrate/20241024111813_backfill_abuse_reports_for_bigint_conversion.rb
+++ b/db/post_migrate/20241024111813_backfill_abuse_reports_for_bigint_conversion.rb
@@ -4,7 +4,7 @@ class BackfillAbuseReportsForBigintConversion < Gitlab::Database::Migration[2.2]
   milestone '17.6'
 
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   TABLE_NAME = :abuse_reports
   COLUMNS = %i[assignee_id id reporter_id resolved_by_id user_id]
diff --git a/db/post_migrate/20241024183136_finalize_update_owasp_top10_default_of_vulnerability_reads.rb b/db/post_migrate/20241024183136_finalize_update_owasp_top10_default_of_vulnerability_reads.rb
index 16c21575019f7f..f00f1e4babed70 100644
--- a/db/post_migrate/20241024183136_finalize_update_owasp_top10_default_of_vulnerability_reads.rb
+++ b/db/post_migrate/20241024183136_finalize_update_owasp_top10_default_of_vulnerability_reads.rb
@@ -5,7 +5,7 @@ class FinalizeUpdateOwaspTop10DefaultOfVulnerabilityReads < Gitlab::Database::Mi
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20241025010332_finalize_backfill_has_vulnerability_resolution.rb b/db/post_migrate/20241025010332_finalize_backfill_has_vulnerability_resolution.rb
index 99159fe2be7a7d..aa0221630d4121 100644
--- a/db/post_migrate/20241025010332_finalize_backfill_has_vulnerability_resolution.rb
+++ b/db/post_migrate/20241025010332_finalize_backfill_has_vulnerability_resolution.rb
@@ -4,7 +4,7 @@ class FinalizeBackfillHasVulnerabilityResolution < Gitlab::Database::Migration[2
   MIGRATION = 'BackfillHasVulnerabilityResolution'
 
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.6'
 
   def up
diff --git a/db/post_migrate/20241029170331_queue_resync_has_vulnerabilities.rb b/db/post_migrate/20241029170331_queue_resync_has_vulnerabilities.rb
index 8d35a89b0ae94a..138b8dc7f3226d 100644
--- a/db/post_migrate/20241029170331_queue_resync_has_vulnerabilities.rb
+++ b/db/post_migrate/20241029170331_queue_resync_has_vulnerabilities.rb
@@ -3,7 +3,7 @@
 class QueueResyncHasVulnerabilities < Gitlab::Database::Migration[2.2]
   milestone '17.6'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "ResyncHasVulnerabilities"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20241030125718_update_namespaces_organization_id.rb b/db/post_migrate/20241030125718_update_namespaces_organization_id.rb
index 9f578312851c4c..d9fcb42ec0328a 100644
--- a/db/post_migrate/20241030125718_update_namespaces_organization_id.rb
+++ b/db/post_migrate/20241030125718_update_namespaces_organization_id.rb
@@ -5,7 +5,7 @@ class Namespace < MigrationRecord
     self.table_name = 'namespaces'
   end
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.6'
 
   def up
diff --git a/db/post_migrate/20241030165330_finalize_backfill_issues_correct_work_item_type_id.rb b/db/post_migrate/20241030165330_finalize_backfill_issues_correct_work_item_type_id.rb
index 7762ee47342647..9af2ea9bedf827 100644
--- a/db/post_migrate/20241030165330_finalize_backfill_issues_correct_work_item_type_id.rb
+++ b/db/post_migrate/20241030165330_finalize_backfill_issues_correct_work_item_type_id.rb
@@ -2,7 +2,7 @@
 
 class FinalizeBackfillIssuesCorrectWorkItemTypeId < Gitlab::Database::Migration[2.2]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '17.6'
 
diff --git a/db/post_migrate/20241030232146_finalize_populate_topics_slug_column.rb b/db/post_migrate/20241030232146_finalize_populate_topics_slug_column.rb
index d1e9640e1fdb6a..4e2d8547b382a1 100644
--- a/db/post_migrate/20241030232146_finalize_populate_topics_slug_column.rb
+++ b/db/post_migrate/20241030232146_finalize_populate_topics_slug_column.rb
@@ -5,7 +5,7 @@ class FinalizePopulateTopicsSlugColumn < Gitlab::Database::Migration[2.2]
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20241031132007_finalize_deduplicate_lfs_objects_projects.rb b/db/post_migrate/20241031132007_finalize_deduplicate_lfs_objects_projects.rb
index 0160cccd99376d..65aadb110742aa 100644
--- a/db/post_migrate/20241031132007_finalize_deduplicate_lfs_objects_projects.rb
+++ b/db/post_migrate/20241031132007_finalize_deduplicate_lfs_objects_projects.rb
@@ -4,7 +4,7 @@ class FinalizeDeduplicateLfsObjectsProjects < Gitlab::Database::Migration[2.2]
   milestone '17.6'
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20241103164158_migrate_software_license_without_spdx_identifier_to_custom_licenses_table.rb b/db/post_migrate/20241103164158_migrate_software_license_without_spdx_identifier_to_custom_licenses_table.rb
index 8f64727490de79..2ed1c7bca68789 100644
--- a/db/post_migrate/20241103164158_migrate_software_license_without_spdx_identifier_to_custom_licenses_table.rb
+++ b/db/post_migrate/20241103164158_migrate_software_license_without_spdx_identifier_to_custom_licenses_table.rb
@@ -2,7 +2,7 @@
 
 class MigrateSoftwareLicenseWithoutSpdxIdentifierToCustomLicensesTable < Gitlab::Database::Migration[2.2]
   milestone '17.6'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
 
   BATCH_SIZE = 100
diff --git a/db/post_migrate/20241103232044_finalize_backfill_jira_tracker_data_project_keys.rb b/db/post_migrate/20241103232044_finalize_backfill_jira_tracker_data_project_keys.rb
index e1e13e99b91c1a..e5864367c7fb26 100644
--- a/db/post_migrate/20241103232044_finalize_backfill_jira_tracker_data_project_keys.rb
+++ b/db/post_migrate/20241103232044_finalize_backfill_jira_tracker_data_project_keys.rb
@@ -5,7 +5,7 @@ class FinalizeBackfillJiraTrackerDataProjectKeys < Gitlab::Database::Migration[2
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20241103232348_finalize_backfill_default_branch_protection_settings.rb b/db/post_migrate/20241103232348_finalize_backfill_default_branch_protection_settings.rb
index c7c90904aa72a1..b2a694583ac370 100644
--- a/db/post_migrate/20241103232348_finalize_backfill_default_branch_protection_settings.rb
+++ b/db/post_migrate/20241103232348_finalize_backfill_default_branch_protection_settings.rb
@@ -5,7 +5,7 @@ class FinalizeBackfillDefaultBranchProtectionSettings < Gitlab::Database::Migrat
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20241106163900_set_existing_plan_limits_repository_size_to_null.rb b/db/post_migrate/20241106163900_set_existing_plan_limits_repository_size_to_null.rb
index bb39452f8cf499..2795a5e570da1d 100644
--- a/db/post_migrate/20241106163900_set_existing_plan_limits_repository_size_to_null.rb
+++ b/db/post_migrate/20241106163900_set_existing_plan_limits_repository_size_to_null.rb
@@ -4,7 +4,7 @@ class SetExistingPlanLimitsRepositorySizeToNull < Gitlab::Database::Migration[2.
   milestone '17.6'
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     execute "UPDATE plan_limits SET repository_size = NULL WHERE repository_size = 0"
diff --git a/db/post_migrate/20241106181154_finalize_backfill_project_id_to_dependency_list_exports.rb b/db/post_migrate/20241106181154_finalize_backfill_project_id_to_dependency_list_exports.rb
index 92c4967a3c2786..c0e2f0e3052cbc 100644
--- a/db/post_migrate/20241106181154_finalize_backfill_project_id_to_dependency_list_exports.rb
+++ b/db/post_migrate/20241106181154_finalize_backfill_project_id_to_dependency_list_exports.rb
@@ -4,7 +4,7 @@ class FinalizeBackfillProjectIdToDependencyListExports < Gitlab::Database::Migra
   milestone '17.6'
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20241108105112_requeue_backfill_related_epic_links_to_issue_links.rb b/db/post_migrate/20241108105112_requeue_backfill_related_epic_links_to_issue_links.rb
index 5cf21e3bd359bc..ea0d0d98c06377 100644
--- a/db/post_migrate/20241108105112_requeue_backfill_related_epic_links_to_issue_links.rb
+++ b/db/post_migrate/20241108105112_requeue_backfill_related_epic_links_to_issue_links.rb
@@ -3,7 +3,7 @@
 class RequeueBackfillRelatedEpicLinksToIssueLinks < Gitlab::Database::Migration[2.2]
   milestone '17.6'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "RequeueBackfillRelatedEpicLinksToIssueLinks"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20241108111720_requeue_backfill_work_item_hierarchy_for_epics.rb b/db/post_migrate/20241108111720_requeue_backfill_work_item_hierarchy_for_epics.rb
index 5292525fda84c9..452860c13b9186 100644
--- a/db/post_migrate/20241108111720_requeue_backfill_work_item_hierarchy_for_epics.rb
+++ b/db/post_migrate/20241108111720_requeue_backfill_work_item_hierarchy_for_epics.rb
@@ -3,7 +3,7 @@
 class RequeueBackfillWorkItemHierarchyForEpics < Gitlab::Database::Migration[2.2]
   milestone '17.6'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "RequeueBackfillWorkItemHierarchyForEpics"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20241108124324_requeue_backfill_epic_issues_into_work_item_parent_links.rb b/db/post_migrate/20241108124324_requeue_backfill_epic_issues_into_work_item_parent_links.rb
index fc1946466ad4f9..71d3e6e63f776b 100644
--- a/db/post_migrate/20241108124324_requeue_backfill_epic_issues_into_work_item_parent_links.rb
+++ b/db/post_migrate/20241108124324_requeue_backfill_epic_issues_into_work_item_parent_links.rb
@@ -3,7 +3,7 @@
 class RequeueBackfillEpicIssuesIntoWorkItemParentLinks < Gitlab::Database::Migration[2.2]
   milestone '17.6'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "RequeueBackfillEpicIssuesIntoWorkItemParentLinks"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20241108133603_queue_backfill_seat_assignments_table.rb b/db/post_migrate/20241108133603_queue_backfill_seat_assignments_table.rb
index 9735d10252f271..eef2115e9e3f4c 100644
--- a/db/post_migrate/20241108133603_queue_backfill_seat_assignments_table.rb
+++ b/db/post_migrate/20241108133603_queue_backfill_seat_assignments_table.rb
@@ -3,7 +3,7 @@
 class QueueBackfillSeatAssignmentsTable < Gitlab::Database::Migration[2.2]
   milestone '17.7'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillSeatAssignmentsTable"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20241108205025_set_work_item_types_old_id.rb b/db/post_migrate/20241108205025_set_work_item_types_old_id.rb
index 1915239329722f..8a14492025cc99 100644
--- a/db/post_migrate/20241108205025_set_work_item_types_old_id.rb
+++ b/db/post_migrate/20241108205025_set_work_item_types_old_id.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class SetWorkItemTypesOldId < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.6'
 
   def up
diff --git a/db/post_migrate/20241111055711_queue_delete_duplicate_issuable_resource_links.rb b/db/post_migrate/20241111055711_queue_delete_duplicate_issuable_resource_links.rb
index bf69431ba834f2..954d8acb1f0ff7 100644
--- a/db/post_migrate/20241111055711_queue_delete_duplicate_issuable_resource_links.rb
+++ b/db/post_migrate/20241111055711_queue_delete_duplicate_issuable_resource_links.rb
@@ -3,7 +3,7 @@
 class QueueDeleteDuplicateIssuableResourceLinks < Gitlab::Database::Migration[2.2]
   milestone '17.6'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "DeleteDuplicateIssuableResourceLinks"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20241112161753_finalize_migrate_links_for_vulnerability_findings.rb b/db/post_migrate/20241112161753_finalize_migrate_links_for_vulnerability_findings.rb
index 8d005f0d8830ef..85273897aba13b 100644
--- a/db/post_migrate/20241112161753_finalize_migrate_links_for_vulnerability_findings.rb
+++ b/db/post_migrate/20241112161753_finalize_migrate_links_for_vulnerability_findings.rb
@@ -4,7 +4,7 @@ class FinalizeMigrateLinksForVulnerabilityFindings < Gitlab::Database::Migration
   MIGRATION = "MigrateLinksForVulnerabilityFindings"
 
   milestone '17.6'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   disable_ddl_transaction!
 
diff --git a/db/post_migrate/20241112161754_finalize_set_correct_vulnerability_state.rb b/db/post_migrate/20241112161754_finalize_set_correct_vulnerability_state.rb
index fa58b09e0cd68f..88f2e9e98b9797 100644
--- a/db/post_migrate/20241112161754_finalize_set_correct_vulnerability_state.rb
+++ b/db/post_migrate/20241112161754_finalize_set_correct_vulnerability_state.rb
@@ -4,7 +4,7 @@ class FinalizeSetCorrectVulnerabilityState < Gitlab::Database::Migration[2.2]
   MIGRATION = "SetCorrectVulnerabilityState"
 
   milestone '17.6'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   disable_ddl_transaction!
 
diff --git a/db/post_migrate/20241114202257_queue_backfill_compliance_violation_null_target_project_ids.rb b/db/post_migrate/20241114202257_queue_backfill_compliance_violation_null_target_project_ids.rb
index 1c7539afbc4545..7cb131fb4e5667 100644
--- a/db/post_migrate/20241114202257_queue_backfill_compliance_violation_null_target_project_ids.rb
+++ b/db/post_migrate/20241114202257_queue_backfill_compliance_violation_null_target_project_ids.rb
@@ -3,7 +3,7 @@
 class QueueBackfillComplianceViolationNullTargetProjectIds < Gitlab::Database::Migration[2.2]
   milestone '17.7'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     # no-op
diff --git a/db/post_migrate/20241118124301_requeue_backfill_security_policies.rb b/db/post_migrate/20241118124301_requeue_backfill_security_policies.rb
index 8446ff4800c61e..6d73baf24b47dd 100644
--- a/db/post_migrate/20241118124301_requeue_backfill_security_policies.rb
+++ b/db/post_migrate/20241118124301_requeue_backfill_security_policies.rb
@@ -3,7 +3,7 @@
 class RequeueBackfillSecurityPolicies < Gitlab::Database::Migration[2.2]
   milestone '17.7'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillSecurityPolicies"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20241118145604_queue_create_missing_terraform_module_metadata.rb b/db/post_migrate/20241118145604_queue_create_missing_terraform_module_metadata.rb
index 8399d64bbd8e1f..356f22f41818a9 100644
--- a/db/post_migrate/20241118145604_queue_create_missing_terraform_module_metadata.rb
+++ b/db/post_migrate/20241118145604_queue_create_missing_terraform_module_metadata.rb
@@ -2,7 +2,7 @@
 
 class QueueCreateMissingTerraformModuleMetadata < Gitlab::Database::Migration[2.2]
   milestone '17.7'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = 'CreateMissingTerraformModuleMetadata'
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20241120185321_create_default_ai_setting.rb b/db/post_migrate/20241120185321_create_default_ai_setting.rb
index b8e9c0e645cb6e..868a10e34d5995 100644
--- a/db/post_migrate/20241120185321_create_default_ai_setting.rb
+++ b/db/post_migrate/20241120185321_create_default_ai_setting.rb
@@ -2,7 +2,7 @@
 
 class CreateDefaultAiSetting < Gitlab::Database::Migration[2.2]
   milestone '17.6'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ai_gateway_url = ENV["AI_GATEWAY_URL"]
diff --git a/db/post_migrate/20241122184608_queue_update_software_license_policies_with_custom_licenses.rb b/db/post_migrate/20241122184608_queue_update_software_license_policies_with_custom_licenses.rb
index 0db818029ecd4b..c27de27cca1ed2 100644
--- a/db/post_migrate/20241122184608_queue_update_software_license_policies_with_custom_licenses.rb
+++ b/db/post_migrate/20241122184608_queue_update_software_license_policies_with_custom_licenses.rb
@@ -3,7 +3,7 @@
 class QueueUpdateSoftwareLicensePoliciesWithCustomLicenses < Gitlab::Database::Migration[2.2]
   milestone '17.9'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "UpdateSoftwareLicensePoliciesWithCustomLicenses"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20241125145919_queue_delete_orphaned_project_namespaces.rb b/db/post_migrate/20241125145919_queue_delete_orphaned_project_namespaces.rb
index ef8e993a0b8b59..e61cc642aa8f84 100644
--- a/db/post_migrate/20241125145919_queue_delete_orphaned_project_namespaces.rb
+++ b/db/post_migrate/20241125145919_queue_delete_orphaned_project_namespaces.rb
@@ -3,7 +3,7 @@
 class QueueDeleteOrphanedProjectNamespaces < Gitlab::Database::Migration[2.2]
   milestone '17.8'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "DeleteOrphanedProjectNamespaces"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20241125232348_finalize_disable_allow_runner_registration_on_namespace_settings_for_gitlab_com.rb b/db/post_migrate/20241125232348_finalize_disable_allow_runner_registration_on_namespace_settings_for_gitlab_com.rb
index 02b90c6c29cae5..e42cfaecac1407 100644
--- a/db/post_migrate/20241125232348_finalize_disable_allow_runner_registration_on_namespace_settings_for_gitlab_com.rb
+++ b/db/post_migrate/20241125232348_finalize_disable_allow_runner_registration_on_namespace_settings_for_gitlab_com.rb
@@ -5,7 +5,7 @@ class FinalizeDisableAllowRunnerRegistrationOnNamespaceSettingsForGitlabCom < Gi
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20241127151803_queue_migrate_software_license_without_spdx_identifier_to_custom_licenses.rb b/db/post_migrate/20241127151803_queue_migrate_software_license_without_spdx_identifier_to_custom_licenses.rb
index 62ada62a65fd2d..fa098f2e2a5581 100644
--- a/db/post_migrate/20241127151803_queue_migrate_software_license_without_spdx_identifier_to_custom_licenses.rb
+++ b/db/post_migrate/20241127151803_queue_migrate_software_license_without_spdx_identifier_to_custom_licenses.rb
@@ -3,7 +3,7 @@
 class QueueMigrateSoftwareLicenseWithoutSpdxIdentifierToCustomLicenses < Gitlab::Database::Migration[2.2]
   milestone '17.7'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "MigrateRemainingSoftwareLicenseWithoutSpdxIdentifierToCustomLicenses"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20241127210044_backfill_user_details.rb b/db/post_migrate/20241127210044_backfill_user_details.rb
index 54c65930bbbf81..62f6643e9b7b8d 100644
--- a/db/post_migrate/20241127210044_backfill_user_details.rb
+++ b/db/post_migrate/20241127210044_backfill_user_details.rb
@@ -2,7 +2,7 @@
 
 class BackfillUserDetails < Gitlab::Database::Migration[2.2]
   milestone '17.7'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
 
   BATCH_SIZE = 50
diff --git a/db/post_migrate/20241201164238_queue_update_status_for_deprecated_npm_packages.rb b/db/post_migrate/20241201164238_queue_update_status_for_deprecated_npm_packages.rb
index 67d59db519ef71..b07a11ee5c4438 100644
--- a/db/post_migrate/20241201164238_queue_update_status_for_deprecated_npm_packages.rb
+++ b/db/post_migrate/20241201164238_queue_update_status_for_deprecated_npm_packages.rb
@@ -3,7 +3,7 @@
 class QueueUpdateStatusForDeprecatedNpmPackages < Gitlab::Database::Migration[2.2]
   milestone '17.7'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = 'UpdateStatusForDeprecatedNpmPackages'
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20241202170820_queue_backfill_issue_link_id_on_related_epic_links.rb b/db/post_migrate/20241202170820_queue_backfill_issue_link_id_on_related_epic_links.rb
index 703efc508f6988..250c81e0acdd8e 100644
--- a/db/post_migrate/20241202170820_queue_backfill_issue_link_id_on_related_epic_links.rb
+++ b/db/post_migrate/20241202170820_queue_backfill_issue_link_id_on_related_epic_links.rb
@@ -3,7 +3,7 @@
 class QueueBackfillIssueLinkIdOnRelatedEpicLinks < Gitlab::Database::Migration[2.2]
   milestone '17.7'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillIssueLinkIdOnRelatedEpicLinks"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20241203172717_queue_backfill_subscription_add_on_purchases_started_at.rb b/db/post_migrate/20241203172717_queue_backfill_subscription_add_on_purchases_started_at.rb
index 0b3be88820b5d9..ea3a3b000fe46d 100644
--- a/db/post_migrate/20241203172717_queue_backfill_subscription_add_on_purchases_started_at.rb
+++ b/db/post_migrate/20241203172717_queue_backfill_subscription_add_on_purchases_started_at.rb
@@ -2,7 +2,7 @@
 
 class QueueBackfillSubscriptionAddOnPurchasesStartedAt < Gitlab::Database::Migration[2.2]
   milestone '17.7'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillSubscriptionAddOnPurchasesStartedAt"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20241204201518_queue_backfill_group_wiki_activity_events.rb b/db/post_migrate/20241204201518_queue_backfill_group_wiki_activity_events.rb
index 5c70827e57068d..a76a67864384b4 100644
--- a/db/post_migrate/20241204201518_queue_backfill_group_wiki_activity_events.rb
+++ b/db/post_migrate/20241204201518_queue_backfill_group_wiki_activity_events.rb
@@ -3,7 +3,7 @@
 class QueueBackfillGroupWikiActivityEvents < Gitlab::Database::Migration[2.2]
   milestone '17.7'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillGroupWikiActivityEvents"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20241205120931_remove_rolledup_dates_widget_from_work_item_types.rb b/db/post_migrate/20241205120931_remove_rolledup_dates_widget_from_work_item_types.rb
index 25dec873718149..f23b4d5636b7b3 100644
--- a/db/post_migrate/20241205120931_remove_rolledup_dates_widget_from_work_item_types.rb
+++ b/db/post_migrate/20241205120931_remove_rolledup_dates_widget_from_work_item_types.rb
@@ -2,7 +2,7 @@
 
 class RemoveRolledupDatesWidgetFromWorkItemTypes < Gitlab::Database::Migration[2.2]
   milestone '17.7'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
 
   class WorkItemType < MigrationRecord
diff --git a/db/post_migrate/20241205232318_finalize_backfill_resource_link_events.rb b/db/post_migrate/20241205232318_finalize_backfill_resource_link_events.rb
index a76c74cc9585e4..20097627eda720 100644
--- a/db/post_migrate/20241205232318_finalize_backfill_resource_link_events.rb
+++ b/db/post_migrate/20241205232318_finalize_backfill_resource_link_events.rb
@@ -5,7 +5,7 @@ class FinalizeBackfillResourceLinkEvents < Gitlab::Database::Migration[2.2]
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     # no-op
diff --git a/db/post_migrate/20241209131010_queue_requeue_backfill_seat_assignments_table.rb b/db/post_migrate/20241209131010_queue_requeue_backfill_seat_assignments_table.rb
index 81d1bf12bc5d7b..10ef1ae29f2a3e 100644
--- a/db/post_migrate/20241209131010_queue_requeue_backfill_seat_assignments_table.rb
+++ b/db/post_migrate/20241209131010_queue_requeue_backfill_seat_assignments_table.rb
@@ -3,7 +3,7 @@
 class QueueRequeueBackfillSeatAssignmentsTable < Gitlab::Database::Migration[2.2]
   milestone '17.8'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillSeatAssignmentsTable"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20241210081707_finalize_backfill_security_policies.rb b/db/post_migrate/20241210081707_finalize_backfill_security_policies.rb
index bd17f4c70c3560..25acb0546ce20a 100644
--- a/db/post_migrate/20241210081707_finalize_backfill_security_policies.rb
+++ b/db/post_migrate/20241210081707_finalize_backfill_security_policies.rb
@@ -4,7 +4,7 @@ class FinalizeBackfillSecurityPolicies < Gitlab::Database::Migration[2.2]
   milestone '17.9'
 
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillSecurityPolicies"
 
diff --git a/db/post_migrate/20241213085750_queue_mark_duplicate_maven_packages_for_destruction.rb b/db/post_migrate/20241213085750_queue_mark_duplicate_maven_packages_for_destruction.rb
index cbe9d75e89f6b6..3cb570a2c3bcc6 100644
--- a/db/post_migrate/20241213085750_queue_mark_duplicate_maven_packages_for_destruction.rb
+++ b/db/post_migrate/20241213085750_queue_mark_duplicate_maven_packages_for_destruction.rb
@@ -2,7 +2,7 @@
 
 class QueueMarkDuplicateMavenPackagesForDestruction < Gitlab::Database::Migration[2.2]
   milestone '17.8'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = 'MarkDuplicateMavenPackagesForDestruction'
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20241213092247_update_ci_max_artifact_size_lsif_of_plan_limits_from100_to200.rb b/db/post_migrate/20241213092247_update_ci_max_artifact_size_lsif_of_plan_limits_from100_to200.rb
index 854ce17f7c7511..38a8efff0a8773 100644
--- a/db/post_migrate/20241213092247_update_ci_max_artifact_size_lsif_of_plan_limits_from100_to200.rb
+++ b/db/post_migrate/20241213092247_update_ci_max_artifact_size_lsif_of_plan_limits_from100_to200.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class UpdateCiMaxArtifactSizeLsifOfPlanLimitsFrom100To200 < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '17.8'
 
diff --git a/db/post_migrate/20241218223002_fix_work_item_types_id_column_values.rb b/db/post_migrate/20241218223002_fix_work_item_types_id_column_values.rb
index 4f3e8d9df1c99d..82be1011db8d93 100644
--- a/db/post_migrate/20241218223002_fix_work_item_types_id_column_values.rb
+++ b/db/post_migrate/20241218223002_fix_work_item_types_id_column_values.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class FixWorkItemTypesIdColumnValues < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.8'
 
   def up
diff --git a/db/post_migrate/20241219144523_queue_skip_company_onboarding_step.rb b/db/post_migrate/20241219144523_queue_skip_company_onboarding_step.rb
index ee8b2b289b3dd6..f9d2d69b7937b5 100644
--- a/db/post_migrate/20241219144523_queue_skip_company_onboarding_step.rb
+++ b/db/post_migrate/20241219144523_queue_skip_company_onboarding_step.rb
@@ -2,7 +2,7 @@
 
 class QueueSkipCompanyOnboardingStep < Gitlab::Database::Migration[2.2]
   milestone '17.8'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "SkipCompanyOnboardingStep"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20241226131806_finalize_migrate_os_sbom_occurrences_to_components_without_prefix.rb b/db/post_migrate/20241226131806_finalize_migrate_os_sbom_occurrences_to_components_without_prefix.rb
index 5f42e0d77def7e..8114dd24641d57 100644
--- a/db/post_migrate/20241226131806_finalize_migrate_os_sbom_occurrences_to_components_without_prefix.rb
+++ b/db/post_migrate/20241226131806_finalize_migrate_os_sbom_occurrences_to_components_without_prefix.rb
@@ -5,7 +5,7 @@ class FinalizeMigrateOsSbomOccurrencesToComponentsWithoutPrefix < Gitlab::Databa
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250103051831_enable_read_compliance_dashboard.rb b/db/post_migrate/20250103051831_enable_read_compliance_dashboard.rb
index 7b84e01a0ebc8e..e3716a5343e91d 100644
--- a/db/post_migrate/20250103051831_enable_read_compliance_dashboard.rb
+++ b/db/post_migrate/20250103051831_enable_read_compliance_dashboard.rb
@@ -3,7 +3,7 @@
 class EnableReadComplianceDashboard < Gitlab::Database::Migration[2.2]
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '17.9'
 
diff --git a/db/post_migrate/20250106104021_queue_fix_usernamespace_audit_events.rb b/db/post_migrate/20250106104021_queue_fix_usernamespace_audit_events.rb
index 75b109f6652797..d736e52929c257 100644
--- a/db/post_migrate/20250106104021_queue_fix_usernamespace_audit_events.rb
+++ b/db/post_migrate/20250106104021_queue_fix_usernamespace_audit_events.rb
@@ -3,7 +3,7 @@
 class QueueFixUsernamespaceAuditEvents < Gitlab::Database::Migration[2.2]
   milestone '17.9'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "FixUsernamespaceAuditEvents"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20250106173236_queue_fix_issues_work_item_type_id_values.rb b/db/post_migrate/20250106173236_queue_fix_issues_work_item_type_id_values.rb
index 2d84fa11f51c82..63c4660886e01f 100644
--- a/db/post_migrate/20250106173236_queue_fix_issues_work_item_type_id_values.rb
+++ b/db/post_migrate/20250106173236_queue_fix_issues_work_item_type_id_values.rb
@@ -4,7 +4,7 @@ class QueueFixIssuesWorkItemTypeIdValues < Gitlab::Database::Migration[2.2]
   milestone '17.8'
 
   # Select the applicable gitlab schema for your batched background migration
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "FixIssuesWorkItemTypeIdValues"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20250106175246_queue_migrate_scim_identities.rb b/db/post_migrate/20250106175246_queue_migrate_scim_identities.rb
index e36dc9d9f99d0b..ac8874ebd5b179 100644
--- a/db/post_migrate/20250106175246_queue_migrate_scim_identities.rb
+++ b/db/post_migrate/20250106175246_queue_migrate_scim_identities.rb
@@ -3,7 +3,7 @@
 class QueueMigrateScimIdentities < Gitlab::Database::Migration[2.2]
   milestone '17.8'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "MigrateScimIdentities"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20250106194913_finalize_backfill_compliance_violation_null_target_project_ids_migration.rb b/db/post_migrate/20250106194913_finalize_backfill_compliance_violation_null_target_project_ids_migration.rb
index 7d9ef3f53d1eff..37ba2e8b05cd1a 100644
--- a/db/post_migrate/20250106194913_finalize_backfill_compliance_violation_null_target_project_ids_migration.rb
+++ b/db/post_migrate/20250106194913_finalize_backfill_compliance_violation_null_target_project_ids_migration.rb
@@ -5,7 +5,7 @@ class FinalizeBackfillComplianceViolationNullTargetProjectIdsMigration < Gitlab:
 
   milestone '17.9'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250107143450_queue_migrate_scim_tokens.rb b/db/post_migrate/20250107143450_queue_migrate_scim_tokens.rb
index 3d4799ea0e48f9..4551ba5ca383dd 100644
--- a/db/post_migrate/20250107143450_queue_migrate_scim_tokens.rb
+++ b/db/post_migrate/20250107143450_queue_migrate_scim_tokens.rb
@@ -3,7 +3,7 @@
 class QueueMigrateScimTokens < Gitlab::Database::Migration[2.2]
   milestone '17.8'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "MigrateScimTokens"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20250113132735_finalize_requeue_backfill_related_epic_links_to_issue_links.rb b/db/post_migrate/20250113132735_finalize_requeue_backfill_related_epic_links_to_issue_links.rb
index 9dbe80154f7c59..5b5ee0efbb0d43 100644
--- a/db/post_migrate/20250113132735_finalize_requeue_backfill_related_epic_links_to_issue_links.rb
+++ b/db/post_migrate/20250113132735_finalize_requeue_backfill_related_epic_links_to_issue_links.rb
@@ -4,7 +4,7 @@ class FinalizeRequeueBackfillRelatedEpicLinksToIssueLinks < Gitlab::Database::Mi
   MIGRATION = 'RequeueBackfillRelatedEpicLinksToIssueLinks'
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.9'
 
   def up
diff --git a/db/post_migrate/20250113132806_finalize_requeue_backfill_epic_issues_into_work_item_parent_links.rb b/db/post_migrate/20250113132806_finalize_requeue_backfill_epic_issues_into_work_item_parent_links.rb
index 913b1b70be951c..f001729cbbb0a6 100644
--- a/db/post_migrate/20250113132806_finalize_requeue_backfill_epic_issues_into_work_item_parent_links.rb
+++ b/db/post_migrate/20250113132806_finalize_requeue_backfill_epic_issues_into_work_item_parent_links.rb
@@ -4,7 +4,7 @@ class FinalizeRequeueBackfillEpicIssuesIntoWorkItemParentLinks < Gitlab::Databas
   MIGRATION = 'RequeueBackfillEpicIssuesIntoWorkItemParentLinks'
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.9'
 
   def up
diff --git a/db/post_migrate/20250113132823_finalize_requeue_backfill_work_item_hierarchy_for_epics.rb b/db/post_migrate/20250113132823_finalize_requeue_backfill_work_item_hierarchy_for_epics.rb
index 26d5e9bc300f81..eba1a3fa93b9d7 100644
--- a/db/post_migrate/20250113132823_finalize_requeue_backfill_work_item_hierarchy_for_epics.rb
+++ b/db/post_migrate/20250113132823_finalize_requeue_backfill_work_item_hierarchy_for_epics.rb
@@ -4,7 +4,7 @@ class FinalizeRequeueBackfillWorkItemHierarchyForEpics < Gitlab::Database::Migra
   MIGRATION = 'RequeueBackfillWorkItemHierarchyForEpics'
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.9'
 
   def up
diff --git a/db/post_migrate/20250113204448_finalize_resync_has_vulnerabilities.rb b/db/post_migrate/20250113204448_finalize_resync_has_vulnerabilities.rb
index e81ec3d5f21df9..8c236938d87cbd 100644
--- a/db/post_migrate/20250113204448_finalize_resync_has_vulnerabilities.rb
+++ b/db/post_migrate/20250113204448_finalize_resync_has_vulnerabilities.rb
@@ -5,7 +5,7 @@ class FinalizeResyncHasVulnerabilities < Gitlab::Database::Migration[2.2]
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250113222525_finalize_events_sharding_key_backfill.rb b/db/post_migrate/20250113222525_finalize_events_sharding_key_backfill.rb
index f448d83523a6fe..8429cfc4d2fd51 100644
--- a/db/post_migrate/20250113222525_finalize_events_sharding_key_backfill.rb
+++ b/db/post_migrate/20250113222525_finalize_events_sharding_key_backfill.rb
@@ -3,7 +3,7 @@
 class FinalizeEventsShardingKeyBackfill < Gitlab::Database::Migration[2.2]
   milestone '17.9'
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250114123402_requeue_backfill_seat_assignments_table.rb b/db/post_migrate/20250114123402_requeue_backfill_seat_assignments_table.rb
index eb5a8465068aa3..1b719fc469c8c0 100644
--- a/db/post_migrate/20250114123402_requeue_backfill_seat_assignments_table.rb
+++ b/db/post_migrate/20250114123402_requeue_backfill_seat_assignments_table.rb
@@ -3,7 +3,7 @@
 class RequeueBackfillSeatAssignmentsTable < Gitlab::Database::Migration[2.2]
   milestone '17.9'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillSeatAssignmentsTable"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20250114142652_update_import_failures_organization_id.rb b/db/post_migrate/20250114142652_update_import_failures_organization_id.rb
index 50376c954d3aa5..523fc321d3ab3b 100644
--- a/db/post_migrate/20250114142652_update_import_failures_organization_id.rb
+++ b/db/post_migrate/20250114142652_update_import_failures_organization_id.rb
@@ -5,7 +5,7 @@ class UpdateImportFailuresOrganizationId < Gitlab::Database::Migration[2.2]
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.9'
 
   def up
diff --git a/db/post_migrate/20250114213926_finalize_migrate_software_license_without_spdx_identifier_to_custom_licenses.rb b/db/post_migrate/20250114213926_finalize_migrate_software_license_without_spdx_identifier_to_custom_licenses.rb
index 97dcaf707550e1..98456744293ba5 100644
--- a/db/post_migrate/20250114213926_finalize_migrate_software_license_without_spdx_identifier_to_custom_licenses.rb
+++ b/db/post_migrate/20250114213926_finalize_migrate_software_license_without_spdx_identifier_to_custom_licenses.rb
@@ -4,7 +4,7 @@ class FinalizeMigrateSoftwareLicenseWithoutSpdxIdentifierToCustomLicenses < Gitl
   milestone '17.9'
 
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "MigrateRemainingSoftwareLicenseWithoutSpdxIdentifierToCustomLicenses"
 
diff --git a/db/post_migrate/20250115085553_finalize_backfill_packages_nuget_symbols_project_id.rb b/db/post_migrate/20250115085553_finalize_backfill_packages_nuget_symbols_project_id.rb
index 49b7cf14f3bf86..1a580d77843efe 100644
--- a/db/post_migrate/20250115085553_finalize_backfill_packages_nuget_symbols_project_id.rb
+++ b/db/post_migrate/20250115085553_finalize_backfill_packages_nuget_symbols_project_id.rb
@@ -2,7 +2,7 @@
 
 class FinalizeBackfillPackagesNugetSymbolsProjectId < Gitlab::Database::Migration[2.2]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.9'
 
   def up
diff --git a/db/post_migrate/20250115162840_queue_backfill_vs_code_settings_settings_context_hash.rb b/db/post_migrate/20250115162840_queue_backfill_vs_code_settings_settings_context_hash.rb
index 6acbf4079ae843..3134afe1188be7 100644
--- a/db/post_migrate/20250115162840_queue_backfill_vs_code_settings_settings_context_hash.rb
+++ b/db/post_migrate/20250115162840_queue_backfill_vs_code_settings_settings_context_hash.rb
@@ -3,7 +3,7 @@
 class QueueBackfillVsCodeSettingsSettingsContextHash < Gitlab::Database::Migration[2.2]
   milestone '17.10'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillVsCodeSettingsSettingsContextHash"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20250117145241_fix_group_scim_identities.rb b/db/post_migrate/20250117145241_fix_group_scim_identities.rb
index 46220934ec368b..20f52fda6b1189 100644
--- a/db/post_migrate/20250117145241_fix_group_scim_identities.rb
+++ b/db/post_migrate/20250117145241_fix_group_scim_identities.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class FixGroupScimIdentities < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '17.9'
 
diff --git a/db/post_migrate/20250120204651_finalize_fix_issues_work_item_type_id_values_bbm.rb b/db/post_migrate/20250120204651_finalize_fix_issues_work_item_type_id_values_bbm.rb
index bc6fc1cb615608..5c0140fe6ce07f 100644
--- a/db/post_migrate/20250120204651_finalize_fix_issues_work_item_type_id_values_bbm.rb
+++ b/db/post_migrate/20250120204651_finalize_fix_issues_work_item_type_id_values_bbm.rb
@@ -5,7 +5,7 @@ class FinalizeFixIssuesWorkItemTypeIdValuesBbm < Gitlab::Database::Migration[2.2
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.9'
 
   def up
diff --git a/db/post_migrate/20250122192623_finalize_backfill_resource_link_events_attempt2.rb b/db/post_migrate/20250122192623_finalize_backfill_resource_link_events_attempt2.rb
index 5493ec8f170272..9349a21f497f9a 100644
--- a/db/post_migrate/20250122192623_finalize_backfill_resource_link_events_attempt2.rb
+++ b/db/post_migrate/20250122192623_finalize_backfill_resource_link_events_attempt2.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class FinalizeBackfillResourceLinkEventsAttempt2 < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
 
   milestone '17.9'
diff --git a/db/post_migrate/20250122193107_finalize_skip_company_onboarding_step.rb b/db/post_migrate/20250122193107_finalize_skip_company_onboarding_step.rb
index 94eace6081fe2d..2ab07d2dafd135 100644
--- a/db/post_migrate/20250122193107_finalize_skip_company_onboarding_step.rb
+++ b/db/post_migrate/20250122193107_finalize_skip_company_onboarding_step.rb
@@ -5,7 +5,7 @@ class FinalizeSkipCompanyOnboardingStep < Gitlab::Database::Migration[2.2]
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250123165451_finalize_the_deduplication_of_issuable_resource_links.rb b/db/post_migrate/20250123165451_finalize_the_deduplication_of_issuable_resource_links.rb
index f4e86230594f8c..1b9bc2b654242c 100644
--- a/db/post_migrate/20250123165451_finalize_the_deduplication_of_issuable_resource_links.rb
+++ b/db/post_migrate/20250123165451_finalize_the_deduplication_of_issuable_resource_links.rb
@@ -6,7 +6,7 @@ class FinalizeTheDeduplicationOfIssuableResourceLinks < Gitlab::Database::Migrat
   disable_ddl_transaction!
   milestone '17.9'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250123165454_finalize_the_deduplication_of_issuable_resource_links_2.rb b/db/post_migrate/20250123165454_finalize_the_deduplication_of_issuable_resource_links_2.rb
index 97af2a47cb9ce5..a311b0842f56f3 100644
--- a/db/post_migrate/20250123165454_finalize_the_deduplication_of_issuable_resource_links_2.rb
+++ b/db/post_migrate/20250123165454_finalize_the_deduplication_of_issuable_resource_links_2.rb
@@ -6,7 +6,7 @@ class FinalizeTheDeduplicationOfIssuableResourceLinks2 < Gitlab::Database::Migra
   disable_ddl_transaction!
   milestone '17.9'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250123165457_finalize_the_deduplication_of_issuable_resource_links_3.rb b/db/post_migrate/20250123165457_finalize_the_deduplication_of_issuable_resource_links_3.rb
index a29c0863ab6060..a47a1b4e4a4fd2 100644
--- a/db/post_migrate/20250123165457_finalize_the_deduplication_of_issuable_resource_links_3.rb
+++ b/db/post_migrate/20250123165457_finalize_the_deduplication_of_issuable_resource_links_3.rb
@@ -6,7 +6,7 @@ class FinalizeTheDeduplicationOfIssuableResourceLinks3 < Gitlab::Database::Migra
   disable_ddl_transaction!
   milestone '17.9'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250123185100_delete_boards_without_project_and_group.rb b/db/post_migrate/20250123185100_delete_boards_without_project_and_group.rb
index cb1c84bd4df068..7829c88cfa1276 100644
--- a/db/post_migrate/20250123185100_delete_boards_without_project_and_group.rb
+++ b/db/post_migrate/20250123185100_delete_boards_without_project_and_group.rb
@@ -4,7 +4,7 @@ class DeleteBoardsWithoutProjectAndGroup < Gitlab::Database::Migration[2.2]
   BATCH_SIZE = 100
 
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.9'
 
   def up
diff --git a/db/post_migrate/20250123195100_fix_boards_with_project_and_group.rb b/db/post_migrate/20250123195100_fix_boards_with_project_and_group.rb
index 1e8784dea508dd..0cb95d5537155e 100644
--- a/db/post_migrate/20250123195100_fix_boards_with_project_and_group.rb
+++ b/db/post_migrate/20250123195100_fix_boards_with_project_and_group.rb
@@ -4,7 +4,7 @@ class FixBoardsWithProjectAndGroup < Gitlab::Database::Migration[2.2]
   BATCH_SIZE = 100
 
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.9'
 
   def up
diff --git a/db/post_migrate/20250123195300_backfill_sharding_key_on_board_assignees.rb b/db/post_migrate/20250123195300_backfill_sharding_key_on_board_assignees.rb
index b997c9cbf9e501..5a4c772781296b 100644
--- a/db/post_migrate/20250123195300_backfill_sharding_key_on_board_assignees.rb
+++ b/db/post_migrate/20250123195300_backfill_sharding_key_on_board_assignees.rb
@@ -4,7 +4,7 @@ class BackfillShardingKeyOnBoardAssignees < Gitlab::Database::Migration[2.2]
   BATCH_SIZE = 100
 
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '17.9'
 
diff --git a/db/post_migrate/20250124030157_finalize_backfill_group_wiki_activity_events.rb b/db/post_migrate/20250124030157_finalize_backfill_group_wiki_activity_events.rb
index 52b1daece00d76..0a187f31b0ef76 100644
--- a/db/post_migrate/20250124030157_finalize_backfill_group_wiki_activity_events.rb
+++ b/db/post_migrate/20250124030157_finalize_backfill_group_wiki_activity_events.rb
@@ -5,7 +5,7 @@ class FinalizeBackfillGroupWikiActivityEvents < Gitlab::Database::Migration[2.2]
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillGroupWikiActivityEvents"
 
diff --git a/db/post_migrate/20250127052138_queue_split_microsoft_applications_table.rb b/db/post_migrate/20250127052138_queue_split_microsoft_applications_table.rb
index ecb2f0a9a4dc33..0ce9c67d402a42 100644
--- a/db/post_migrate/20250127052138_queue_split_microsoft_applications_table.rb
+++ b/db/post_migrate/20250127052138_queue_split_microsoft_applications_table.rb
@@ -3,7 +3,7 @@
 class QueueSplitMicrosoftApplicationsTable < Gitlab::Database::Migration[2.2]
   milestone '17.9'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "SplitMicrosoftApplicationsTable"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20250131004135_delete_milestones_without_project_or_group.rb b/db/post_migrate/20250131004135_delete_milestones_without_project_or_group.rb
index e903260b74bc5c..59823bf8ac677b 100644
--- a/db/post_migrate/20250131004135_delete_milestones_without_project_or_group.rb
+++ b/db/post_migrate/20250131004135_delete_milestones_without_project_or_group.rb
@@ -4,7 +4,7 @@ class DeleteMilestonesWithoutProjectOrGroup < Gitlab::Database::Migration[2.2]
   BATCH_SIZE = 100
 
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.9'
 
   def up
diff --git a/db/post_migrate/20250131004257_fix_milestones_with_with_project_and_group.rb b/db/post_migrate/20250131004257_fix_milestones_with_with_project_and_group.rb
index 476e6338d904b8..d168fc6edf15e2 100644
--- a/db/post_migrate/20250131004257_fix_milestones_with_with_project_and_group.rb
+++ b/db/post_migrate/20250131004257_fix_milestones_with_with_project_and_group.rb
@@ -4,7 +4,7 @@ class FixMilestonesWithWithProjectAndGroup < Gitlab::Database::Migration[2.2]
   BATCH_SIZE = 100
 
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.9'
 
   def up
diff --git a/db/post_migrate/20250203155647_requeue_backfill_compliance_violation_null_target_project_ids_migration.rb b/db/post_migrate/20250203155647_requeue_backfill_compliance_violation_null_target_project_ids_migration.rb
index 3479af1bc2ccd1..fc14df3ca46b1a 100644
--- a/db/post_migrate/20250203155647_requeue_backfill_compliance_violation_null_target_project_ids_migration.rb
+++ b/db/post_migrate/20250203155647_requeue_backfill_compliance_violation_null_target_project_ids_migration.rb
@@ -2,7 +2,7 @@
 
 class RequeueBackfillComplianceViolationNullTargetProjectIdsMigration < Gitlab::Database::Migration[2.2]
   milestone '17.9'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillComplianceViolationNullTargetProjectIds"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20250204162346_finalize_backfill_packages_conan_package_references.rb b/db/post_migrate/20250204162346_finalize_backfill_packages_conan_package_references.rb
index 97ba3e6c4723b4..5fcc072e693c22 100644
--- a/db/post_migrate/20250204162346_finalize_backfill_packages_conan_package_references.rb
+++ b/db/post_migrate/20250204162346_finalize_backfill_packages_conan_package_references.rb
@@ -2,7 +2,7 @@
 
 class FinalizeBackfillPackagesConanPackageReferences < Gitlab::Database::Migration[2.2]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '17.9'
 
diff --git a/db/post_migrate/20250205125828_queue_create_missing_nuget_symbol_files.rb b/db/post_migrate/20250205125828_queue_create_missing_nuget_symbol_files.rb
index f44f6b012de029..647663523bd6e1 100644
--- a/db/post_migrate/20250205125828_queue_create_missing_nuget_symbol_files.rb
+++ b/db/post_migrate/20250205125828_queue_create_missing_nuget_symbol_files.rb
@@ -3,7 +3,7 @@
 class QueueCreateMissingNugetSymbolFiles < Gitlab::Database::Migration[2.2]
   milestone '17.10'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = 'CreateMissingNugetSymbolFiles'
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20250205175341_queue_backfill_pipeline_execution_policies_config_links.rb b/db/post_migrate/20250205175341_queue_backfill_pipeline_execution_policies_config_links.rb
index ba70cf2ad3bcac..4d52a95398a985 100644
--- a/db/post_migrate/20250205175341_queue_backfill_pipeline_execution_policies_config_links.rb
+++ b/db/post_migrate/20250205175341_queue_backfill_pipeline_execution_policies_config_links.rb
@@ -3,7 +3,7 @@
 class QueueBackfillPipelineExecutionPoliciesConfigLinks < Gitlab::Database::Migration[2.2]
   milestone '17.10'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillPipelineExecutionPoliciesConfigLinks"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20250206223925_backfill_sharding_key_on_board_labels.rb b/db/post_migrate/20250206223925_backfill_sharding_key_on_board_labels.rb
index d6f632c1ef09c6..4d8a6d1cb305f8 100644
--- a/db/post_migrate/20250206223925_backfill_sharding_key_on_board_labels.rb
+++ b/db/post_migrate/20250206223925_backfill_sharding_key_on_board_labels.rb
@@ -4,7 +4,7 @@ class BackfillShardingKeyOnBoardLabels < Gitlab::Database::Migration[2.2]
   BATCH_SIZE = 100
 
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '17.9'
 
diff --git a/db/post_migrate/20250212025212_finalize_hk_backfill_issues_dates_with_work_item_dates_sources.rb b/db/post_migrate/20250212025212_finalize_hk_backfill_issues_dates_with_work_item_dates_sources.rb
index 301ef2303a952e..8e4558cfd6d2c9 100644
--- a/db/post_migrate/20250212025212_finalize_hk_backfill_issues_dates_with_work_item_dates_sources.rb
+++ b/db/post_migrate/20250212025212_finalize_hk_backfill_issues_dates_with_work_item_dates_sources.rb
@@ -5,7 +5,7 @@ class FinalizeHkBackfillIssuesDatesWithWorkItemDatesSources < Gitlab::Database::
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250212025529_finalize_hk_backfill_zoekt_replicas.rb b/db/post_migrate/20250212025529_finalize_hk_backfill_zoekt_replicas.rb
index 76bdc6a8bcabbc..9f7610d6acae32 100644
--- a/db/post_migrate/20250212025529_finalize_hk_backfill_zoekt_replicas.rb
+++ b/db/post_migrate/20250212025529_finalize_hk_backfill_zoekt_replicas.rb
@@ -5,7 +5,7 @@ class FinalizeHkBackfillZoektReplicas < Gitlab::Database::Migration[2.2]
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250213231631_finalize_hk_fix_synced_epic_work_item_parent_links.rb b/db/post_migrate/20250213231631_finalize_hk_fix_synced_epic_work_item_parent_links.rb
index e74e6dcda16220..ccd4319036e092 100644
--- a/db/post_migrate/20250213231631_finalize_hk_fix_synced_epic_work_item_parent_links.rb
+++ b/db/post_migrate/20250213231631_finalize_hk_fix_synced_epic_work_item_parent_links.rb
@@ -5,7 +5,7 @@ class FinalizeHkFixSyncedEpicWorkItemParentLinks < Gitlab::Database::Migration[2
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250213231656_finalize_hk_alter_webhook_deleted_audit_event.rb b/db/post_migrate/20250213231656_finalize_hk_alter_webhook_deleted_audit_event.rb
index b2e6d5db258c51..1b0a1b17de6548 100644
--- a/db/post_migrate/20250213231656_finalize_hk_alter_webhook_deleted_audit_event.rb
+++ b/db/post_migrate/20250213231656_finalize_hk_alter_webhook_deleted_audit_event.rb
@@ -5,7 +5,7 @@ class FinalizeHkAlterWebhookDeletedAuditEvent < Gitlab::Database::Migration[2.2]
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250214085204_fill_ai_duo_chat_events_organization_id.rb b/db/post_migrate/20250214085204_fill_ai_duo_chat_events_organization_id.rb
index 4b16c247d51d9a..dee23c7073d630 100644
--- a/db/post_migrate/20250214085204_fill_ai_duo_chat_events_organization_id.rb
+++ b/db/post_migrate/20250214085204_fill_ai_duo_chat_events_organization_id.rb
@@ -2,7 +2,7 @@
 
 class FillAiDuoChatEventsOrganizationId < Gitlab::Database::Migration[2.2]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.10'
 
   def up
diff --git a/db/post_migrate/20250214214518_queue_backfill_software_license_policies.rb b/db/post_migrate/20250214214518_queue_backfill_software_license_policies.rb
index e73f1df78bdf40..6b296d76457d03 100644
--- a/db/post_migrate/20250214214518_queue_backfill_software_license_policies.rb
+++ b/db/post_migrate/20250214214518_queue_backfill_software_license_policies.rb
@@ -3,7 +3,7 @@
 class QueueBackfillSoftwareLicensePolicies < Gitlab::Database::Migration[2.2]
   milestone '17.10'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillSoftwareLicensePolicies"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20250220185148_queue_update_closed_merged_mrs.rb b/db/post_migrate/20250220185148_queue_update_closed_merged_mrs.rb
index 1a53ef72bbca2c..daae02956dd091 100644
--- a/db/post_migrate/20250220185148_queue_update_closed_merged_mrs.rb
+++ b/db/post_migrate/20250220185148_queue_update_closed_merged_mrs.rb
@@ -9,7 +9,7 @@ class QueueUpdateClosedMergedMrs < Gitlab::Database::Migration[2.2]
   BATCH_SIZE = 1000
   SUB_BATCH_SIZE = 100
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     return unless Gitlab.com_except_jh?
diff --git a/db/post_migrate/20250220231823_finalize_hk_backfill_reserved_storage_bytes.rb b/db/post_migrate/20250220231823_finalize_hk_backfill_reserved_storage_bytes.rb
index c327144ec44b8c..d9da5d1d550dce 100644
--- a/db/post_migrate/20250220231823_finalize_hk_backfill_reserved_storage_bytes.rb
+++ b/db/post_migrate/20250220231823_finalize_hk_backfill_reserved_storage_bytes.rb
@@ -5,7 +5,7 @@ class FinalizeHkBackfillReservedStorageBytes < Gitlab::Database::Migration[2.2]
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250225234322_clean_resource_milestone_events_without_parent.rb b/db/post_migrate/20250225234322_clean_resource_milestone_events_without_parent.rb
index 155776f15a9f22..568fe25c3c8080 100644
--- a/db/post_migrate/20250225234322_clean_resource_milestone_events_without_parent.rb
+++ b/db/post_migrate/20250225234322_clean_resource_milestone_events_without_parent.rb
@@ -4,7 +4,7 @@ class CleanResourceMilestoneEventsWithoutParent < Gitlab::Database::Migration[2.
   BATCH_SIZE = 100
 
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.10'
 
   def up
diff --git a/db/post_migrate/20250225235324_clean_resource_milestone_events_with_two_parents.rb b/db/post_migrate/20250225235324_clean_resource_milestone_events_with_two_parents.rb
index e6c066f5e2c342..c7865cd464fec7 100644
--- a/db/post_migrate/20250225235324_clean_resource_milestone_events_with_two_parents.rb
+++ b/db/post_migrate/20250225235324_clean_resource_milestone_events_with_two_parents.rb
@@ -4,7 +4,7 @@ class CleanResourceMilestoneEventsWithTwoParents < Gitlab::Database::Migration[2
   BATCH_SIZE = 100
 
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.10'
 
   def up
diff --git a/db/post_migrate/20250225235330_queue_backfill_resource_milestone_events_namespace.rb b/db/post_migrate/20250225235330_queue_backfill_resource_milestone_events_namespace.rb
index 05d5fde687a695..e77343daf3eafa 100644
--- a/db/post_migrate/20250225235330_queue_backfill_resource_milestone_events_namespace.rb
+++ b/db/post_migrate/20250225235330_queue_backfill_resource_milestone_events_namespace.rb
@@ -3,7 +3,7 @@
 class QueueBackfillResourceMilestoneEventsNamespace < Gitlab::Database::Migration[2.2]
   milestone '17.10'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillResourceMilestoneEventsNamespace"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20250226231923_finalize_hk_fix_namespace_id_for_work_item_parent_links.rb b/db/post_migrate/20250226231923_finalize_hk_fix_namespace_id_for_work_item_parent_links.rb
index 3e1c711cd0e28c..0ac1990659845d 100644
--- a/db/post_migrate/20250226231923_finalize_hk_fix_namespace_id_for_work_item_parent_links.rb
+++ b/db/post_migrate/20250226231923_finalize_hk_fix_namespace_id_for_work_item_parent_links.rb
@@ -5,7 +5,7 @@ class FinalizeHkFixNamespaceIdForWorkItemParentLinks < Gitlab::Database::Migrati
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250228143727_requeue_sync_unlinked_security_policy_project_links.rb b/db/post_migrate/20250228143727_requeue_sync_unlinked_security_policy_project_links.rb
index 68e1ef88e4c421..c79e605cdebc92 100644
--- a/db/post_migrate/20250228143727_requeue_sync_unlinked_security_policy_project_links.rb
+++ b/db/post_migrate/20250228143727_requeue_sync_unlinked_security_policy_project_links.rb
@@ -3,7 +3,7 @@
 class RequeueSyncUnlinkedSecurityPolicyProjectLinks < Gitlab::Database::Migration[2.2]
   milestone '17.10'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "SyncUnlinkedSecurityPolicyProjectLinks"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20250228155146_queue_backfill_onboarding_status_setup_for_company.rb b/db/post_migrate/20250228155146_queue_backfill_onboarding_status_setup_for_company.rb
index 9039eb57b6a1dd..ed5d5980794982 100644
--- a/db/post_migrate/20250228155146_queue_backfill_onboarding_status_setup_for_company.rb
+++ b/db/post_migrate/20250228155146_queue_backfill_onboarding_status_setup_for_company.rb
@@ -3,7 +3,7 @@
 class QueueBackfillOnboardingStatusSetupForCompany < Gitlab::Database::Migration[2.2]
   milestone '17.10'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillOnboardingStatusSetupForCompany"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20250302231828_finalize_hk_make_security_policy_bots_private.rb b/db/post_migrate/20250302231828_finalize_hk_make_security_policy_bots_private.rb
index c3c024820b54fa..566787fb7c94e2 100644
--- a/db/post_migrate/20250302231828_finalize_hk_make_security_policy_bots_private.rb
+++ b/db/post_migrate/20250302231828_finalize_hk_make_security_policy_bots_private.rb
@@ -5,7 +5,7 @@ class FinalizeHkMakeSecurityPolicyBotsPrivate < Gitlab::Database::Migration[2.2]
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250304184254_queue_remove_orphaned_vulnerability_notes_batched_migration.rb b/db/post_migrate/20250304184254_queue_remove_orphaned_vulnerability_notes_batched_migration.rb
index a8e29e1cc53365..0b75dcfb379d53 100644
--- a/db/post_migrate/20250304184254_queue_remove_orphaned_vulnerability_notes_batched_migration.rb
+++ b/db/post_migrate/20250304184254_queue_remove_orphaned_vulnerability_notes_batched_migration.rb
@@ -3,7 +3,7 @@
 class QueueRemoveOrphanedVulnerabilityNotesBatchedMigration < Gitlab::Database::Migration[2.2]
   milestone '17.10'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "RemoveOrphanedVulnerabilityNotesBatchedMigration"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20250304231739_finalize_hk_rerun_epic_dates_to_work_item_dates_sources_sync.rb b/db/post_migrate/20250304231739_finalize_hk_rerun_epic_dates_to_work_item_dates_sources_sync.rb
index 995ac625a9fc05..f96b0091a2b497 100644
--- a/db/post_migrate/20250304231739_finalize_hk_rerun_epic_dates_to_work_item_dates_sources_sync.rb
+++ b/db/post_migrate/20250304231739_finalize_hk_rerun_epic_dates_to_work_item_dates_sources_sync.rb
@@ -5,7 +5,7 @@ class FinalizeHkRerunEpicDatesToWorkItemDatesSourcesSync < Gitlab::Database::Mig
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250305135537_queue_backfill_finish_onboarding_for_group_saml.rb b/db/post_migrate/20250305135537_queue_backfill_finish_onboarding_for_group_saml.rb
index 75e693f13ec5b1..c9ad7f8d3ce703 100644
--- a/db/post_migrate/20250305135537_queue_backfill_finish_onboarding_for_group_saml.rb
+++ b/db/post_migrate/20250305135537_queue_backfill_finish_onboarding_for_group_saml.rb
@@ -3,7 +3,7 @@
 class QueueBackfillFinishOnboardingForGroupSaml < Gitlab::Database::Migration[2.2]
   milestone '17.10'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillFinishOnboardingForGroupSaml"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20250305213621_queue_backfill_finish_onboarding_for_enterprise_user.rb b/db/post_migrate/20250305213621_queue_backfill_finish_onboarding_for_enterprise_user.rb
index bf145e6b101b54..92d72a0a21b0ca 100644
--- a/db/post_migrate/20250305213621_queue_backfill_finish_onboarding_for_enterprise_user.rb
+++ b/db/post_migrate/20250305213621_queue_backfill_finish_onboarding_for_enterprise_user.rb
@@ -3,7 +3,7 @@
 class QueueBackfillFinishOnboardingForEnterpriseUser < Gitlab::Database::Migration[2.2]
   milestone '17.11'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillFinishOnboardingForEnterpriseUser"
   BATCH_SIZE = 3_000
diff --git a/db/post_migrate/20250307231515_finalize_hk_backfill_new_audit_event_tables.rb b/db/post_migrate/20250307231515_finalize_hk_backfill_new_audit_event_tables.rb
index fb5de441dfb21a..761fa19379d75b 100644
--- a/db/post_migrate/20250307231515_finalize_hk_backfill_new_audit_event_tables.rb
+++ b/db/post_migrate/20250307231515_finalize_hk_backfill_new_audit_event_tables.rb
@@ -5,7 +5,7 @@ class FinalizeHkBackfillNewAuditEventTables < Gitlab::Database::Migration[2.2]
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250310143706_queue_backfill_organization_id_on_fork_networks.rb b/db/post_migrate/20250310143706_queue_backfill_organization_id_on_fork_networks.rb
index ebf4bf07619097..04355175b6a969 100644
--- a/db/post_migrate/20250310143706_queue_backfill_organization_id_on_fork_networks.rb
+++ b/db/post_migrate/20250310143706_queue_backfill_organization_id_on_fork_networks.rb
@@ -3,7 +3,7 @@
 class QueueBackfillOrganizationIdOnForkNetworks < Gitlab::Database::Migration[2.2]
   milestone '17.11'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillOrganizationIdOnForkNetworks"
   BATCH_SIZE = 1000
diff --git a/db/post_migrate/20250310144538_queue_backfill_external_group_audit_event_destinations.rb b/db/post_migrate/20250310144538_queue_backfill_external_group_audit_event_destinations.rb
index 7246b5050449a3..fb1389fd44e49a 100644
--- a/db/post_migrate/20250310144538_queue_backfill_external_group_audit_event_destinations.rb
+++ b/db/post_migrate/20250310144538_queue_backfill_external_group_audit_event_destinations.rb
@@ -3,7 +3,7 @@
 class QueueBackfillExternalGroupAuditEventDestinations < Gitlab::Database::Migration[2.2]
   milestone '17.11'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillExternalGroupAuditEventDestinations"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20250310150446_queue_backfill_amazon_group_audit_event_destinations.rb b/db/post_migrate/20250310150446_queue_backfill_amazon_group_audit_event_destinations.rb
index 2bce0c82d2f7a3..070a7c44063e21 100644
--- a/db/post_migrate/20250310150446_queue_backfill_amazon_group_audit_event_destinations.rb
+++ b/db/post_migrate/20250310150446_queue_backfill_amazon_group_audit_event_destinations.rb
@@ -3,7 +3,7 @@
 class QueueBackfillAmazonGroupAuditEventDestinations < Gitlab::Database::Migration[2.2]
   milestone '17.11'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillAmazonGroupAuditEventDestinations"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20250310151216_queue_backfill_amazon_instance_audit_event_destinations.rb b/db/post_migrate/20250310151216_queue_backfill_amazon_instance_audit_event_destinations.rb
index bc3cd582b85a28..8d0744a0744478 100644
--- a/db/post_migrate/20250310151216_queue_backfill_amazon_instance_audit_event_destinations.rb
+++ b/db/post_migrate/20250310151216_queue_backfill_amazon_instance_audit_event_destinations.rb
@@ -3,7 +3,7 @@
 class QueueBackfillAmazonInstanceAuditEventDestinations < Gitlab::Database::Migration[2.2]
   milestone '17.11'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillAmazonInstanceAuditEventDestinations"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20250310155742_queue_backfill_google_instance_audit_event_destinations.rb b/db/post_migrate/20250310155742_queue_backfill_google_instance_audit_event_destinations.rb
index b616fb439f19ae..9613478d014479 100644
--- a/db/post_migrate/20250310155742_queue_backfill_google_instance_audit_event_destinations.rb
+++ b/db/post_migrate/20250310155742_queue_backfill_google_instance_audit_event_destinations.rb
@@ -3,7 +3,7 @@
 class QueueBackfillGoogleInstanceAuditEventDestinations < Gitlab::Database::Migration[2.2]
   milestone '17.11'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillGoogleInstanceAuditEventDestinations"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20250310161242_queue_backfill_external_instance_audit_event_destinations.rb b/db/post_migrate/20250310161242_queue_backfill_external_instance_audit_event_destinations.rb
index a4eabe2fad2a45..90d74f44d56d67 100644
--- a/db/post_migrate/20250310161242_queue_backfill_external_instance_audit_event_destinations.rb
+++ b/db/post_migrate/20250310161242_queue_backfill_external_instance_audit_event_destinations.rb
@@ -3,7 +3,7 @@
 class QueueBackfillExternalInstanceAuditEventDestinations < Gitlab::Database::Migration[2.2]
   milestone '17.10'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillExternalInstanceAuditEventDestinations"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20250310162554_queue_backfill_google_group_audit_event_destinations.rb b/db/post_migrate/20250310162554_queue_backfill_google_group_audit_event_destinations.rb
index 6a2660cb7f4513..59e66db5cc53d2 100644
--- a/db/post_migrate/20250310162554_queue_backfill_google_group_audit_event_destinations.rb
+++ b/db/post_migrate/20250310162554_queue_backfill_google_group_audit_event_destinations.rb
@@ -3,7 +3,7 @@
 class QueueBackfillGoogleGroupAuditEventDestinations < Gitlab::Database::Migration[2.2]
   milestone '17.11'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillGoogleGroupAuditEventDestinations"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20250310231646_finalize_hk_backfill_members_request_accepted_at.rb b/db/post_migrate/20250310231646_finalize_hk_backfill_members_request_accepted_at.rb
index c8cff2b4280471..cd69ec675104dd 100644
--- a/db/post_migrate/20250310231646_finalize_hk_backfill_members_request_accepted_at.rb
+++ b/db/post_migrate/20250310231646_finalize_hk_backfill_members_request_accepted_at.rb
@@ -5,7 +5,7 @@ class FinalizeHkBackfillMembersRequestAcceptedAt < Gitlab::Database::Migration[2
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250312151614_finalize_backfill_subscription_add_on_purchases_started_at.rb b/db/post_migrate/20250312151614_finalize_backfill_subscription_add_on_purchases_started_at.rb
index 1b31860c65b9ad..c5a410fe6e4642 100644
--- a/db/post_migrate/20250312151614_finalize_backfill_subscription_add_on_purchases_started_at.rb
+++ b/db/post_migrate/20250312151614_finalize_backfill_subscription_add_on_purchases_started_at.rb
@@ -3,7 +3,7 @@
 class FinalizeBackfillSubscriptionAddOnPurchasesStartedAt < Gitlab::Database::Migration[2.2]
   milestone '17.10'
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   TABLE_NAME = :subscription_add_on_purchases
   COLUMN_NAME = :id
diff --git a/db/post_migrate/20250314113948_remove_replicas_with_evicted_indices.rb b/db/post_migrate/20250314113948_remove_replicas_with_evicted_indices.rb
index cb9948400696f4..9bdf7d8b4d8066 100644
--- a/db/post_migrate/20250314113948_remove_replicas_with_evicted_indices.rb
+++ b/db/post_migrate/20250314113948_remove_replicas_with_evicted_indices.rb
@@ -2,7 +2,7 @@
 
 class RemoveReplicasWithEvictedIndices < Gitlab::Database::Migration[2.2]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.10'
   BATCH_SIZE = 500
   EVICTED_STATE = 225
diff --git a/db/post_migrate/20250317004525_remove_leftover_routes.rb b/db/post_migrate/20250317004525_remove_leftover_routes.rb
index 075d24d877d59f..9836488e09c968 100644
--- a/db/post_migrate/20250317004525_remove_leftover_routes.rb
+++ b/db/post_migrate/20250317004525_remove_leftover_routes.rb
@@ -2,7 +2,7 @@
 
 class RemoveLeftoverRoutes < Gitlab::Database::Migration[2.2]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.11'
 
   class DeletedRecord < MigrationRecord
diff --git a/db/post_migrate/20250317021451_migrate_old_disabled_web_hook_to_new_state.rb b/db/post_migrate/20250317021451_migrate_old_disabled_web_hook_to_new_state.rb
index 6679f25a868ba2..544a0e65a23aeb 100644
--- a/db/post_migrate/20250317021451_migrate_old_disabled_web_hook_to_new_state.rb
+++ b/db/post_migrate/20250317021451_migrate_old_disabled_web_hook_to_new_state.rb
@@ -11,7 +11,7 @@ class MigrateOldDisabledWebHookToNewState < Gitlab::Database::Migration[2.2]
   NEW_BACKOFF_COUNT = 37 # NEW_RECENT_FAILURES - WebHooks::AutoDisabling::FAILURE_THRESHOLD
 
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.11'
 
   def up
diff --git a/db/post_migrate/20250317122642_fix_secureflag_description.rb b/db/post_migrate/20250317122642_fix_secureflag_description.rb
index 2a3c719ae5a1b5..609f850ab76c59 100644
--- a/db/post_migrate/20250317122642_fix_secureflag_description.rb
+++ b/db/post_migrate/20250317122642_fix_secureflag_description.rb
@@ -2,7 +2,7 @@
 
 class FixSecureflagDescription < Gitlab::Database::Migration[2.2]
   milestone '17.11'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     execute <<~SQL
diff --git a/db/post_migrate/20250317153121_backfill_merge_requests_id_columns_bigint.rb b/db/post_migrate/20250317153121_backfill_merge_requests_id_columns_bigint.rb
index 7b1df6203eafb4..c8d669add1d656 100644
--- a/db/post_migrate/20250317153121_backfill_merge_requests_id_columns_bigint.rb
+++ b/db/post_migrate/20250317153121_backfill_merge_requests_id_columns_bigint.rb
@@ -2,7 +2,7 @@
 
 class BackfillMergeRequestsIdColumnsBigint < Gitlab::Database::Migration[2.2]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.11'
 
   TABLE = :merge_requests
diff --git a/db/post_migrate/20250317222744_queue_backfill_description_versions_namespace.rb b/db/post_migrate/20250317222744_queue_backfill_description_versions_namespace.rb
index 2216f3f0bec0de..5f0ed153d78993 100644
--- a/db/post_migrate/20250317222744_queue_backfill_description_versions_namespace.rb
+++ b/db/post_migrate/20250317222744_queue_backfill_description_versions_namespace.rb
@@ -3,7 +3,7 @@
 class QueueBackfillDescriptionVersionsNamespace < Gitlab::Database::Migration[2.2]
   milestone '17.11'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillDescriptionVersionsNamespace"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20250318231451_finalize_hk_create_jira_cloud_app_integration_for_jira_connect_subscription.rb b/db/post_migrate/20250318231451_finalize_hk_create_jira_cloud_app_integration_for_jira_connect_subscription.rb
index 07b7307c383b3a..8a552e4d43563e 100644
--- a/db/post_migrate/20250318231451_finalize_hk_create_jira_cloud_app_integration_for_jira_connect_subscription.rb
+++ b/db/post_migrate/20250318231451_finalize_hk_create_jira_cloud_app_integration_for_jira_connect_subscription.rb
@@ -5,7 +5,7 @@ class FinalizeHkCreateJiraCloudAppIntegrationForJiraConnectSubscription < Gitlab
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250319204252_queue_backfill_approval_policy_rule_ids.rb b/db/post_migrate/20250319204252_queue_backfill_approval_policy_rule_ids.rb
index 7e4c23bea21964..1834227b1d1e90 100644
--- a/db/post_migrate/20250319204252_queue_backfill_approval_policy_rule_ids.rb
+++ b/db/post_migrate/20250319204252_queue_backfill_approval_policy_rule_ids.rb
@@ -3,7 +3,7 @@
 class QueueBackfillApprovalPolicyRuleIds < Gitlab::Database::Migration[2.2]
   milestone '17.11'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillApprovalPolicyRuleIds"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20250320110734_backfill_pkgs_terraform_modules_metadata_for_semver_bigint_conversion.rb b/db/post_migrate/20250320110734_backfill_pkgs_terraform_modules_metadata_for_semver_bigint_conversion.rb
index ced4a7c4086e75..14254d3ef8c9a7 100644
--- a/db/post_migrate/20250320110734_backfill_pkgs_terraform_modules_metadata_for_semver_bigint_conversion.rb
+++ b/db/post_migrate/20250320110734_backfill_pkgs_terraform_modules_metadata_for_semver_bigint_conversion.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class BackfillPkgsTerraformModulesMetadataForSemverBigintConversion < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.11'
 
   TABLE = :packages_terraform_module_metadata
diff --git a/db/post_migrate/20250320142149_downgrade_organization_owners.rb b/db/post_migrate/20250320142149_downgrade_organization_owners.rb
index e00b59dccc2a38..7675c133405bc5 100644
--- a/db/post_migrate/20250320142149_downgrade_organization_owners.rb
+++ b/db/post_migrate/20250320142149_downgrade_organization_owners.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class DowngradeOrganizationOwners < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.11'
 
   class User < MigrationRecord
diff --git a/db/post_migrate/20250325173454_backfill_merge_request_diffs_id_columns_bigint.rb b/db/post_migrate/20250325173454_backfill_merge_request_diffs_id_columns_bigint.rb
index 8216cf2f5e8d3e..8b27eec4f2ad16 100644
--- a/db/post_migrate/20250325173454_backfill_merge_request_diffs_id_columns_bigint.rb
+++ b/db/post_migrate/20250325173454_backfill_merge_request_diffs_id_columns_bigint.rb
@@ -2,7 +2,7 @@
 
 class BackfillMergeRequestDiffsIdColumnsBigint < Gitlab::Database::Migration[2.2]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.11'
 
   TABLE = :merge_request_diffs
diff --git a/db/post_migrate/20250326034951_ensure_gitlab_product_usage_data_enabled_in_service_ping_settings.rb b/db/post_migrate/20250326034951_ensure_gitlab_product_usage_data_enabled_in_service_ping_settings.rb
index eb73155e603d98..484bdb966fc1ab 100644
--- a/db/post_migrate/20250326034951_ensure_gitlab_product_usage_data_enabled_in_service_ping_settings.rb
+++ b/db/post_migrate/20250326034951_ensure_gitlab_product_usage_data_enabled_in_service_ping_settings.rb
@@ -3,7 +3,7 @@
 class EnsureGitlabProductUsageDataEnabledInServicePingSettings < Gitlab::Database::Migration[2.2]
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '17.11'
 
diff --git a/db/post_migrate/20250328170017_test_env_update_work_item_types_correct_id.rb b/db/post_migrate/20250328170017_test_env_update_work_item_types_correct_id.rb
index b5a7347762336e..105ce0cb79b724 100644
--- a/db/post_migrate/20250328170017_test_env_update_work_item_types_correct_id.rb
+++ b/db/post_migrate/20250328170017_test_env_update_work_item_types_correct_id.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class TestEnvUpdateWorkItemTypesCorrectId < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '17.11'
 
diff --git a/db/post_migrate/20250401231627_finalize_hk_backfill_personal_access_token_seven_days_notification_sent.rb b/db/post_migrate/20250401231627_finalize_hk_backfill_personal_access_token_seven_days_notification_sent.rb
index bc3c03d905cc51..4ac209cf06e6ee 100644
--- a/db/post_migrate/20250401231627_finalize_hk_backfill_personal_access_token_seven_days_notification_sent.rb
+++ b/db/post_migrate/20250401231627_finalize_hk_backfill_personal_access_token_seven_days_notification_sent.rb
@@ -5,7 +5,7 @@ class FinalizeHkBackfillPersonalAccessTokenSevenDaysNotificationSent < Gitlab::D
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250403053604_finalize_backfill_vs_code_settings_settings_context_hash.rb b/db/post_migrate/20250403053604_finalize_backfill_vs_code_settings_settings_context_hash.rb
index b4cdda3dd4f726..58c56633f8a61d 100644
--- a/db/post_migrate/20250403053604_finalize_backfill_vs_code_settings_settings_context_hash.rb
+++ b/db/post_migrate/20250403053604_finalize_backfill_vs_code_settings_settings_context_hash.rb
@@ -3,7 +3,7 @@
 class FinalizeBackfillVsCodeSettingsSettingsContextHash < Gitlab::Database::Migration[2.2]
   MIGRATION_NAME = 'BackfillVsCodeSettingsSettingsContextHash'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
 
   milestone '18.0'
diff --git a/db/post_migrate/20250403155636_queue_backfill_external_group_audit_event_destinations_fixed.rb b/db/post_migrate/20250403155636_queue_backfill_external_group_audit_event_destinations_fixed.rb
index c82c5467b6978f..26bac82d072a5d 100644
--- a/db/post_migrate/20250403155636_queue_backfill_external_group_audit_event_destinations_fixed.rb
+++ b/db/post_migrate/20250403155636_queue_backfill_external_group_audit_event_destinations_fixed.rb
@@ -3,7 +3,7 @@
 class QueueBackfillExternalGroupAuditEventDestinationsFixed < Gitlab::Database::Migration[2.2]
   milestone '18.0'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   ORIGINAL_MIGRATION = "BackfillExternalGroupAuditEventDestinations"
   MIGRATION = "BackfillExternalGroupAuditEventDestinationsFixed"
diff --git a/db/post_migrate/20250403155703_queue_backfill_external_instance_audit_event_destinations_fixed.rb b/db/post_migrate/20250403155703_queue_backfill_external_instance_audit_event_destinations_fixed.rb
index 1504740d9f763f..abf019aae7c33d 100644
--- a/db/post_migrate/20250403155703_queue_backfill_external_instance_audit_event_destinations_fixed.rb
+++ b/db/post_migrate/20250403155703_queue_backfill_external_instance_audit_event_destinations_fixed.rb
@@ -3,7 +3,7 @@
 class QueueBackfillExternalInstanceAuditEventDestinationsFixed < Gitlab::Database::Migration[2.2]
   milestone '18.0'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   ORIGINAL_MIGRATION = "BackfillExternalInstanceAuditEventDestinations"
   MIGRATION = "BackfillExternalInstanceAuditEventDestinationsFixed"
diff --git a/db/post_migrate/20250403155730_queue_backfill_amazon_group_audit_event_destinations_fixed.rb b/db/post_migrate/20250403155730_queue_backfill_amazon_group_audit_event_destinations_fixed.rb
index b31f5022f49ba0..cf4b84729a77a8 100644
--- a/db/post_migrate/20250403155730_queue_backfill_amazon_group_audit_event_destinations_fixed.rb
+++ b/db/post_migrate/20250403155730_queue_backfill_amazon_group_audit_event_destinations_fixed.rb
@@ -3,7 +3,7 @@
 class QueueBackfillAmazonGroupAuditEventDestinationsFixed < Gitlab::Database::Migration[2.2]
   milestone '18.0'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   ORIGINAL_MIGRATION = "BackfillAmazonGroupAuditEventDestinations"
   MIGRATION = "BackfillAmazonGroupAuditEventDestinationsFixed"
diff --git a/db/post_migrate/20250403155743_queue_backfill_amazon_instance_audit_event_destinations_fixed.rb b/db/post_migrate/20250403155743_queue_backfill_amazon_instance_audit_event_destinations_fixed.rb
index 23b91d2ae00d23..7204afd5bec4fb 100644
--- a/db/post_migrate/20250403155743_queue_backfill_amazon_instance_audit_event_destinations_fixed.rb
+++ b/db/post_migrate/20250403155743_queue_backfill_amazon_instance_audit_event_destinations_fixed.rb
@@ -3,7 +3,7 @@
 class QueueBackfillAmazonInstanceAuditEventDestinationsFixed < Gitlab::Database::Migration[2.2]
   milestone '18.0'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   ORIGINAL_MIGRATION = "BackfillAmazonInstanceAuditEventDestinations"
   MIGRATION = "BackfillAmazonInstanceAuditEventDestinationsFixed"
diff --git a/db/post_migrate/20250403155756_queue_backfill_google_group_audit_event_destinations_fixed.rb b/db/post_migrate/20250403155756_queue_backfill_google_group_audit_event_destinations_fixed.rb
index 1f758cc87676f7..74dac3f162db72 100644
--- a/db/post_migrate/20250403155756_queue_backfill_google_group_audit_event_destinations_fixed.rb
+++ b/db/post_migrate/20250403155756_queue_backfill_google_group_audit_event_destinations_fixed.rb
@@ -3,7 +3,7 @@
 class QueueBackfillGoogleGroupAuditEventDestinationsFixed < Gitlab::Database::Migration[2.2]
   milestone '18.0'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   ORIGINAL_MIGRATION = "BackfillGoogleGroupAuditEventDestinations"
   MIGRATION = "BackfillGoogleGroupAuditEventDestinationsFixed"
diff --git a/db/post_migrate/20250403155815_queue_backfill_google_instance_audit_event_destinations_fixed.rb b/db/post_migrate/20250403155815_queue_backfill_google_instance_audit_event_destinations_fixed.rb
index e67f79de8bbc0b..db86e6a789f717 100644
--- a/db/post_migrate/20250403155815_queue_backfill_google_instance_audit_event_destinations_fixed.rb
+++ b/db/post_migrate/20250403155815_queue_backfill_google_instance_audit_event_destinations_fixed.rb
@@ -3,7 +3,7 @@
 class QueueBackfillGoogleInstanceAuditEventDestinationsFixed < Gitlab::Database::Migration[2.2]
   milestone '18.0'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   ORIGINAL_MIGRATION = "BackfillGoogleInstanceAuditEventDestinations"
   MIGRATION = "BackfillGoogleInstanceAuditEventDestinationsFixed"
diff --git a/db/post_migrate/20250403232225_finalize_hk_backfill_free_shared_runners_minutes_limit.rb b/db/post_migrate/20250403232225_finalize_hk_backfill_free_shared_runners_minutes_limit.rb
index caf8f7986e3f7a..92899631352887 100644
--- a/db/post_migrate/20250403232225_finalize_hk_backfill_free_shared_runners_minutes_limit.rb
+++ b/db/post_migrate/20250403232225_finalize_hk_backfill_free_shared_runners_minutes_limit.rb
@@ -5,7 +5,7 @@ class FinalizeHkBackfillFreeSharedRunnersMinutesLimit < Gitlab::Database::Migrat
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250404130722_queue_backfill_lists_sharding_key.rb b/db/post_migrate/20250404130722_queue_backfill_lists_sharding_key.rb
index dc8d7a12481cc5..baba5435db032b 100644
--- a/db/post_migrate/20250404130722_queue_backfill_lists_sharding_key.rb
+++ b/db/post_migrate/20250404130722_queue_backfill_lists_sharding_key.rb
@@ -3,7 +3,7 @@
 class QueueBackfillListsShardingKey < Gitlab::Database::Migration[2.2]
   milestone '17.11'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillListsShardingKey"
   BATCH_SIZE = 10000
diff --git a/db/post_migrate/20250404151331_backfill_ci_job_live_trace_application_setting.rb b/db/post_migrate/20250404151331_backfill_ci_job_live_trace_application_setting.rb
index bd212a49838618..2638b6ccedc7dc 100644
--- a/db/post_migrate/20250404151331_backfill_ci_job_live_trace_application_setting.rb
+++ b/db/post_migrate/20250404151331_backfill_ci_job_live_trace_application_setting.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class BackfillCiJobLiveTraceApplicationSetting < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '17.11'
 
diff --git a/db/post_migrate/20250408161158_remove_sprints_without_group.rb b/db/post_migrate/20250408161158_remove_sprints_without_group.rb
index 1ae7c70797b3be..f86b6b90afc288 100644
--- a/db/post_migrate/20250408161158_remove_sprints_without_group.rb
+++ b/db/post_migrate/20250408161158_remove_sprints_without_group.rb
@@ -4,7 +4,7 @@ class RemoveSprintsWithoutGroup < Gitlab::Database::Migration[2.2]
   BATCH_SIZE = 100
 
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.11'
 
   def up
diff --git a/db/post_migrate/20250408163603_remove_resource_iteration_events_without_iteration.rb b/db/post_migrate/20250408163603_remove_resource_iteration_events_without_iteration.rb
index 8819dc88aacea9..aef1e4374ee22e 100644
--- a/db/post_migrate/20250408163603_remove_resource_iteration_events_without_iteration.rb
+++ b/db/post_migrate/20250408163603_remove_resource_iteration_events_without_iteration.rb
@@ -4,7 +4,7 @@ class RemoveResourceIterationEventsWithoutIteration < Gitlab::Database::Migratio
   BATCH_SIZE = 100
 
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '17.11'
 
   def up
diff --git a/db/post_migrate/20250409141444_queue_fix_string_config_hashes_group_streaming_destinations.rb b/db/post_migrate/20250409141444_queue_fix_string_config_hashes_group_streaming_destinations.rb
index 5b29b00fa766ec..edc3d1f5820b2e 100644
--- a/db/post_migrate/20250409141444_queue_fix_string_config_hashes_group_streaming_destinations.rb
+++ b/db/post_migrate/20250409141444_queue_fix_string_config_hashes_group_streaming_destinations.rb
@@ -3,7 +3,7 @@
 class QueueFixStringConfigHashesGroupStreamingDestinations < Gitlab::Database::Migration[2.2]
   milestone '18.0'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "FixStringConfigHashesGroupStreamingDestinations"
   BATCH_SIZE = 100
diff --git a/db/post_migrate/20250409141503_queue_fix_string_config_hashes_instance_streaming_destinations.rb b/db/post_migrate/20250409141503_queue_fix_string_config_hashes_instance_streaming_destinations.rb
index afe7005b65f51b..70c153fe0847c7 100644
--- a/db/post_migrate/20250409141503_queue_fix_string_config_hashes_instance_streaming_destinations.rb
+++ b/db/post_migrate/20250409141503_queue_fix_string_config_hashes_instance_streaming_destinations.rb
@@ -3,7 +3,7 @@
 class QueueFixStringConfigHashesInstanceStreamingDestinations < Gitlab::Database::Migration[2.2]
   milestone '18.0'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "FixStringConfigHashesInstanceStreamingDestinations"
   BATCH_SIZE = 100
diff --git a/db/post_migrate/20250409172701_queue_backfill_resource_iteration_events_namespace_id.rb b/db/post_migrate/20250409172701_queue_backfill_resource_iteration_events_namespace_id.rb
index d358caa34e6ca3..ea3f1e12a90593 100644
--- a/db/post_migrate/20250409172701_queue_backfill_resource_iteration_events_namespace_id.rb
+++ b/db/post_migrate/20250409172701_queue_backfill_resource_iteration_events_namespace_id.rb
@@ -3,7 +3,7 @@
 class QueueBackfillResourceIterationEventsNamespaceId < Gitlab::Database::Migration[2.2]
   milestone '17.11'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillResourceIterationEventsNamespaceId"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20250410130252_finalize_backfill_finish_onboarding_for_enterprise_user.rb b/db/post_migrate/20250410130252_finalize_backfill_finish_onboarding_for_enterprise_user.rb
index bad4084d2a5d39..a2edd29d59e72a 100644
--- a/db/post_migrate/20250410130252_finalize_backfill_finish_onboarding_for_enterprise_user.rb
+++ b/db/post_migrate/20250410130252_finalize_backfill_finish_onboarding_for_enterprise_user.rb
@@ -6,7 +6,7 @@ class FinalizeBackfillFinishOnboardingForEnterpriseUser < Gitlab::Database::Migr
   MIGRATION = 'BackfillFinishOnboardingForEnterpriseUser'
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250410134740_finalize_backfill_finish_onboarding_for_group_saml.rb b/db/post_migrate/20250410134740_finalize_backfill_finish_onboarding_for_group_saml.rb
index 5e2abe0f7e0fc8..1a0e76a6fee487 100644
--- a/db/post_migrate/20250410134740_finalize_backfill_finish_onboarding_for_group_saml.rb
+++ b/db/post_migrate/20250410134740_finalize_backfill_finish_onboarding_for_group_saml.rb
@@ -6,7 +6,7 @@ class FinalizeBackfillFinishOnboardingForGroupSaml < Gitlab::Database::Migration
   MIGRATION = 'BackfillFinishOnboardingForGroupSaml'
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250413101516_add_incident_to_related_links_restrictions.rb b/db/post_migrate/20250413101516_add_incident_to_related_links_restrictions.rb
index a8be2f40c9a5f6..963117ab3b8a2e 100644
--- a/db/post_migrate/20250413101516_add_incident_to_related_links_restrictions.rb
+++ b/db/post_migrate/20250413101516_add_incident_to_related_links_restrictions.rb
@@ -20,7 +20,7 @@ class RelatedLinkRestriction < MigrationRecord
     self.table_name = 'work_item_related_link_restrictions'
   end
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
 
   def up
diff --git a/db/post_migrate/20250415100300_finalize_backfill_organization_id_on_fork_networks.rb b/db/post_migrate/20250415100300_finalize_backfill_organization_id_on_fork_networks.rb
index 32e870bf93903e..f17b3e34443caf 100644
--- a/db/post_migrate/20250415100300_finalize_backfill_organization_id_on_fork_networks.rb
+++ b/db/post_migrate/20250415100300_finalize_backfill_organization_id_on_fork_networks.rb
@@ -4,7 +4,7 @@ class FinalizeBackfillOrganizationIdOnForkNetworks < Gitlab::Database::Migration
   milestone '18.0'
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250415130342_finalize_terraform_module_metadata_semver_patch_bigint_conversion.rb b/db/post_migrate/20250415130342_finalize_terraform_module_metadata_semver_patch_bigint_conversion.rb
index 5318fe1bda2ee8..c25c34ecf61c84 100644
--- a/db/post_migrate/20250415130342_finalize_terraform_module_metadata_semver_patch_bigint_conversion.rb
+++ b/db/post_migrate/20250415130342_finalize_terraform_module_metadata_semver_patch_bigint_conversion.rb
@@ -4,7 +4,7 @@ class FinalizeTerraformModuleMetadataSemverPatchBigintConversion < Gitlab::Datab
   disable_ddl_transaction!
   milestone '18.0'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_backfill_conversion_of_integer_to_bigint_is_finished(
diff --git a/db/post_migrate/20250415164706_queue_delete_twitter_identities.rb b/db/post_migrate/20250415164706_queue_delete_twitter_identities.rb
index 9f616f6c1e6544..4435e25be64acb 100644
--- a/db/post_migrate/20250415164706_queue_delete_twitter_identities.rb
+++ b/db/post_migrate/20250415164706_queue_delete_twitter_identities.rb
@@ -5,7 +5,7 @@ class QueueDeleteTwitterIdentities < Gitlab::Database::Migration[2.2]
 
   disable_ddl_transaction!
   milestone '18.0'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     queue_batched_background_migration(
diff --git a/db/post_migrate/20250415203448_queue_update_require_dpop_for_manage_api_endpoints_to_false.rb b/db/post_migrate/20250415203448_queue_update_require_dpop_for_manage_api_endpoints_to_false.rb
index f8fcaf12359892..b2f9506dedfc6b 100644
--- a/db/post_migrate/20250415203448_queue_update_require_dpop_for_manage_api_endpoints_to_false.rb
+++ b/db/post_migrate/20250415203448_queue_update_require_dpop_for_manage_api_endpoints_to_false.rb
@@ -3,7 +3,7 @@
 class QueueUpdateRequireDpopForManageApiEndpointsToFalse < Gitlab::Database::Migration[2.2]
   milestone '18.0'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = 'UpdateRequireDpopForManageApiEndpointsToFalse'
 
diff --git a/db/post_migrate/20250416005514_finalize_split_microsoft_applications_table.rb b/db/post_migrate/20250416005514_finalize_split_microsoft_applications_table.rb
index af722c3e31edf1..1ca4e1bc09c416 100644
--- a/db/post_migrate/20250416005514_finalize_split_microsoft_applications_table.rb
+++ b/db/post_migrate/20250416005514_finalize_split_microsoft_applications_table.rb
@@ -5,7 +5,7 @@ class FinalizeSplitMicrosoftApplicationsTable < Gitlab::Database::Migration[2.2]
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "SplitMicrosoftApplicationsTable"
 
diff --git a/db/post_migrate/20250416222523_backfill_git_push_pipeline_limit_application_setting.rb b/db/post_migrate/20250416222523_backfill_git_push_pipeline_limit_application_setting.rb
index 85b1f73751d0d5..ba6cb4191360e1 100644
--- a/db/post_migrate/20250416222523_backfill_git_push_pipeline_limit_application_setting.rb
+++ b/db/post_migrate/20250416222523_backfill_git_push_pipeline_limit_application_setting.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class BackfillGitPushPipelineLimitApplicationSetting < Gitlab::Database::Migration[2.2]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '18.0'
 
diff --git a/db/post_migrate/20250418164805_enable_ci_job_token_allowlist_setting.rb b/db/post_migrate/20250418164805_enable_ci_job_token_allowlist_setting.rb
index 81c02c7b8d3ca4..76b34e5de40169 100644
--- a/db/post_migrate/20250418164805_enable_ci_job_token_allowlist_setting.rb
+++ b/db/post_migrate/20250418164805_enable_ci_job_token_allowlist_setting.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class EnableCiJobTokenAllowlistSetting < Gitlab::Database::Migration[2.3]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '18.0'
 
diff --git a/db/post_migrate/20250422093734_outdate_namespace_descendants_cache.rb b/db/post_migrate/20250422093734_outdate_namespace_descendants_cache.rb
index 9b346a4743dafc..1e6a7b33b66d7c 100644
--- a/db/post_migrate/20250422093734_outdate_namespace_descendants_cache.rb
+++ b/db/post_migrate/20250422093734_outdate_namespace_descendants_cache.rb
@@ -3,7 +3,7 @@
 class OutdateNamespaceDescendantsCache < Gitlab::Database::Migration[2.2]
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '18.0'
 
diff --git a/db/post_migrate/20250422103638_queue_backfill_compliance_framework_security_policy_id.rb b/db/post_migrate/20250422103638_queue_backfill_compliance_framework_security_policy_id.rb
index 97ed1ef3615c3a..f4f59967b591d5 100644
--- a/db/post_migrate/20250422103638_queue_backfill_compliance_framework_security_policy_id.rb
+++ b/db/post_migrate/20250422103638_queue_backfill_compliance_framework_security_policy_id.rb
@@ -3,7 +3,7 @@
 class QueueBackfillComplianceFrameworkSecurityPolicyId < Gitlab::Database::Migration[2.2]
   milestone '18.0'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillComplianceFrameworkSecurityPolicyId"
   BATCH_SIZE = 200
diff --git a/db/post_migrate/20250429100831_finalize_backfill_pipeline_execution_policy_config_links.rb b/db/post_migrate/20250429100831_finalize_backfill_pipeline_execution_policy_config_links.rb
index 75d17ecce7ca2b..d2e7c954cf71f9 100644
--- a/db/post_migrate/20250429100831_finalize_backfill_pipeline_execution_policy_config_links.rb
+++ b/db/post_migrate/20250429100831_finalize_backfill_pipeline_execution_policy_config_links.rb
@@ -5,7 +5,7 @@ class FinalizeBackfillPipelineExecutionPolicyConfigLinks < Gitlab::Database::Mig
 
   milestone '18.0'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250429171748_queue_fix_incomplete_external_audit_destinations.rb b/db/post_migrate/20250429171748_queue_fix_incomplete_external_audit_destinations.rb
index c273692bf2484b..c4d69723afd766 100644
--- a/db/post_migrate/20250429171748_queue_fix_incomplete_external_audit_destinations.rb
+++ b/db/post_migrate/20250429171748_queue_fix_incomplete_external_audit_destinations.rb
@@ -3,7 +3,7 @@
 class QueueFixIncompleteExternalAuditDestinations < Gitlab::Database::Migration[2.3]
   milestone '18.1'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "FixIncompleteExternalAuditDestinations"
   BATCH_SIZE = 100
diff --git a/db/post_migrate/20250429171801_queue_fix_incomplete_instance_external_audit_destinations.rb b/db/post_migrate/20250429171801_queue_fix_incomplete_instance_external_audit_destinations.rb
index 680d5d7c6193f6..de04b048adb483 100644
--- a/db/post_migrate/20250429171801_queue_fix_incomplete_instance_external_audit_destinations.rb
+++ b/db/post_migrate/20250429171801_queue_fix_incomplete_instance_external_audit_destinations.rb
@@ -3,7 +3,7 @@
 class QueueFixIncompleteInstanceExternalAuditDestinations < Gitlab::Database::Migration[2.3]
   milestone '18.1'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "FixIncompleteInstanceExternalAuditDestinations"
   BATCH_SIZE = 100
diff --git a/db/post_migrate/20250502055316_migrate_anonymous_searches_flag_to_application_settings.rb b/db/post_migrate/20250502055316_migrate_anonymous_searches_flag_to_application_settings.rb
index fcabd4ab6343f3..949f9f55eabbfc 100644
--- a/db/post_migrate/20250502055316_migrate_anonymous_searches_flag_to_application_settings.rb
+++ b/db/post_migrate/20250502055316_migrate_anonymous_searches_flag_to_application_settings.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class MigrateAnonymousSearchesFlagToApplicationSettings < Gitlab::Database::Migration[2.3]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '18.0'
 
   class ApplicationSetting < MigrationRecord
diff --git a/db/post_migrate/20250504231421_finalize_hk_backfill_issue_link_id_on_related_epic_links.rb b/db/post_migrate/20250504231421_finalize_hk_backfill_issue_link_id_on_related_epic_links.rb
index 577d46c720b81f..b4f75a1dc7aa2f 100644
--- a/db/post_migrate/20250504231421_finalize_hk_backfill_issue_link_id_on_related_epic_links.rb
+++ b/db/post_migrate/20250504231421_finalize_hk_backfill_issue_link_id_on_related_epic_links.rb
@@ -5,7 +5,7 @@ class FinalizeHkBackfillIssueLinkIdOnRelatedEpicLinks < Gitlab::Database::Migrat
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250505171359_queue_backfill_licenses_outside_spdx_catalogue.rb b/db/post_migrate/20250505171359_queue_backfill_licenses_outside_spdx_catalogue.rb
index 97f2ca342fbf82..98070bce91f056 100644
--- a/db/post_migrate/20250505171359_queue_backfill_licenses_outside_spdx_catalogue.rb
+++ b/db/post_migrate/20250505171359_queue_backfill_licenses_outside_spdx_catalogue.rb
@@ -3,7 +3,7 @@
 class QueueBackfillLicensesOutsideSpdxCatalogue < Gitlab::Database::Migration[2.3]
   milestone '18.1'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillLicensesOutsideSpdxCatalogue"
   BATCH_SIZE = 1000
diff --git a/db/post_migrate/20250505222744_copy_global_push_rule_into_organization_push_rules.rb b/db/post_migrate/20250505222744_copy_global_push_rule_into_organization_push_rules.rb
index c9f2bb9bc92077..14421ba9e13b06 100644
--- a/db/post_migrate/20250505222744_copy_global_push_rule_into_organization_push_rules.rb
+++ b/db/post_migrate/20250505222744_copy_global_push_rule_into_organization_push_rules.rb
@@ -5,7 +5,7 @@ class CopyGlobalPushRuleIntoOrganizationPushRules < Gitlab::Database::Migration[
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     return if organization_push_rules_exist?
diff --git a/db/post_migrate/20250507154107_update_partitioning_app_settings.rb b/db/post_migrate/20250507154107_update_partitioning_app_settings.rb
index b2963af47656e6..cc626e6aad6f35 100644
--- a/db/post_migrate/20250507154107_update_partitioning_app_settings.rb
+++ b/db/post_migrate/20250507154107_update_partitioning_app_settings.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class UpdatePartitioningAppSettings < Gitlab::Database::Migration[2.3]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '18.0'
 
   def up
diff --git a/db/post_migrate/20250508132304_finalize_mark_duplicate_maven_packages_for_destruction.rb b/db/post_migrate/20250508132304_finalize_mark_duplicate_maven_packages_for_destruction.rb
index 0f7b063e624b28..c14a3d0adedd3b 100644
--- a/db/post_migrate/20250508132304_finalize_mark_duplicate_maven_packages_for_destruction.rb
+++ b/db/post_migrate/20250508132304_finalize_mark_duplicate_maven_packages_for_destruction.rb
@@ -2,7 +2,7 @@
 
 class FinalizeMarkDuplicateMavenPackagesForDestruction < Gitlab::Database::Migration[2.3]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '18.0'
 
   def up
diff --git a/db/post_migrate/20250514055316_migrate_anonymous_searches_flag_to_application_settings_v2.rb b/db/post_migrate/20250514055316_migrate_anonymous_searches_flag_to_application_settings_v2.rb
index aee30ebd0ed748..6d871c42c8971e 100644
--- a/db/post_migrate/20250514055316_migrate_anonymous_searches_flag_to_application_settings_v2.rb
+++ b/db/post_migrate/20250514055316_migrate_anonymous_searches_flag_to_application_settings_v2.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class MigrateAnonymousSearchesFlagToApplicationSettingsV2 < Gitlab::Database::Migration[2.3]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '18.1'
 
   def up
diff --git a/db/post_migrate/20250517194243_queue_fix_non_existing_timelog_users.rb b/db/post_migrate/20250517194243_queue_fix_non_existing_timelog_users.rb
index 302c4b9638a988..61ec547177d947 100644
--- a/db/post_migrate/20250517194243_queue_fix_non_existing_timelog_users.rb
+++ b/db/post_migrate/20250517194243_queue_fix_non_existing_timelog_users.rb
@@ -3,7 +3,7 @@
 class QueueFixNonExistingTimelogUsers < Gitlab::Database::Migration[2.3]
   milestone '18.1'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "FixNonExistingTimelogUsers"
   BATCH_SIZE = 1_000
diff --git a/db/post_migrate/20250519120927_finalize_backfill_description_versions_namespace.rb b/db/post_migrate/20250519120927_finalize_backfill_description_versions_namespace.rb
index 00b1db72be7ec9..29d4314cdb779d 100644
--- a/db/post_migrate/20250519120927_finalize_backfill_description_versions_namespace.rb
+++ b/db/post_migrate/20250519120927_finalize_backfill_description_versions_namespace.rb
@@ -4,7 +4,7 @@ class FinalizeBackfillDescriptionVersionsNamespace < Gitlab::Database::Migration
   MIGRATION = "BackfillDescriptionVersionsNamespace"
 
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '18.1'
 
   def up
diff --git a/db/post_migrate/20250519141223_finalize_backfill_lists_sharding_key.rb b/db/post_migrate/20250519141223_finalize_backfill_lists_sharding_key.rb
index 8dd87f1f5f126d..ceb1251976afb8 100644
--- a/db/post_migrate/20250519141223_finalize_backfill_lists_sharding_key.rb
+++ b/db/post_migrate/20250519141223_finalize_backfill_lists_sharding_key.rb
@@ -4,7 +4,7 @@ class FinalizeBackfillListsShardingKey < Gitlab::Database::Migration[2.3]
   MIGRATION = 'BackfillListsShardingKey'
 
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '18.1'
 
   def up
diff --git a/db/post_migrate/20250522141513_finalize_backfill_resource_milestone_events_namespace.rb b/db/post_migrate/20250522141513_finalize_backfill_resource_milestone_events_namespace.rb
index 1200a0bcfc9ab9..af2fb76f35823a 100644
--- a/db/post_migrate/20250522141513_finalize_backfill_resource_milestone_events_namespace.rb
+++ b/db/post_migrate/20250522141513_finalize_backfill_resource_milestone_events_namespace.rb
@@ -4,7 +4,7 @@ class FinalizeBackfillResourceMilestoneEventsNamespace < Gitlab::Database::Migra
   MIGRATION = "BackfillResourceMilestoneEventsNamespace"
 
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '18.1'
 
   def up
diff --git a/db/post_migrate/20250526065102_queue_backfill_placeholder_users_details_from_source_users.rb b/db/post_migrate/20250526065102_queue_backfill_placeholder_users_details_from_source_users.rb
index c2cbf30da7457e..7811e15e6a1dee 100644
--- a/db/post_migrate/20250526065102_queue_backfill_placeholder_users_details_from_source_users.rb
+++ b/db/post_migrate/20250526065102_queue_backfill_placeholder_users_details_from_source_users.rb
@@ -2,7 +2,7 @@
 
 class QueueBackfillPlaceholderUsersDetailsFromSourceUsers < Gitlab::Database::Migration[2.3]
   milestone '18.1'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillPlaceholderUsersDetailsFromSourceUsers"
   BATCH_SIZE = 1000
diff --git a/db/post_migrate/20250527064756_migrate_asset_proxy_secret_key_to_new_encryption_framework.rb b/db/post_migrate/20250527064756_migrate_asset_proxy_secret_key_to_new_encryption_framework.rb
index 3322e1721b3cf2..e208d1eeb05afa 100644
--- a/db/post_migrate/20250527064756_migrate_asset_proxy_secret_key_to_new_encryption_framework.rb
+++ b/db/post_migrate/20250527064756_migrate_asset_proxy_secret_key_to_new_encryption_framework.rb
@@ -2,7 +2,7 @@
 
 class MigrateAssetProxySecretKeyToNewEncryptionFramework < Gitlab::Database::Migration[2.3]
   milestone '18.1'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   class MigrationApplicationSettings < MigrationRecord
     include Gitlab::EncryptedAttribute
diff --git a/db/post_migrate/20250528130903_backfill_board_user_preferences.rb b/db/post_migrate/20250528130903_backfill_board_user_preferences.rb
index 88f83ec966c838..74294f748f99af 100644
--- a/db/post_migrate/20250528130903_backfill_board_user_preferences.rb
+++ b/db/post_migrate/20250528130903_backfill_board_user_preferences.rb
@@ -4,7 +4,7 @@ class BackfillBoardUserPreferences < Gitlab::Database::Migration[2.3]
   BATCH_SIZE = 100
 
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '18.1'
 
diff --git a/db/post_migrate/20250528143824_remove_ticket_work_item_type_wrong_hierarchy_restrictions.rb b/db/post_migrate/20250528143824_remove_ticket_work_item_type_wrong_hierarchy_restrictions.rb
index 3f748c1386b089..338abd088c8bb5 100644
--- a/db/post_migrate/20250528143824_remove_ticket_work_item_type_wrong_hierarchy_restrictions.rb
+++ b/db/post_migrate/20250528143824_remove_ticket_work_item_type_wrong_hierarchy_restrictions.rb
@@ -5,7 +5,7 @@ class RemoveTicketWorkItemTypeWrongHierarchyRestrictions < Gitlab::Database::Mig
   TASK_ID = 5
 
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '18.1'
 
diff --git a/db/post_migrate/20250529030008_finalize_backfill_bulk_import_export_uploads_project_id.rb b/db/post_migrate/20250529030008_finalize_backfill_bulk_import_export_uploads_project_id.rb
index 1984c9ecf7e6cb..ed4154c0f43629 100644
--- a/db/post_migrate/20250529030008_finalize_backfill_bulk_import_export_uploads_project_id.rb
+++ b/db/post_migrate/20250529030008_finalize_backfill_bulk_import_export_uploads_project_id.rb
@@ -2,7 +2,7 @@
 
 class FinalizeBackfillBulkImportExportUploadsProjectId < Gitlab::Database::Migration[2.3]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '18.1'
 
   def up
diff --git a/db/post_migrate/20250529030137_finalize_backfill_bulk_import_export_uploads_group_id.rb b/db/post_migrate/20250529030137_finalize_backfill_bulk_import_export_uploads_group_id.rb
index 4bf35bd9eed272..1cb2a92293e28b 100644
--- a/db/post_migrate/20250529030137_finalize_backfill_bulk_import_export_uploads_group_id.rb
+++ b/db/post_migrate/20250529030137_finalize_backfill_bulk_import_export_uploads_group_id.rb
@@ -2,7 +2,7 @@
 
 class FinalizeBackfillBulkImportExportUploadsGroupId < Gitlab::Database::Migration[2.3]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '18.1'
 
   def up
diff --git a/db/post_migrate/20250529030200_finalize_design_management_designs_versions_namespace_id.rb b/db/post_migrate/20250529030200_finalize_design_management_designs_versions_namespace_id.rb
index f70950c7e2171e..4660c60c3b9116 100644
--- a/db/post_migrate/20250529030200_finalize_design_management_designs_versions_namespace_id.rb
+++ b/db/post_migrate/20250529030200_finalize_design_management_designs_versions_namespace_id.rb
@@ -2,7 +2,7 @@
 
 class FinalizeDesignManagementDesignsVersionsNamespaceId < Gitlab::Database::Migration[2.3]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '18.1'
 
   def up
diff --git a/db/post_migrate/20250529030226_finalize_queue_backfill_project_relation_export_uploads_project_id.rb b/db/post_migrate/20250529030226_finalize_queue_backfill_project_relation_export_uploads_project_id.rb
index 3f80edc4f2579c..d2aaaf26d4a72e 100644
--- a/db/post_migrate/20250529030226_finalize_queue_backfill_project_relation_export_uploads_project_id.rb
+++ b/db/post_migrate/20250529030226_finalize_queue_backfill_project_relation_export_uploads_project_id.rb
@@ -2,7 +2,7 @@
 
 class FinalizeQueueBackfillProjectRelationExportUploadsProjectId < Gitlab::Database::Migration[2.3]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '18.1'
 
   def up
diff --git a/db/post_migrate/20250529105143_remove_crm_widget_for_epic_type.rb b/db/post_migrate/20250529105143_remove_crm_widget_for_epic_type.rb
index 687f8d244688df..24e7af7cbf8f30 100644
--- a/db/post_migrate/20250529105143_remove_crm_widget_for_epic_type.rb
+++ b/db/post_migrate/20250529105143_remove_crm_widget_for_epic_type.rb
@@ -5,7 +5,7 @@ class RemoveCrmWidgetForEpicType < Gitlab::Database::Migration[2.3]
   EPIC_ID = 8
 
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '18.1'
 
diff --git a/db/post_migrate/20250530124922_remove_customer_relation_contacts_for_epic_type.rb b/db/post_migrate/20250530124922_remove_customer_relation_contacts_for_epic_type.rb
index 08e46ba2fe254f..bee0e8009759a2 100644
--- a/db/post_migrate/20250530124922_remove_customer_relation_contacts_for_epic_type.rb
+++ b/db/post_migrate/20250530124922_remove_customer_relation_contacts_for_epic_type.rb
@@ -2,7 +2,7 @@
 
 class RemoveCustomerRelationContactsForEpicType < Gitlab::Database::Migration[2.3]
   milestone '18.1'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
 
   BATCH_SIZE = 1000
diff --git a/db/post_migrate/20250601231626_finalize_hk_create_missing_terraform_module_metadata.rb b/db/post_migrate/20250601231626_finalize_hk_create_missing_terraform_module_metadata.rb
index 39ee770263d281..41d99e3e68ffb4 100644
--- a/db/post_migrate/20250601231626_finalize_hk_create_missing_terraform_module_metadata.rb
+++ b/db/post_migrate/20250601231626_finalize_hk_create_missing_terraform_module_metadata.rb
@@ -5,7 +5,7 @@ class FinalizeHkCreateMissingTerraformModuleMetadata < Gitlab::Database::Migrati
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250601231655_finalize_hk_update_status_for_deprecated_npm_packages.rb b/db/post_migrate/20250601231655_finalize_hk_update_status_for_deprecated_npm_packages.rb
index c6b96ff9279671..b38cca060789b4 100644
--- a/db/post_migrate/20250601231655_finalize_hk_update_status_for_deprecated_npm_packages.rb
+++ b/db/post_migrate/20250601231655_finalize_hk_update_status_for_deprecated_npm_packages.rb
@@ -5,7 +5,7 @@ class FinalizeHkUpdateStatusForDeprecatedNpmPackages < Gitlab::Database::Migrati
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250603125014_schedule_vulnerability_archival.rb b/db/post_migrate/20250603125014_schedule_vulnerability_archival.rb
index 6f636e6f4921be..928aecdcf6ab8d 100644
--- a/db/post_migrate/20250603125014_schedule_vulnerability_archival.rb
+++ b/db/post_migrate/20250603125014_schedule_vulnerability_archival.rb
@@ -2,7 +2,7 @@
 
 class ScheduleVulnerabilityArchival < Gitlab::Database::Migration[2.3]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '18.1'
 
   def up
diff --git a/db/post_migrate/20250609164216_queue_backfill_partitioned_uploads.rb b/db/post_migrate/20250609164216_queue_backfill_partitioned_uploads.rb
index ab0affe6c6526c..b7d5d3b09aea2c 100644
--- a/db/post_migrate/20250609164216_queue_backfill_partitioned_uploads.rb
+++ b/db/post_migrate/20250609164216_queue_backfill_partitioned_uploads.rb
@@ -3,7 +3,7 @@
 class QueueBackfillPartitionedUploads < Gitlab::Database::Migration[2.3]
   milestone '18.2'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillPartitionedUploads"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20250609233239_finalize_hk_delete_orphaned_project_namespaces.rb b/db/post_migrate/20250609233239_finalize_hk_delete_orphaned_project_namespaces.rb
index a7b5e0bf539297..a483b4b263bc22 100644
--- a/db/post_migrate/20250609233239_finalize_hk_delete_orphaned_project_namespaces.rb
+++ b/db/post_migrate/20250609233239_finalize_hk_delete_orphaned_project_namespaces.rb
@@ -5,7 +5,7 @@ class FinalizeHkDeleteOrphanedProjectNamespaces < Gitlab::Database::Migration[2.
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250609233305_finalize_hk_migrate_scim_identities.rb b/db/post_migrate/20250609233305_finalize_hk_migrate_scim_identities.rb
index b755432ee52cf3..c0df97f675971e 100644
--- a/db/post_migrate/20250609233305_finalize_hk_migrate_scim_identities.rb
+++ b/db/post_migrate/20250609233305_finalize_hk_migrate_scim_identities.rb
@@ -5,7 +5,7 @@ class FinalizeHkMigrateScimIdentities < Gitlab::Database::Migration[2.3]
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250611064005_queue_backfill_packages_composer_packages_table.rb b/db/post_migrate/20250611064005_queue_backfill_packages_composer_packages_table.rb
index 249d59053ca5bf..32c28c8c221884 100644
--- a/db/post_migrate/20250611064005_queue_backfill_packages_composer_packages_table.rb
+++ b/db/post_migrate/20250611064005_queue_backfill_packages_composer_packages_table.rb
@@ -2,7 +2,7 @@
 
 class QueueBackfillPackagesComposerPackagesTable < Gitlab::Database::Migration[2.3]
   milestone '18.2'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = 'BackfillPackagesComposerPackagesTable'
   BATCH_SIZE = 1000
diff --git a/db/post_migrate/20250611233222_finalize_hk_migrate_scim_tokens.rb b/db/post_migrate/20250611233222_finalize_hk_migrate_scim_tokens.rb
index 92c71367b91bf2..3113560aece226 100644
--- a/db/post_migrate/20250611233222_finalize_hk_migrate_scim_tokens.rb
+++ b/db/post_migrate/20250611233222_finalize_hk_migrate_scim_tokens.rb
@@ -5,7 +5,7 @@ class FinalizeHkMigrateScimTokens < Gitlab::Database::Migration[2.3]
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250617021628_update_workspaces_agent_configs_proxy_namespace_from_empty_hash_to_default.rb b/db/post_migrate/20250617021628_update_workspaces_agent_configs_proxy_namespace_from_empty_hash_to_default.rb
index 8866d04ab0ce95..03db5e60d4070c 100644
--- a/db/post_migrate/20250617021628_update_workspaces_agent_configs_proxy_namespace_from_empty_hash_to_default.rb
+++ b/db/post_migrate/20250617021628_update_workspaces_agent_configs_proxy_namespace_from_empty_hash_to_default.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class UpdateWorkspacesAgentConfigsProxyNamespaceFromEmptyHashToDefault < Gitlab::Database::Migration[2.3]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
 
   milestone '18.2'
diff --git a/db/post_migrate/20250617092550_expire_namespace_descendants_cache.rb b/db/post_migrate/20250617092550_expire_namespace_descendants_cache.rb
index 84929ebde04ba3..1d78a887378c61 100644
--- a/db/post_migrate/20250617092550_expire_namespace_descendants_cache.rb
+++ b/db/post_migrate/20250617092550_expire_namespace_descendants_cache.rb
@@ -3,7 +3,7 @@
 class ExpireNamespaceDescendantsCache < Gitlab::Database::Migration[2.3]
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '18.2'
 
diff --git a/db/post_migrate/20250619033435_backfill_deployments_id_for_bigint_conversion.rb b/db/post_migrate/20250619033435_backfill_deployments_id_for_bigint_conversion.rb
index bca1e65eb90f61..61d44dc4ee8dea 100644
--- a/db/post_migrate/20250619033435_backfill_deployments_id_for_bigint_conversion.rb
+++ b/db/post_migrate/20250619033435_backfill_deployments_id_for_bigint_conversion.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class BackfillDeploymentsIdForBigintConversion < Gitlab::Database::Migration[2.3]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '18.2'
 
   TABLE = :deployments
diff --git a/db/post_migrate/20250623010751_backfill_deployment_clusters_for_bigint_conversion.rb b/db/post_migrate/20250623010751_backfill_deployment_clusters_for_bigint_conversion.rb
index f53350d53050e1..5ba9d7550db545 100644
--- a/db/post_migrate/20250623010751_backfill_deployment_clusters_for_bigint_conversion.rb
+++ b/db/post_migrate/20250623010751_backfill_deployment_clusters_for_bigint_conversion.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class BackfillDeploymentClustersForBigintConversion < Gitlab::Database::Migration[2.3]
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '18.2'
 
   TABLE = :deployment_clusters
diff --git a/db/post_migrate/20250623071728_queue_backfill_rolled_up_weight_for_work_items.rb b/db/post_migrate/20250623071728_queue_backfill_rolled_up_weight_for_work_items.rb
index 5ee4760d317280..a9ac635a4fb8d5 100644
--- a/db/post_migrate/20250623071728_queue_backfill_rolled_up_weight_for_work_items.rb
+++ b/db/post_migrate/20250623071728_queue_backfill_rolled_up_weight_for_work_items.rb
@@ -3,7 +3,7 @@
 class QueueBackfillRolledUpWeightForWorkItems < Gitlab::Database::Migration[2.3]
   milestone '18.2'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     # no-op due to https://gitlab.com/gitlab-com/gl-infra/production-engineering/-/issues/27076
diff --git a/db/post_migrate/20250623095532_queue_backfill_terraform_modules_metadata_with_semver.rb b/db/post_migrate/20250623095532_queue_backfill_terraform_modules_metadata_with_semver.rb
index 2bdd413ec4dd56..a6cc0243d20306 100644
--- a/db/post_migrate/20250623095532_queue_backfill_terraform_modules_metadata_with_semver.rb
+++ b/db/post_migrate/20250623095532_queue_backfill_terraform_modules_metadata_with_semver.rb
@@ -3,7 +3,7 @@
 class QueueBackfillTerraformModulesMetadataWithSemver < Gitlab::Database::Migration[2.3]
   milestone '18.2'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = 'BackfillTerraformModulesMetadataWithSemver'
 
diff --git a/db/post_migrate/20250624002740_queue_backfill_user_detail_onboarding_url.rb b/db/post_migrate/20250624002740_queue_backfill_user_detail_onboarding_url.rb
index 968b7a4b856d34..b17f8cf3efe6f0 100644
--- a/db/post_migrate/20250624002740_queue_backfill_user_detail_onboarding_url.rb
+++ b/db/post_migrate/20250624002740_queue_backfill_user_detail_onboarding_url.rb
@@ -3,7 +3,7 @@
 class QueueBackfillUserDetailOnboardingUrl < Gitlab::Database::Migration[2.3]
   milestone '18.2'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillUserDetailOnboardingUrl"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20250625145056_finalize_backfill_onboarding_status_registration_objective.rb b/db/post_migrate/20250625145056_finalize_backfill_onboarding_status_registration_objective.rb
index 59776343a68ce7..4cc66cc5443f71 100644
--- a/db/post_migrate/20250625145056_finalize_backfill_onboarding_status_registration_objective.rb
+++ b/db/post_migrate/20250625145056_finalize_backfill_onboarding_status_registration_objective.rb
@@ -4,7 +4,7 @@ class FinalizeBackfillOnboardingStatusRegistrationObjective < Gitlab::Database::
   milestone '18.2'
 
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     # no-op
diff --git a/db/post_migrate/20250625170200_queue_backfill_epics_work_item_parent_link_id.rb b/db/post_migrate/20250625170200_queue_backfill_epics_work_item_parent_link_id.rb
index c341bcf4983904..e98d633ce757e9 100644
--- a/db/post_migrate/20250625170200_queue_backfill_epics_work_item_parent_link_id.rb
+++ b/db/post_migrate/20250625170200_queue_backfill_epics_work_item_parent_link_id.rb
@@ -3,7 +3,7 @@
 class QueueBackfillEpicsWorkItemParentLinkId < Gitlab::Database::Migration[2.3]
   milestone '18.2'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillEpicsWorkItemParentLinkId"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20250625184737_queue_backfill_analyzer_project_statuses_from_project_security_settings.rb b/db/post_migrate/20250625184737_queue_backfill_analyzer_project_statuses_from_project_security_settings.rb
index d730fbbf0a1b3f..484e120851fd43 100644
--- a/db/post_migrate/20250625184737_queue_backfill_analyzer_project_statuses_from_project_security_settings.rb
+++ b/db/post_migrate/20250625184737_queue_backfill_analyzer_project_statuses_from_project_security_settings.rb
@@ -9,9 +9,9 @@ class QueueBackfillAnalyzerProjectStatusesFromProjectSecuritySettings < Gitlab::
   milestone '18.2'
 
   # Select the applicable gitlab schema for your batched background migration
-  # the project_security_settings are on gitlab_main
+  # the project_security_settings are on gitlab_main_org
   # but analyzer_project_statuses is on gitlab_sec
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillAnalyzerProjectStatusesFromProjectSecuritySettings"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20250625222131_queue_fix_secret_tokens_for_http_destinations.rb b/db/post_migrate/20250625222131_queue_fix_secret_tokens_for_http_destinations.rb
index 6211022f037c7b..5993a4a56024bb 100644
--- a/db/post_migrate/20250625222131_queue_fix_secret_tokens_for_http_destinations.rb
+++ b/db/post_migrate/20250625222131_queue_fix_secret_tokens_for_http_destinations.rb
@@ -3,7 +3,7 @@
 class QueueFixSecretTokensForHttpDestinations < Gitlab::Database::Migration[2.3]
   milestone '18.2'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "FixSecretTokensForHttpDestinations"
   BATCH_SIZE = 100
diff --git a/db/post_migrate/20250626150904_queue_backfill_epic_issues_work_item_parent_link_id.rb b/db/post_migrate/20250626150904_queue_backfill_epic_issues_work_item_parent_link_id.rb
index 52886f7c237a31..b81f06cac84fe5 100644
--- a/db/post_migrate/20250626150904_queue_backfill_epic_issues_work_item_parent_link_id.rb
+++ b/db/post_migrate/20250626150904_queue_backfill_epic_issues_work_item_parent_link_id.rb
@@ -3,7 +3,7 @@
 class QueueBackfillEpicIssuesWorkItemParentLinkId < Gitlab::Database::Migration[2.3]
   milestone '18.2'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillEpicIssuesWorkItemParentLinkId"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20250627220610_queue_backfill_resource_state_events_namespace_id.rb b/db/post_migrate/20250627220610_queue_backfill_resource_state_events_namespace_id.rb
index 1abd14c805893a..1b1452dc519f1e 100644
--- a/db/post_migrate/20250627220610_queue_backfill_resource_state_events_namespace_id.rb
+++ b/db/post_migrate/20250627220610_queue_backfill_resource_state_events_namespace_id.rb
@@ -2,7 +2,7 @@
 
 class QueueBackfillResourceStateEventsNamespaceId < Gitlab::Database::Migration[2.3]
   milestone '18.2'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillResourceStateEventsNamespaceId"
   MAX_BATCH_SIZE = 50_000
diff --git a/db/post_migrate/20250701112428_queue_backfill_subscription_user_add_on_assignment_versions.rb b/db/post_migrate/20250701112428_queue_backfill_subscription_user_add_on_assignment_versions.rb
index 36f2cbd75291b6..8d5de309b8e32b 100644
--- a/db/post_migrate/20250701112428_queue_backfill_subscription_user_add_on_assignment_versions.rb
+++ b/db/post_migrate/20250701112428_queue_backfill_subscription_user_add_on_assignment_versions.rb
@@ -2,7 +2,7 @@
 
 class QueueBackfillSubscriptionUserAddOnAssignmentVersions < Gitlab::Database::Migration[2.3]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '18.3'
 
   MIGRATION = "BackfillSubscriptionUserAddOnAssignmentVersions"
diff --git a/db/post_migrate/20250708081911_finalize_hk_backfill_onboarding_status_registration_objective.rb b/db/post_migrate/20250708081911_finalize_hk_backfill_onboarding_status_registration_objective.rb
index aa0aca26099e51..e85267319a34b6 100644
--- a/db/post_migrate/20250708081911_finalize_hk_backfill_onboarding_status_registration_objective.rb
+++ b/db/post_migrate/20250708081911_finalize_hk_backfill_onboarding_status_registration_objective.rb
@@ -5,7 +5,7 @@ class FinalizeHkBackfillOnboardingStatusRegistrationObjective < Gitlab::Database
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250708101955_requeue_backfill_terraform_modules_metadata_with_semver.rb b/db/post_migrate/20250708101955_requeue_backfill_terraform_modules_metadata_with_semver.rb
index e700996e819d3a..b5c76ccf7bee35 100644
--- a/db/post_migrate/20250708101955_requeue_backfill_terraform_modules_metadata_with_semver.rb
+++ b/db/post_migrate/20250708101955_requeue_backfill_terraform_modules_metadata_with_semver.rb
@@ -3,7 +3,7 @@
 class RequeueBackfillTerraformModulesMetadataWithSemver < Gitlab::Database::Migration[2.3]
   milestone '18.2'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = 'BackfillTerraformModulesMetadataWithSemver'
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20250709154305_finalize_hk_backfill_seat_assignments_table.rb b/db/post_migrate/20250709154305_finalize_hk_backfill_seat_assignments_table.rb
index 01398d0afd6811..3f91928aaaa8bb 100644
--- a/db/post_migrate/20250709154305_finalize_hk_backfill_seat_assignments_table.rb
+++ b/db/post_migrate/20250709154305_finalize_hk_backfill_seat_assignments_table.rb
@@ -5,7 +5,7 @@ class FinalizeHkBackfillSeatAssignmentsTable < Gitlab::Database::Migration[2.3]
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250709154335_finalize_hk_fix_usernamespace_audit_events.rb b/db/post_migrate/20250709154335_finalize_hk_fix_usernamespace_audit_events.rb
index 5d7a7e5b46507b..85e77a605ed617 100644
--- a/db/post_migrate/20250709154335_finalize_hk_fix_usernamespace_audit_events.rb
+++ b/db/post_migrate/20250709154335_finalize_hk_fix_usernamespace_audit_events.rb
@@ -5,7 +5,7 @@ class FinalizeHkFixUsernamespaceAuditEvents < Gitlab::Database::Migration[2.3]
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250709232529_finalize_hk_update_software_license_policies_with_custom_licenses.rb b/db/post_migrate/20250709232529_finalize_hk_update_software_license_policies_with_custom_licenses.rb
index 7f3657862ec365..d5aee04e8e9e78 100644
--- a/db/post_migrate/20250709232529_finalize_hk_update_software_license_policies_with_custom_licenses.rb
+++ b/db/post_migrate/20250709232529_finalize_hk_update_software_license_policies_with_custom_licenses.rb
@@ -5,7 +5,7 @@ class FinalizeHkUpdateSoftwareLicensePoliciesWithCustomLicenses < Gitlab::Databa
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250711065852_remove_backfill_rolled_up_weight_for_work_items.rb b/db/post_migrate/20250711065852_remove_backfill_rolled_up_weight_for_work_items.rb
index b80f0c5ab48f7d..1d7c4c0a312a88 100644
--- a/db/post_migrate/20250711065852_remove_backfill_rolled_up_weight_for_work_items.rb
+++ b/db/post_migrate/20250711065852_remove_backfill_rolled_up_weight_for_work_items.rb
@@ -3,7 +3,7 @@
 class RemoveBackfillRolledUpWeightForWorkItems < Gitlab::Database::Migration[2.3]
   milestone '18.2'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillRolledUpWeightForWorkItems"
 
diff --git a/db/post_migrate/20250713232042_finalize_hk_backfill_onboarding_status_setup_for_company.rb b/db/post_migrate/20250713232042_finalize_hk_backfill_onboarding_status_setup_for_company.rb
index 76eae8d6ee4f3e..225bf5dc0c2fdb 100644
--- a/db/post_migrate/20250713232042_finalize_hk_backfill_onboarding_status_setup_for_company.rb
+++ b/db/post_migrate/20250713232042_finalize_hk_backfill_onboarding_status_setup_for_company.rb
@@ -5,7 +5,7 @@ class FinalizeHkBackfillOnboardingStatusSetupForCompany < Gitlab::Database::Migr
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250714122007_delete_migrate_evidences_for_vulnerability_findings_from_main_database.rb b/db/post_migrate/20250714122007_delete_migrate_evidences_for_vulnerability_findings_from_main_database.rb
index 7622a29e5c7ecb..52eb5458af52b1 100644
--- a/db/post_migrate/20250714122007_delete_migrate_evidences_for_vulnerability_findings_from_main_database.rb
+++ b/db/post_migrate/20250714122007_delete_migrate_evidences_for_vulnerability_findings_from_main_database.rb
@@ -3,7 +3,7 @@
 class DeleteMigrateEvidencesForVulnerabilityFindingsFromMainDatabase < Gitlab::Database::Migration[2.3]
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '18.3'
 
diff --git a/db/post_migrate/20250714153817_finalize_backfill_compliance_violation_target_project_ids.rb b/db/post_migrate/20250714153817_finalize_backfill_compliance_violation_target_project_ids.rb
index 64218d0a9414d9..2513b3ac66cf38 100644
--- a/db/post_migrate/20250714153817_finalize_backfill_compliance_violation_target_project_ids.rb
+++ b/db/post_migrate/20250714153817_finalize_backfill_compliance_violation_target_project_ids.rb
@@ -5,7 +5,7 @@ class FinalizeBackfillComplianceViolationTargetProjectIds < Gitlab::Database::Mi
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250714214345_queue_backfill_resource_label_events_namespace_id_and_clean_invalid.rb b/db/post_migrate/20250714214345_queue_backfill_resource_label_events_namespace_id_and_clean_invalid.rb
index 2ff8f44faa8826..84223a4aa9d156 100644
--- a/db/post_migrate/20250714214345_queue_backfill_resource_label_events_namespace_id_and_clean_invalid.rb
+++ b/db/post_migrate/20250714214345_queue_backfill_resource_label_events_namespace_id_and_clean_invalid.rb
@@ -2,7 +2,7 @@
 
 class QueueBackfillResourceLabelEventsNamespaceIdAndCleanInvalid < Gitlab::Database::Migration[2.3]
   milestone '18.3'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillResourceLabelEventsNamespaceIdAndCleanInvalid"
   MAX_BATCH_SIZE = 50_000
diff --git a/db/post_migrate/20250714232416_finalize_hk_create_missing_nuget_symbol_files.rb b/db/post_migrate/20250714232416_finalize_hk_create_missing_nuget_symbol_files.rb
index 21989351572a04..0e4bac59a4630e 100644
--- a/db/post_migrate/20250714232416_finalize_hk_create_missing_nuget_symbol_files.rb
+++ b/db/post_migrate/20250714232416_finalize_hk_create_missing_nuget_symbol_files.rb
@@ -5,7 +5,7 @@ class FinalizeHkCreateMissingNugetSymbolFiles < Gitlab::Database::Migration[2.3]
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250715081215_delete_migrate_remediations_for_vulnerability_findings_jobs_from_main_database.rb b/db/post_migrate/20250715081215_delete_migrate_remediations_for_vulnerability_findings_jobs_from_main_database.rb
index 263a837671ca86..8bb864da0c96af 100644
--- a/db/post_migrate/20250715081215_delete_migrate_remediations_for_vulnerability_findings_jobs_from_main_database.rb
+++ b/db/post_migrate/20250715081215_delete_migrate_remediations_for_vulnerability_findings_jobs_from_main_database.rb
@@ -3,7 +3,7 @@
 class DeleteMigrateRemediationsForVulnerabilityFindingsJobsFromMainDatabase < Gitlab::Database::Migration[2.3]
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '18.3'
 
diff --git a/db/post_migrate/20250715081315_switch_migrate_remediations_for_vulnerability_findings_to_sec_database.rb b/db/post_migrate/20250715081315_switch_migrate_remediations_for_vulnerability_findings_to_sec_database.rb
index 6f1f3c5c47f791..837431c465b5f6 100644
--- a/db/post_migrate/20250715081315_switch_migrate_remediations_for_vulnerability_findings_to_sec_database.rb
+++ b/db/post_migrate/20250715081315_switch_migrate_remediations_for_vulnerability_findings_to_sec_database.rb
@@ -18,7 +18,7 @@ def up
   def down
     execute <<~SQL
       UPDATE batched_background_migrations
-      SET gitlab_schema = 'gitlab_main'
+      SET gitlab_schema = 'gitlab_main_org'
       WHERE job_class_name = 'MigrateRemediationsForVulnerabilityFindings'
       AND table_name = 'vulnerability_occurrences';
     SQL
diff --git a/db/post_migrate/20250715091211_queue_backfill_rolled_up_weight_for_work_items_v2.rb b/db/post_migrate/20250715091211_queue_backfill_rolled_up_weight_for_work_items_v2.rb
index afb58ee253f437..67a93fcc662c98 100644
--- a/db/post_migrate/20250715091211_queue_backfill_rolled_up_weight_for_work_items_v2.rb
+++ b/db/post_migrate/20250715091211_queue_backfill_rolled_up_weight_for_work_items_v2.rb
@@ -3,7 +3,7 @@
 class QueueBackfillRolledUpWeightForWorkItemsV2 < Gitlab::Database::Migration[2.3]
   milestone '18.3'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     # no-op: re-enqueued in a new migration: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/200713
diff --git a/db/post_migrate/20250716232555_finalize_hk_sync_unlinked_security_policy_project_links.rb b/db/post_migrate/20250716232555_finalize_hk_sync_unlinked_security_policy_project_links.rb
index 83be570e308eb7..025586c7ed1465 100644
--- a/db/post_migrate/20250716232555_finalize_hk_sync_unlinked_security_policy_project_links.rb
+++ b/db/post_migrate/20250716232555_finalize_hk_sync_unlinked_security_policy_project_links.rb
@@ -5,7 +5,7 @@ class FinalizeHkSyncUnlinkedSecurityPolicyProjectLinks < Gitlab::Database::Migra
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250716232638_finalize_hk_backfill_approval_policy_rule_ids.rb b/db/post_migrate/20250716232638_finalize_hk_backfill_approval_policy_rule_ids.rb
index 522d58688cee8a..f444ebaee1dbab 100644
--- a/db/post_migrate/20250716232638_finalize_hk_backfill_approval_policy_rule_ids.rb
+++ b/db/post_migrate/20250716232638_finalize_hk_backfill_approval_policy_rule_ids.rb
@@ -5,7 +5,7 @@ class FinalizeHkBackfillApprovalPolicyRuleIds < Gitlab::Database::Migration[2.3]
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250717035404_finalize_partitioned_uploads_backfill.rb b/db/post_migrate/20250717035404_finalize_partitioned_uploads_backfill.rb
index 8a4d4371102648..0001e50a760108 100644
--- a/db/post_migrate/20250717035404_finalize_partitioned_uploads_backfill.rb
+++ b/db/post_migrate/20250717035404_finalize_partitioned_uploads_backfill.rb
@@ -5,7 +5,7 @@ class FinalizePartitionedUploadsBackfill < Gitlab::Database::Migration[2.3]
 
   milestone '18.3'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250717232435_finalize_hk_backfill_resource_iteration_events_namespace_id.rb b/db/post_migrate/20250717232435_finalize_hk_backfill_resource_iteration_events_namespace_id.rb
index 7748e1cdb98fb9..bbd15239731dc1 100644
--- a/db/post_migrate/20250717232435_finalize_hk_backfill_resource_iteration_events_namespace_id.rb
+++ b/db/post_migrate/20250717232435_finalize_hk_backfill_resource_iteration_events_namespace_id.rb
@@ -5,7 +5,7 @@ class FinalizeHkBackfillResourceIterationEventsNamespaceId < Gitlab::Database::M
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250718183474_backfill_labels_with_group_project_missing.rb b/db/post_migrate/20250718183474_backfill_labels_with_group_project_missing.rb
index b45bd6b8852916..a21740da526113 100644
--- a/db/post_migrate/20250718183474_backfill_labels_with_group_project_missing.rb
+++ b/db/post_migrate/20250718183474_backfill_labels_with_group_project_missing.rb
@@ -4,7 +4,7 @@ class BackfillLabelsWithGroupProjectMissing < Gitlab::Database::Migration[2.3]
   BATCH_SIZE = 150
 
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '18.3'
 
   def up
diff --git a/db/post_migrate/20250720210423_queue_backfill_clusters_sharding_key.rb b/db/post_migrate/20250720210423_queue_backfill_clusters_sharding_key.rb
index c7609a9a3eb03c..db6f9b7de176ff 100644
--- a/db/post_migrate/20250720210423_queue_backfill_clusters_sharding_key.rb
+++ b/db/post_migrate/20250720210423_queue_backfill_clusters_sharding_key.rb
@@ -3,7 +3,7 @@
 class QueueBackfillClustersShardingKey < Gitlab::Database::Migration[2.3]
   milestone '18.3'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillClustersShardingKey"
   BATCH_SIZE = 1000
diff --git a/db/post_migrate/20250722195318_backfill_merge_request_context_commit_diff_files.rb b/db/post_migrate/20250722195318_backfill_merge_request_context_commit_diff_files.rb
index 8a524f81ce23c2..eec6dea8d8f5cc 100644
--- a/db/post_migrate/20250722195318_backfill_merge_request_context_commit_diff_files.rb
+++ b/db/post_migrate/20250722195318_backfill_merge_request_context_commit_diff_files.rb
@@ -3,7 +3,7 @@
 class BackfillMergeRequestContextCommitDiffFiles < Gitlab::Database::Migration[2.3]
   milestone '18.3'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
 
   BATCH_SIZE = 1_000
diff --git a/db/post_migrate/20250722205800_queue_delete_orphaned_security_policy_bot_users.rb b/db/post_migrate/20250722205800_queue_delete_orphaned_security_policy_bot_users.rb
index c1111cc21f7a11..1b890d38ffe3c4 100644
--- a/db/post_migrate/20250722205800_queue_delete_orphaned_security_policy_bot_users.rb
+++ b/db/post_migrate/20250722205800_queue_delete_orphaned_security_policy_bot_users.rb
@@ -2,7 +2,7 @@
 
 class QueueDeleteOrphanedSecurityPolicyBotUsers < Gitlab::Database::Migration[2.3]
   milestone '18.3'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "DeleteOrphanedSecurityPolicyBotUsers"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20250723221241_finalize_resource_state_events_backfill.rb b/db/post_migrate/20250723221241_finalize_resource_state_events_backfill.rb
index 696e81ef19da3a..d982609bb56284 100644
--- a/db/post_migrate/20250723221241_finalize_resource_state_events_backfill.rb
+++ b/db/post_migrate/20250723221241_finalize_resource_state_events_backfill.rb
@@ -5,7 +5,7 @@ class FinalizeResourceStateEventsBackfill < Gitlab::Database::Migration[2.3]
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250723235100_queue_backfill_group_push_rules_from_push_rules_with_ids.rb b/db/post_migrate/20250723235100_queue_backfill_group_push_rules_from_push_rules_with_ids.rb
index ac2354a18170b3..c994956bb0ee70 100644
--- a/db/post_migrate/20250723235100_queue_backfill_group_push_rules_from_push_rules_with_ids.rb
+++ b/db/post_migrate/20250723235100_queue_backfill_group_push_rules_from_push_rules_with_ids.rb
@@ -3,7 +3,7 @@
 class QueueBackfillGroupPushRulesFromPushRulesWithIds < Gitlab::Database::Migration[2.3]
   milestone "18.3"
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillGroupPushRulesFromPushRulesWithIds"
   BATCH_SIZE = 1000
diff --git a/db/post_migrate/20250725133146_finalize_backfill_terraform_modules_metadata_with_semver.rb b/db/post_migrate/20250725133146_finalize_backfill_terraform_modules_metadata_with_semver.rb
index d2de55435cbd21..6b6da358169c92 100644
--- a/db/post_migrate/20250725133146_finalize_backfill_terraform_modules_metadata_with_semver.rb
+++ b/db/post_migrate/20250725133146_finalize_backfill_terraform_modules_metadata_with_semver.rb
@@ -2,7 +2,7 @@
 
 class FinalizeBackfillTerraformModulesMetadataWithSemver < Gitlab::Database::Migration[2.3]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '18.3'
 
   def up
diff --git a/db/post_migrate/20250729134439_queue_backfill_licenses_outside_spdx.rb b/db/post_migrate/20250729134439_queue_backfill_licenses_outside_spdx.rb
index 0604a22d9a1e2c..767b6b5cb9377a 100644
--- a/db/post_migrate/20250729134439_queue_backfill_licenses_outside_spdx.rb
+++ b/db/post_migrate/20250729134439_queue_backfill_licenses_outside_spdx.rb
@@ -3,7 +3,7 @@
 class QueueBackfillLicensesOutsideSpdx < Gitlab::Database::Migration[2.3]
   milestone '18.3'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillLicensesOutsideSpdx"
   BATCH_SIZE = 1000
diff --git a/db/post_migrate/20250730120042_delete_migrate_evidences_for_vulnerability_findings_from_main_database2.rb b/db/post_migrate/20250730120042_delete_migrate_evidences_for_vulnerability_findings_from_main_database2.rb
index efeeb10fa988c5..63a0d23b5a0dd5 100644
--- a/db/post_migrate/20250730120042_delete_migrate_evidences_for_vulnerability_findings_from_main_database2.rb
+++ b/db/post_migrate/20250730120042_delete_migrate_evidences_for_vulnerability_findings_from_main_database2.rb
@@ -3,7 +3,7 @@
 class DeleteMigrateEvidencesForVulnerabilityFindingsFromMainDatabase2 < Gitlab::Database::Migration[2.3]
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '18.3'
 
   def up
diff --git a/db/post_migrate/20250730120522_switch_migrate_evidences_for_vulnerability_findings_to_sec_database2.rb b/db/post_migrate/20250730120522_switch_migrate_evidences_for_vulnerability_findings_to_sec_database2.rb
index 0c40aab85098a8..9da26cba02b0c6 100644
--- a/db/post_migrate/20250730120522_switch_migrate_evidences_for_vulnerability_findings_to_sec_database2.rb
+++ b/db/post_migrate/20250730120522_switch_migrate_evidences_for_vulnerability_findings_to_sec_database2.rb
@@ -18,7 +18,7 @@ def up
   def down
     execute <<~SQL
       UPDATE batched_background_migrations
-      SET gitlab_schema = 'gitlab_main'
+      SET gitlab_schema = 'gitlab_main_org'
       WHERE job_class_name = 'MigrateEvidencesForVulnerabilityFindings'
       AND table_name = 'vulnerability_occurrences';
     SQL
diff --git a/db/post_migrate/20250804140846_queue_fix_out_of_range_epic_dates.rb b/db/post_migrate/20250804140846_queue_fix_out_of_range_epic_dates.rb
index aee71b751343cb..a13663ad56afc0 100644
--- a/db/post_migrate/20250804140846_queue_fix_out_of_range_epic_dates.rb
+++ b/db/post_migrate/20250804140846_queue_fix_out_of_range_epic_dates.rb
@@ -2,7 +2,7 @@
 
 class QueueFixOutOfRangeEpicDates < Gitlab::Database::Migration[2.3]
   milestone '18.4'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "FixOutOfRangeEpicDates"
   BATCH_SIZE = 1000
diff --git a/db/post_migrate/20250804193146_delete_orphaned_deploy_tokens.rb b/db/post_migrate/20250804193146_delete_orphaned_deploy_tokens.rb
index 5a4e8ca472a243..ac1abd31bd23ec 100644
--- a/db/post_migrate/20250804193146_delete_orphaned_deploy_tokens.rb
+++ b/db/post_migrate/20250804193146_delete_orphaned_deploy_tokens.rb
@@ -2,7 +2,7 @@
 
 class DeleteOrphanedDeployTokens < Gitlab::Database::Migration[2.3]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '18.3'
 
   def up
diff --git a/db/post_migrate/20250806205309_queue_reset_auto_duo_code_review_false_values.rb b/db/post_migrate/20250806205309_queue_reset_auto_duo_code_review_false_values.rb
index 790ce92ad426f4..8e46d2ad3b0b84 100644
--- a/db/post_migrate/20250806205309_queue_reset_auto_duo_code_review_false_values.rb
+++ b/db/post_migrate/20250806205309_queue_reset_auto_duo_code_review_false_values.rb
@@ -2,7 +2,7 @@
 
 class QueueResetAutoDuoCodeReviewFalseValues < Gitlab::Database::Migration[2.3]
   milestone '18.3'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "ResetAutoDuoCodeReviewFalseValues"
   BATCH_SIZE = 50_000
diff --git a/db/post_migrate/20250807004921_finalize_merge_request_diffs_id_bigint_conversion.rb b/db/post_migrate/20250807004921_finalize_merge_request_diffs_id_bigint_conversion.rb
index f5b4586503cd6e..a218e709eab3b8 100644
--- a/db/post_migrate/20250807004921_finalize_merge_request_diffs_id_bigint_conversion.rb
+++ b/db/post_migrate/20250807004921_finalize_merge_request_diffs_id_bigint_conversion.rb
@@ -2,7 +2,7 @@
 
 class FinalizeMergeRequestDiffsIdBigintConversion < Gitlab::Database::Migration[2.3]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '18.3'
 
diff --git a/db/post_migrate/20250807190123_queue_backfill_rolled_up_weight_for_work_items_v3.rb b/db/post_migrate/20250807190123_queue_backfill_rolled_up_weight_for_work_items_v3.rb
index 808bc86054475c..72a28fa9ed3c6b 100644
--- a/db/post_migrate/20250807190123_queue_backfill_rolled_up_weight_for_work_items_v3.rb
+++ b/db/post_migrate/20250807190123_queue_backfill_rolled_up_weight_for_work_items_v3.rb
@@ -3,7 +3,7 @@
 class QueueBackfillRolledUpWeightForWorkItemsV3 < Gitlab::Database::Migration[2.3]
   milestone '18.3'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillRolledUpWeightForWorkItems"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20250808211506_clean_sent_notifications_first_backfill.rb b/db/post_migrate/20250808211506_clean_sent_notifications_first_backfill.rb
index 46437e654a1cb5..b64ca48be8eaf1 100644
--- a/db/post_migrate/20250808211506_clean_sent_notifications_first_backfill.rb
+++ b/db/post_migrate/20250808211506_clean_sent_notifications_first_backfill.rb
@@ -4,7 +4,7 @@ class CleanSentNotificationsFirstBackfill < Gitlab::Database::Migration[2.3]
   MIGRATION = "BackfillSentNotificationsAfterPartition"
 
   milestone '18.3'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     delete_batched_background_migration(MIGRATION, :sent_notifications, :id, [])
diff --git a/db/post_migrate/20250813200545_reschedule_sent_notifications_backfill.rb b/db/post_migrate/20250813200545_reschedule_sent_notifications_backfill.rb
index 60b79060a610af..1f04e151751f20 100644
--- a/db/post_migrate/20250813200545_reschedule_sent_notifications_backfill.rb
+++ b/db/post_migrate/20250813200545_reschedule_sent_notifications_backfill.rb
@@ -3,7 +3,7 @@
 class RescheduleSentNotificationsBackfill < Gitlab::Database::Migration[2.3]
   milestone '18.3'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillSentNotificationsAfterPartition"
   BATCH_SIZE = 10_000
diff --git a/db/post_migrate/20250815123243_finalize_backfill_licenses_outside_spdx_catalogue.rb b/db/post_migrate/20250815123243_finalize_backfill_licenses_outside_spdx_catalogue.rb
index 7652651060ea0d..3f0e3771715576 100644
--- a/db/post_migrate/20250815123243_finalize_backfill_licenses_outside_spdx_catalogue.rb
+++ b/db/post_migrate/20250815123243_finalize_backfill_licenses_outside_spdx_catalogue.rb
@@ -5,7 +5,7 @@ class FinalizeBackfillLicensesOutsideSpdxCatalogue < Gitlab::Database::Migration
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250819150000_queue_backfill_work_item_transitions.rb b/db/post_migrate/20250819150000_queue_backfill_work_item_transitions.rb
index 4519eb673e4050..2e4899d7d1880f 100644
--- a/db/post_migrate/20250819150000_queue_backfill_work_item_transitions.rb
+++ b/db/post_migrate/20250819150000_queue_backfill_work_item_transitions.rb
@@ -2,7 +2,7 @@
 
 class QueueBackfillWorkItemTransitions < Gitlab::Database::Migration[2.3]
   milestone '18.4'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillWorkItemTransitions"
   BATCH_SIZE = 10_000
diff --git a/db/post_migrate/20250821040052_queue_backfill_design_management_designs_project_namespace_id.rb b/db/post_migrate/20250821040052_queue_backfill_design_management_designs_project_namespace_id.rb
index 3232995aa3d777..0c6807059315fb 100644
--- a/db/post_migrate/20250821040052_queue_backfill_design_management_designs_project_namespace_id.rb
+++ b/db/post_migrate/20250821040052_queue_backfill_design_management_designs_project_namespace_id.rb
@@ -3,7 +3,7 @@
 class QueueBackfillDesignManagementDesignsProjectNamespaceId < Gitlab::Database::Migration[2.3]
   milestone '18.4'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillDesignManagementDesignsProjectNamespaceId"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20250822065348_queue_backfill_design_management_repositories_project_namespace_id.rb b/db/post_migrate/20250822065348_queue_backfill_design_management_repositories_project_namespace_id.rb
index 74f459a00f83fe..afe83be42faede 100644
--- a/db/post_migrate/20250822065348_queue_backfill_design_management_repositories_project_namespace_id.rb
+++ b/db/post_migrate/20250822065348_queue_backfill_design_management_repositories_project_namespace_id.rb
@@ -3,7 +3,7 @@
 class QueueBackfillDesignManagementRepositoriesProjectNamespaceId < Gitlab::Database::Migration[2.3]
   milestone '18.4'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillDesignManagementRepositoriesProjectNamespaceId"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20250825003302_set_sharding_key_for_remaining_deploy_tokens.rb b/db/post_migrate/20250825003302_set_sharding_key_for_remaining_deploy_tokens.rb
index 567640992f32a2..55124269309bab 100644
--- a/db/post_migrate/20250825003302_set_sharding_key_for_remaining_deploy_tokens.rb
+++ b/db/post_migrate/20250825003302_set_sharding_key_for_remaining_deploy_tokens.rb
@@ -2,7 +2,7 @@
 
 class SetShardingKeyForRemainingDeployTokens < Gitlab::Database::Migration[2.3]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '18.4'
 
   def up
diff --git a/db/post_migrate/20250828111740_queue_backfill_group_id_and_user_type_for_human_users_personal_access_tokens.rb b/db/post_migrate/20250828111740_queue_backfill_group_id_and_user_type_for_human_users_personal_access_tokens.rb
index 75e21b48ebb22a..14c6a20076438f 100644
--- a/db/post_migrate/20250828111740_queue_backfill_group_id_and_user_type_for_human_users_personal_access_tokens.rb
+++ b/db/post_migrate/20250828111740_queue_backfill_group_id_and_user_type_for_human_users_personal_access_tokens.rb
@@ -3,7 +3,7 @@
 class QueueBackfillGroupIdAndUserTypeForHumanUsersPersonalAccessTokens < Gitlab::Database::Migration[2.3]
   milestone '18.4'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillGroupIdAndUserTypeForHumanUsersPersonalAccessTokens"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20250829061951_finalize_merge_request_id_bigint_conversion.rb b/db/post_migrate/20250829061951_finalize_merge_request_id_bigint_conversion.rb
index 088210d07b3323..49849e0a129fec 100644
--- a/db/post_migrate/20250829061951_finalize_merge_request_id_bigint_conversion.rb
+++ b/db/post_migrate/20250829061951_finalize_merge_request_id_bigint_conversion.rb
@@ -2,7 +2,7 @@
 
 class FinalizeMergeRequestIdBigintConversion < Gitlab::Database::Migration[2.3]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '18.4'
 
diff --git a/db/post_migrate/20250829141659_queue_mark_packages_helm_metadata_caches_pending_destruction.rb b/db/post_migrate/20250829141659_queue_mark_packages_helm_metadata_caches_pending_destruction.rb
index a6538de46f039a..152482c7dd0b66 100644
--- a/db/post_migrate/20250829141659_queue_mark_packages_helm_metadata_caches_pending_destruction.rb
+++ b/db/post_migrate/20250829141659_queue_mark_packages_helm_metadata_caches_pending_destruction.rb
@@ -3,7 +3,7 @@
 class QueueMarkPackagesHelmMetadataCachesPendingDestruction < Gitlab::Database::Migration[2.3]
   milestone '18.4'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "MarkPackagesHelmMetadataCachesPendingDestruction"
 
diff --git a/db/post_migrate/20250903105632_queue_reset_duo_remote_flows_enabled_false_values.rb b/db/post_migrate/20250903105632_queue_reset_duo_remote_flows_enabled_false_values.rb
index c5f5b11626b963..730d3e06f03a75 100644
--- a/db/post_migrate/20250903105632_queue_reset_duo_remote_flows_enabled_false_values.rb
+++ b/db/post_migrate/20250903105632_queue_reset_duo_remote_flows_enabled_false_values.rb
@@ -2,7 +2,7 @@
 
 class QueueResetDuoRemoteFlowsEnabledFalseValues < Gitlab::Database::Migration[2.3]
   milestone '18.4'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "ResetDuoRemoteFlowsEnabledFalseValues"
   BATCH_SIZE = 50_000
diff --git a/db/post_migrate/20250904145156_finalize_audit_event_destination_migrations.rb b/db/post_migrate/20250904145156_finalize_audit_event_destination_migrations.rb
index b91199dd1f6127..fc8c5b6810f5ee 100644
--- a/db/post_migrate/20250904145156_finalize_audit_event_destination_migrations.rb
+++ b/db/post_migrate/20250904145156_finalize_audit_event_destination_migrations.rb
@@ -3,7 +3,7 @@
 class FinalizeAuditEventDestinationMigrations < Gitlab::Database::Migration[2.3]
   milestone '18.4'
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250905203101_queue_backfill_group_id_and_user_type_for_nonhuman_access_tokens.rb b/db/post_migrate/20250905203101_queue_backfill_group_id_and_user_type_for_nonhuman_access_tokens.rb
index ed7aef91d19e0b..35199a271f47e1 100644
--- a/db/post_migrate/20250905203101_queue_backfill_group_id_and_user_type_for_nonhuman_access_tokens.rb
+++ b/db/post_migrate/20250905203101_queue_backfill_group_id_and_user_type_for_nonhuman_access_tokens.rb
@@ -3,7 +3,7 @@
 class QueueBackfillGroupIdAndUserTypeForNonhumanAccessTokens < Gitlab::Database::Migration[2.3]
   milestone '18.5'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillGroupIdAndUserTypeForNonhumanAccessTokens"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20250907232429_finalize_hk_backfill_compliance_framework_security_policy_id.rb b/db/post_migrate/20250907232429_finalize_hk_backfill_compliance_framework_security_policy_id.rb
index bfc3d8b3c9e05c..a32b41226370f7 100644
--- a/db/post_migrate/20250907232429_finalize_hk_backfill_compliance_framework_security_policy_id.rb
+++ b/db/post_migrate/20250907232429_finalize_hk_backfill_compliance_framework_security_policy_id.rb
@@ -5,7 +5,7 @@ class FinalizeHkBackfillComplianceFrameworkSecurityPolicyId < Gitlab::Database::
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250908232216_finalize_hk_delete_twitter_identities.rb b/db/post_migrate/20250908232216_finalize_hk_delete_twitter_identities.rb
index 150df5e1a6de7a..ecfd98b1e2f06a 100644
--- a/db/post_migrate/20250908232216_finalize_hk_delete_twitter_identities.rb
+++ b/db/post_migrate/20250908232216_finalize_hk_delete_twitter_identities.rb
@@ -5,7 +5,7 @@ class FinalizeHkDeleteTwitterIdentities < Gitlab::Database::Migration[2.3]
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250914232504_finalize_hk_update_require_dpop_for_manage_api_endpoints_to_false.rb b/db/post_migrate/20250914232504_finalize_hk_update_require_dpop_for_manage_api_endpoints_to_false.rb
index d7550f3614d8a0..88c6152cff9e34 100644
--- a/db/post_migrate/20250914232504_finalize_hk_update_require_dpop_for_manage_api_endpoints_to_false.rb
+++ b/db/post_migrate/20250914232504_finalize_hk_update_require_dpop_for_manage_api_endpoints_to_false.rb
@@ -5,7 +5,7 @@ class FinalizeHkUpdateRequireDpopForManageApiEndpointsToFalse < Gitlab::Database
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   TABLE_NAME = :namespace_settings
   COLUMN_NAME = :namespace_id
diff --git a/db/post_migrate/20250915200517_queue_archive_authentication_events.rb b/db/post_migrate/20250915200517_queue_archive_authentication_events.rb
index 885d953de528b1..0c5529776c8b96 100644
--- a/db/post_migrate/20250915200517_queue_archive_authentication_events.rb
+++ b/db/post_migrate/20250915200517_queue_archive_authentication_events.rb
@@ -2,7 +2,7 @@
 
 class QueueArchiveAuthenticationEvents < Gitlab::Database::Migration[2.3]
   milestone '18.5'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "ArchiveAuthenticationEvents"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20250915232121_finalize_hk_backfill_placeholder_users_details_from_source_users.rb b/db/post_migrate/20250915232121_finalize_hk_backfill_placeholder_users_details_from_source_users.rb
index cfc0f4fe951be3..91e07d2f50746e 100644
--- a/db/post_migrate/20250915232121_finalize_hk_backfill_placeholder_users_details_from_source_users.rb
+++ b/db/post_migrate/20250915232121_finalize_hk_backfill_placeholder_users_details_from_source_users.rb
@@ -5,7 +5,7 @@ class FinalizeHkBackfillPlaceholderUsersDetailsFromSourceUsers < Gitlab::Databas
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250916221001_queue_backfill_namespace_id_on_notes.rb b/db/post_migrate/20250916221001_queue_backfill_namespace_id_on_notes.rb
index 0434bb2ef9c31b..4de15a239fc254 100644
--- a/db/post_migrate/20250916221001_queue_backfill_namespace_id_on_notes.rb
+++ b/db/post_migrate/20250916221001_queue_backfill_namespace_id_on_notes.rb
@@ -3,7 +3,7 @@
 class QueueBackfillNamespaceIdOnNotes < Gitlab::Database::Migration[2.3]
   milestone '18.4'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillMissingNamespaceIdOnNotes"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20250916232115_finalize_hk_fix_non_existing_timelog_users.rb b/db/post_migrate/20250916232115_finalize_hk_fix_non_existing_timelog_users.rb
index 3fe10d8b5538c9..634551203cb53c 100644
--- a/db/post_migrate/20250916232115_finalize_hk_fix_non_existing_timelog_users.rb
+++ b/db/post_migrate/20250916232115_finalize_hk_fix_non_existing_timelog_users.rb
@@ -5,7 +5,7 @@ class FinalizeHkFixNonExistingTimelogUsers < Gitlab::Database::Migration[2.3]
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250916232222_finalize_hk_backfill_epic_issues_work_item_parent_link_id.rb b/db/post_migrate/20250916232222_finalize_hk_backfill_epic_issues_work_item_parent_link_id.rb
index 662ec449225216..85b10986dcd0cb 100644
--- a/db/post_migrate/20250916232222_finalize_hk_backfill_epic_issues_work_item_parent_link_id.rb
+++ b/db/post_migrate/20250916232222_finalize_hk_backfill_epic_issues_work_item_parent_link_id.rb
@@ -5,7 +5,7 @@ class FinalizeHkBackfillEpicIssuesWorkItemParentLinkId < Gitlab::Database::Migra
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250917231903_finalize_hk_fix_string_config_hashes_group_streaming_destinations.rb b/db/post_migrate/20250917231903_finalize_hk_fix_string_config_hashes_group_streaming_destinations.rb
index 26b95a83f586d1..9fe90ddc972b45 100644
--- a/db/post_migrate/20250917231903_finalize_hk_fix_string_config_hashes_group_streaming_destinations.rb
+++ b/db/post_migrate/20250917231903_finalize_hk_fix_string_config_hashes_group_streaming_destinations.rb
@@ -5,7 +5,7 @@ class FinalizeHkFixStringConfigHashesGroupStreamingDestinations < Gitlab::Databa
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250917232140_finalize_hk_backfill_epics_work_item_parent_link_id.rb b/db/post_migrate/20250917232140_finalize_hk_backfill_epics_work_item_parent_link_id.rb
index 6e72b96f19b175..5e4c61bf484c8a 100644
--- a/db/post_migrate/20250917232140_finalize_hk_backfill_epics_work_item_parent_link_id.rb
+++ b/db/post_migrate/20250917232140_finalize_hk_backfill_epics_work_item_parent_link_id.rb
@@ -5,7 +5,7 @@ class FinalizeHkBackfillEpicsWorkItemParentLinkId < Gitlab::Database::Migration[
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250918155823_requeue_backfill_group_id_and_user_type_for_human_users_personal_access_tokens.rb b/db/post_migrate/20250918155823_requeue_backfill_group_id_and_user_type_for_human_users_personal_access_tokens.rb
index a361738cc0ae1c..491aefec43b0e3 100644
--- a/db/post_migrate/20250918155823_requeue_backfill_group_id_and_user_type_for_human_users_personal_access_tokens.rb
+++ b/db/post_migrate/20250918155823_requeue_backfill_group_id_and_user_type_for_human_users_personal_access_tokens.rb
@@ -3,7 +3,7 @@
 class RequeueBackfillGroupIdAndUserTypeForHumanUsersPersonalAccessTokens < Gitlab::Database::Migration[2.3]
   milestone '18.5'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillGroupIdAndUserTypeForHumanUsersPersonalAccessTokens"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20250919100000_remove_suggested_reviewers_bot_user_type.rb b/db/post_migrate/20250919100000_remove_suggested_reviewers_bot_user_type.rb
index 631dccdadbae7a..448ec05ba288be 100644
--- a/db/post_migrate/20250919100000_remove_suggested_reviewers_bot_user_type.rb
+++ b/db/post_migrate/20250919100000_remove_suggested_reviewers_bot_user_type.rb
@@ -2,7 +2,7 @@
 
 class RemoveSuggestedReviewersBotUserType < Gitlab::Database::Migration[2.3]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '18.5'
 
diff --git a/db/post_migrate/20250922144106_set_allow_immediate_namespaces_deletion_to_false_on_saas.rb b/db/post_migrate/20250922144106_set_allow_immediate_namespaces_deletion_to_false_on_saas.rb
index f229910fca7c9b..39c46f78875003 100644
--- a/db/post_migrate/20250922144106_set_allow_immediate_namespaces_deletion_to_false_on_saas.rb
+++ b/db/post_migrate/20250922144106_set_allow_immediate_namespaces_deletion_to_false_on_saas.rb
@@ -2,7 +2,7 @@
 
 class SetAllowImmediateNamespacesDeletionToFalseOnSaas < Gitlab::Database::Migration[2.3]
   milestone '18.5'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     # no-op - https://gitlab.com/gitlab-org/gitlab/-/issues/572480
diff --git a/db/post_migrate/20250922231950_finalize_hk_fix_string_config_hashes_instance_streaming_destinations.rb b/db/post_migrate/20250922231950_finalize_hk_fix_string_config_hashes_instance_streaming_destinations.rb
index 682c501dc81f5e..e7a5e2c67a07b2 100644
--- a/db/post_migrate/20250922231950_finalize_hk_fix_string_config_hashes_instance_streaming_destinations.rb
+++ b/db/post_migrate/20250922231950_finalize_hk_fix_string_config_hashes_instance_streaming_destinations.rb
@@ -5,7 +5,7 @@ class FinalizeHkFixStringConfigHashesInstanceStreamingDestinations < Gitlab::Dat
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/db/post_migrate/20250929111044_set_allow_immediate_namespaces_deletion_to_false_on_saas_bis.rb b/db/post_migrate/20250929111044_set_allow_immediate_namespaces_deletion_to_false_on_saas_bis.rb
index df0c04e87bd591..faa9061d710dee 100644
--- a/db/post_migrate/20250929111044_set_allow_immediate_namespaces_deletion_to_false_on_saas_bis.rb
+++ b/db/post_migrate/20250929111044_set_allow_immediate_namespaces_deletion_to_false_on_saas_bis.rb
@@ -2,7 +2,7 @@
 
 class SetAllowImmediateNamespacesDeletionToFalseOnSaasBis < Gitlab::Database::Migration[2.3]
   milestone '18.5'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   class MigrationApplicationSetting < MigrationRecord
     self.table_name = 'application_settings'
diff --git a/db/post_migrate/20251001085632_queue_recalculate_two_factor_enforcement_on_users.rb b/db/post_migrate/20251001085632_queue_recalculate_two_factor_enforcement_on_users.rb
index 5c839863019b6b..681b4af6b4e002 100644
--- a/db/post_migrate/20251001085632_queue_recalculate_two_factor_enforcement_on_users.rb
+++ b/db/post_migrate/20251001085632_queue_recalculate_two_factor_enforcement_on_users.rb
@@ -2,7 +2,7 @@
 
 class QueueRecalculateTwoFactorEnforcementOnUsers < Gitlab::Database::Migration[2.3]
   milestone '18.5'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = 'RecalculateTwoFactorEnforcementOnUsers'
   BATCH_SIZE = 1000
diff --git a/db/post_migrate/20251001180830_update_nil_desired_config_generator_version_workspace.rb b/db/post_migrate/20251001180830_update_nil_desired_config_generator_version_workspace.rb
index fd5741415a19c0..63bc8f855b4866 100644
--- a/db/post_migrate/20251001180830_update_nil_desired_config_generator_version_workspace.rb
+++ b/db/post_migrate/20251001180830_update_nil_desired_config_generator_version_workspace.rb
@@ -2,7 +2,7 @@
 
 class UpdateNilDesiredConfigGeneratorVersionWorkspace < Gitlab::Database::Migration[2.3]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '18.5'
 
   def up
diff --git a/db/post_migrate/20251002112327_clean_timelogs_without_issue_and_mr.rb b/db/post_migrate/20251002112327_clean_timelogs_without_issue_and_mr.rb
index 14544e5e0a9eb6..a2d8ffb0acef90 100644
--- a/db/post_migrate/20251002112327_clean_timelogs_without_issue_and_mr.rb
+++ b/db/post_migrate/20251002112327_clean_timelogs_without_issue_and_mr.rb
@@ -4,7 +4,7 @@ class CleanTimelogsWithoutIssueAndMr < Gitlab::Database::Migration[2.3]
   BATCH_SIZE = 100
 
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   milestone '18.5'
 
diff --git a/db/post_migrate/20251002115317_clean_timelogs_with_issue_and_mr.rb b/db/post_migrate/20251002115317_clean_timelogs_with_issue_and_mr.rb
index d94edea73d732c..af7c9358c288ca 100644
--- a/db/post_migrate/20251002115317_clean_timelogs_with_issue_and_mr.rb
+++ b/db/post_migrate/20251002115317_clean_timelogs_with_issue_and_mr.rb
@@ -4,7 +4,7 @@ class CleanTimelogsWithIssueAndMr < Gitlab::Database::Migration[2.3]
   BATCH_SIZE = 100
 
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '18.5'
 
   def up
diff --git a/db/post_migrate/20251002121105_queue_backfill_timelogs_namespace.rb b/db/post_migrate/20251002121105_queue_backfill_timelogs_namespace.rb
index c7c0c36d871c7d..15353a13e1b3a5 100644
--- a/db/post_migrate/20251002121105_queue_backfill_timelogs_namespace.rb
+++ b/db/post_migrate/20251002121105_queue_backfill_timelogs_namespace.rb
@@ -2,7 +2,7 @@
 
 class QueueBackfillTimelogsNamespace < Gitlab::Database::Migration[2.3]
   milestone '18.5'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   MIGRATION = "BackfillTimelogsNamespace"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20251002174401_enable_project_studio_for_team_members.rb b/db/post_migrate/20251002174401_enable_project_studio_for_team_members.rb
index b27c58c3c60b2c..9a38464f644382 100644
--- a/db/post_migrate/20251002174401_enable_project_studio_for_team_members.rb
+++ b/db/post_migrate/20251002174401_enable_project_studio_for_team_members.rb
@@ -2,7 +2,7 @@
 
 class EnableProjectStudioForTeamMembers < Gitlab::Database::Migration[2.3]
   milestone '18.5'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
 
   BATCH_SIZE = 100
diff --git a/db/post_migrate/20251007201807_requeue_backfill_subscription_user_add_on_assignment_versions.rb b/db/post_migrate/20251007201807_requeue_backfill_subscription_user_add_on_assignment_versions.rb
index 64e7a3d1177147..09066affc68cf6 100644
--- a/db/post_migrate/20251007201807_requeue_backfill_subscription_user_add_on_assignment_versions.rb
+++ b/db/post_migrate/20251007201807_requeue_backfill_subscription_user_add_on_assignment_versions.rb
@@ -3,7 +3,7 @@
 # -- Batched background migration for requeuing BackfillSubscriptionUserAddOnAssignmentVersions
 class RequeueBackfillSubscriptionUserAddOnAssignmentVersions < Gitlab::Database::Migration[2.3]
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '18.5'
 
   MIGRATION = "BackfillSubscriptionUserAddOnAssignmentVersions"
diff --git a/db/post_migrate/20251008144734_backfill_system_hook_org_id.rb b/db/post_migrate/20251008144734_backfill_system_hook_org_id.rb
index 8f17fb9872f009..001b6b3b9d58e3 100644
--- a/db/post_migrate/20251008144734_backfill_system_hook_org_id.rb
+++ b/db/post_migrate/20251008144734_backfill_system_hook_org_id.rb
@@ -3,7 +3,7 @@
 class BackfillSystemHookOrgId < Gitlab::Database::Migration[2.3]
   milestone '18.6'
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   disable_ddl_transaction!
 
   BATCH_SIZE = 1000
diff --git a/db/post_migrate/20251013203414_finalize_backfill_resource_label_events_namespace.rb b/db/post_migrate/20251013203414_finalize_backfill_resource_label_events_namespace.rb
index 61d924bd0e91a9..8e9d656ad3927d 100644
--- a/db/post_migrate/20251013203414_finalize_backfill_resource_label_events_namespace.rb
+++ b/db/post_migrate/20251013203414_finalize_backfill_resource_label_events_namespace.rb
@@ -4,7 +4,7 @@ class FinalizeBackfillResourceLabelEventsNamespace < Gitlab::Database::Migration
   MIGRATION = 'BackfillResourceLabelEventsNamespaceIdAndCleanInvalid'
 
   disable_ddl_transaction!
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
   milestone '18.6'
 
   def up
diff --git a/db/post_migrate/20251015232313_finalize_hk_backfill_sent_notifications_after_partition.rb b/db/post_migrate/20251015232313_finalize_hk_backfill_sent_notifications_after_partition.rb
index c5d153c9727380..28edf05a60c41c 100644
--- a/db/post_migrate/20251015232313_finalize_hk_backfill_sent_notifications_after_partition.rb
+++ b/db/post_migrate/20251015232313_finalize_hk_backfill_sent_notifications_after_partition.rb
@@ -5,7 +5,7 @@ class FinalizeHkBackfillSentNotificationsAfterPartition < Gitlab::Database::Migr
 
   disable_ddl_transaction!
 
-  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
   def up
     ensure_batched_background_migration_is_finished(
diff --git a/doc/development/application_secrets.md b/doc/development/application_secrets.md
index 9f74e39f37fe2e..573b849d5ccce1 100644
--- a/doc/development/application_secrets.md
+++ b/doc/development/application_secrets.md
@@ -139,7 +139,7 @@ The migration follows a four-milestone process to ensure zero-downtime deploymen
    ```ruby
    class MigrateSecretKeyToNewEncryptionFramework < Gitlab::Database::Migration[2.3]
      milestone '18.1'
-     restrict_gitlab_migration gitlab_schema: :gitlab_main
+     restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
      class MigrationMyModel < MigrationRecord
        include Gitlab::EncryptedAttribute
diff --git a/spec/lib/gitlab/database/background_migration/batched_migration_spec.rb b/spec/lib/gitlab/database/background_migration/batched_migration_spec.rb
index e2d4826fec6b15..3568410bf2486f 100644
--- a/spec/lib/gitlab/database/background_migration/batched_migration_spec.rb
+++ b/spec/lib/gitlab/database/background_migration/batched_migration_spec.rb
@@ -257,7 +257,7 @@
     end
 
     context 'when ther migration exists and is executable' do
-      let!(:migration) { create(:batched_background_migration, :active, gitlab_schema: :gitlab_main) }
+      let!(:migration) { create(:batched_background_migration, :active, gitlab_schema: :gitlab_main_org) }
 
       it 'returns the migration' do
         expect(executable_migration).to eq(migration)
@@ -917,7 +917,7 @@ def mock_efficiencies(*effs)
         table_name: :projects,
         column_name: :id,
         job_arguments: [[:id], [:id_convert_to_bigint]],
-        gitlab_schema: :gitlab_main
+        gitlab_schema: :gitlab_main_org
       }
     end
 
@@ -981,7 +981,7 @@ def mock_efficiencies(*effs)
         table_name: :projects,
         column_name: :id,
         job_arguments: [[:id], [:id_convert_to_bigint]],
-        gitlab_schema: :gitlab_main
+        gitlab_schema: :gitlab_main_org
       )
 
       expect(described_class.find_for_configuration(:gitlab_main, 'MyJobClass', :projects, :id, [[:id], [:id_convert_to_bigint]])).to eq(migration)
@@ -995,7 +995,7 @@ def mock_efficiencies(*effs)
           table_name: :projects,
           column_name: :id,
           job_arguments: [[:id], [:id_convert_to_bigint]],
-          gitlab_schema: :gitlab_main
+          gitlab_schema: :gitlab_main_org
         )
 
         expect(
@@ -1006,7 +1006,7 @@ def mock_efficiencies(*effs)
   end
 
   describe '.for_gitlab_schema' do
-    let!(:migration) { create(:batched_background_migration, gitlab_schema: :gitlab_main) }
+    let!(:migration) { create(:batched_background_migration, gitlab_schema: :gitlab_main_org) }
 
     before do
       create(:batched_background_migration, gitlab_schema: :gitlab_not_existing)
@@ -1023,7 +1023,7 @@ def mock_efficiencies(*effs)
     let_it_be(:migration) do
       create(
         :batched_background_migration,
-        gitlab_schema: :gitlab_main,
+        gitlab_schema: :gitlab_main_org,
         job_arguments: [['column_1'], ['column_1_convert_to_bigint']]
       )
     end
diff --git a/spec/lib/gitlab/database/migration_helpers/restrict_gitlab_schema_spec.rb b/spec/lib/gitlab/database/migration_helpers/restrict_gitlab_schema_spec.rb
index 2e4611e3f6aa92..9fa0bdadb39ba2 100644
--- a/spec/lib/gitlab/database/migration_helpers/restrict_gitlab_schema_spec.rb
+++ b/spec/lib/gitlab/database/migration_helpers/restrict_gitlab_schema_spec.rb
@@ -20,7 +20,7 @@
     end
 
     it 'does configure allowed_gitlab_schema' do
-      schema_class.restrict_gitlab_migration gitlab_schema: :gitlab_main
+      schema_class.restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
       expect(schema_class.allowed_gitlab_schemas).to eq(%i[gitlab_main])
     end
@@ -528,7 +528,7 @@ def down; end
                 when :no_gitlab_schema
                   # no-op
                 when :gitlab_schema_gitlab_main
-                  migration_class.restrict_gitlab_migration gitlab_schema: :gitlab_main
+                  migration_class.restrict_gitlab_migration gitlab_schema: :gitlab_main_org
                 when :gitlab_schema_gitlab_shared
                   migration_class.restrict_gitlab_migration gitlab_schema: :gitlab_shared
                 end
diff --git a/spec/lib/gitlab/database/migration_helpers_spec.rb b/spec/lib/gitlab/database/migration_helpers_spec.rb
index 65de7a0ba1ed82..3fa4032c1e667a 100644
--- a/spec/lib/gitlab/database/migration_helpers_spec.rb
+++ b/spec/lib/gitlab/database/migration_helpers_spec.rb
@@ -2599,7 +2599,7 @@ def setup
     let(:migration_class) do
       Class.new(Gitlab::Database::Migration[2.2]) do
         milestone '17.4'
-        restrict_gitlab_migration gitlab_schema: :gitlab_main
+        restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
         def type_from_path(_)
           :regular
diff --git a/spec/lib/gitlab/database/migrations/batched_background_migration_helpers_spec.rb b/spec/lib/gitlab/database/migrations/batched_background_migration_helpers_spec.rb
index dc87371ddb1aaf..b47c0c73fc77a3 100644
--- a/spec/lib/gitlab/database/migrations/batched_background_migration_helpers_spec.rb
+++ b/spec/lib/gitlab/database/migrations/batched_background_migration_helpers_spec.rb
@@ -50,7 +50,7 @@ def self.name
           batch_size: 200,
           sub_batch_size: 20,
           job_arguments: [[:id], [:id_convert_to_bigint]],
-          gitlab_schema: :gitlab_main
+          gitlab_schema: :gitlab_main_org
         )
       end
 
@@ -67,7 +67,7 @@ def self.name
             batch_class_name: 'MyBatchClass',
             batch_size: 100,
             sub_batch_size: 10,
-            gitlab_schema: :gitlab_main)
+            gitlab_schema: :gitlab_main_org)
         end.not_to change { Gitlab::Database::BackgroundMigration::BatchedMigration.count }
       end
 
@@ -386,7 +386,7 @@ def self.name
         context 'when restrict_gitlab_migration is set to gitlab_main' do
           it 'does not find any migrations' do
             migration_class.include(Gitlab::Database::MigrationHelpers::RestrictGitlabSchema)
-            migration_class.restrict_gitlab_migration gitlab_schema: :gitlab_main
+            migration_class.restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
             expect do
               migration.finalize_batched_background_migration(
diff --git a/spec/lib/gitlab/database/migrations/conversions/bigint_converter_spec.rb b/spec/lib/gitlab/database/migrations/conversions/bigint_converter_spec.rb
index 42357d92ace6c7..5b1fd96ab76bdf 100644
--- a/spec/lib/gitlab/database/migrations/conversions/bigint_converter_spec.rb
+++ b/spec/lib/gitlab/database/migrations/conversions/bigint_converter_spec.rb
@@ -19,7 +19,7 @@
   let(:migration_class) do
     Class.new(Gitlab::Database::Migration[2.2]) do
       milestone '17.4'
-      restrict_gitlab_migration gitlab_schema: :gitlab_main
+      restrict_gitlab_migration gitlab_schema: :gitlab_main_org
 
       def type_from_path(_)
         :regular
diff --git a/spec/lib/gitlab/sidekiq_middleware/skip_jobs_spec.rb b/spec/lib/gitlab/sidekiq_middleware/skip_jobs_spec.rb
index 01f1e0db913feb..f7833d52fb7478 100644
--- a/spec/lib/gitlab/sidekiq_middleware/skip_jobs_spec.rb
+++ b/spec/lib/gitlab/sidekiq_middleware/skip_jobs_spec.rb
@@ -178,7 +178,7 @@ def self.name
     end
 
     context 'with worker opted for database health check' do
-      let(:health_signal_attrs) { { gitlab_schema: :gitlab_main, tables: [:users], delay: 1.minute } }
+      let(:health_signal_attrs) { { gitlab_schema: :gitlab_main_org, tables: [:users], delay: 1.minute } }
 
       around do |example|
         with_sidekiq_server_middleware do |chain|
diff --git a/spec/migrations/20240911173549_queue_backfill_packages_nuget_symbols_project_id_spec.rb b/spec/migrations/20240911173549_queue_backfill_packages_nuget_symbols_project_id_spec.rb
index eb169d06a0fc66..d8473b2e3c3711 100644
--- a/spec/migrations/20240911173549_queue_backfill_packages_nuget_symbols_project_id_spec.rb
+++ b/spec/migrations/20240911173549_queue_backfill_packages_nuget_symbols_project_id_spec.rb
@@ -19,7 +19,7 @@
           interval: described_class::DELAY_INTERVAL,
           batch_size: described_class::BATCH_SIZE,
           sub_batch_size: described_class::SUB_BATCH_SIZE,
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           job_arguments: [
             :project_id,
             :packages_packages,
diff --git a/spec/migrations/20241029170331_queue_resync_has_vulnerabilities_spec.rb b/spec/migrations/20241029170331_queue_resync_has_vulnerabilities_spec.rb
index 25ee948e2be467..9efe9c84e8cfd9 100644
--- a/spec/migrations/20241029170331_queue_resync_has_vulnerabilities_spec.rb
+++ b/spec/migrations/20241029170331_queue_resync_has_vulnerabilities_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueResyncHasVulnerabilities, migration: :gitlab_main, feature_category: :vulnerability_management do
+RSpec.describe QueueResyncHasVulnerabilities, migration: :gitlab_main_org, feature_category: :vulnerability_management do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :project_settings,
           column_name: :project_id,
           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20241031160728_queue_project_bot_user_details_bot_namespace_migration_spec.rb b/spec/migrations/20241031160728_queue_project_bot_user_details_bot_namespace_migration_spec.rb
index 0d650fd7a71fac..85fa3da3d68767 100644
--- a/spec/migrations/20241031160728_queue_project_bot_user_details_bot_namespace_migration_spec.rb
+++ b/spec/migrations/20241031160728_queue_project_bot_user_details_bot_namespace_migration_spec.rb
@@ -4,7 +4,7 @@
 require_migration!
 
 RSpec.describe QueueProjectBotUserDetailsBotNamespaceMigration,
-  migration: :gitlab_main,
+  migration: :gitlab_main_org,
   feature_category: :system_access do
   let!(:batched_migration) { described_class::MIGRATION }
 
@@ -16,7 +16,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :users,
           column_name: :id,
           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20241108105112_requeue_backfill_related_epic_links_to_issue_links_spec.rb b/spec/migrations/20241108105112_requeue_backfill_related_epic_links_to_issue_links_spec.rb
index b3f618d2b14182..6a9c4d5bc76662 100644
--- a/spec/migrations/20241108105112_requeue_backfill_related_epic_links_to_issue_links_spec.rb
+++ b/spec/migrations/20241108105112_requeue_backfill_related_epic_links_to_issue_links_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe RequeueBackfillRelatedEpicLinksToIssueLinks, migration: :gitlab_main, feature_category: :team_planning do
+RSpec.describe RequeueBackfillRelatedEpicLinksToIssueLinks, migration: :gitlab_main_org, feature_category: :team_planning do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :related_epic_links,
           column_name: :id,
           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20241108111720_requeue_backfill_work_item_hierarchy_for_epics_spec.rb b/spec/migrations/20241108111720_requeue_backfill_work_item_hierarchy_for_epics_spec.rb
index dc10774433e774..1d5df52ded578e 100644
--- a/spec/migrations/20241108111720_requeue_backfill_work_item_hierarchy_for_epics_spec.rb
+++ b/spec/migrations/20241108111720_requeue_backfill_work_item_hierarchy_for_epics_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe RequeueBackfillWorkItemHierarchyForEpics, migration: :gitlab_main, feature_category: :team_planning do
+RSpec.describe RequeueBackfillWorkItemHierarchyForEpics, migration: :gitlab_main_org, feature_category: :team_planning do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :epics,
           column_name: :id,
           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20241108124324_requeue_backfill_epic_issues_into_work_item_parent_links_spec.rb b/spec/migrations/20241108124324_requeue_backfill_epic_issues_into_work_item_parent_links_spec.rb
index 020664d1b9d8f7..d61a47198c182c 100644
--- a/spec/migrations/20241108124324_requeue_backfill_epic_issues_into_work_item_parent_links_spec.rb
+++ b/spec/migrations/20241108124324_requeue_backfill_epic_issues_into_work_item_parent_links_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe RequeueBackfillEpicIssuesIntoWorkItemParentLinks, migration: :gitlab_main, feature_category: :team_planning do
+RSpec.describe RequeueBackfillEpicIssuesIntoWorkItemParentLinks, migration: :gitlab_main_org, feature_category: :team_planning do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :epic_issues,
           column_name: :id,
           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20241108133603_queue_backfill_seat_assignments_table_spec.rb b/spec/migrations/20241108133603_queue_backfill_seat_assignments_table_spec.rb
index cd15993d34b718..8f53909a601ea4 100644
--- a/spec/migrations/20241108133603_queue_backfill_seat_assignments_table_spec.rb
+++ b/spec/migrations/20241108133603_queue_backfill_seat_assignments_table_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueBackfillSeatAssignmentsTable, migration: :gitlab_main, feature_category: :seat_cost_management do
+RSpec.describe QueueBackfillSeatAssignmentsTable, migration: :gitlab_main_org, feature_category: :seat_cost_management do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'does nothing' do
diff --git a/spec/migrations/20241111055711_queue_delete_duplicate_issuable_resource_links_spec.rb b/spec/migrations/20241111055711_queue_delete_duplicate_issuable_resource_links_spec.rb
index 6cd8b731a77d54..809db1455ba80f 100644
--- a/spec/migrations/20241111055711_queue_delete_duplicate_issuable_resource_links_spec.rb
+++ b/spec/migrations/20241111055711_queue_delete_duplicate_issuable_resource_links_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueDeleteDuplicateIssuableResourceLinks, migration: :gitlab_main, feature_category: :database do
+RSpec.describe QueueDeleteDuplicateIssuableResourceLinks, migration: :gitlab_main_org, feature_category: :database do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :issuable_resource_links,
           column_name: :id,
           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20241111092153_clean_trial_gitlab_subscriptions_date_attributes_spec.rb b/spec/migrations/20241111092153_clean_trial_gitlab_subscriptions_date_attributes_spec.rb
index af9e3a31213894..a3cc3346911513 100644
--- a/spec/migrations/20241111092153_clean_trial_gitlab_subscriptions_date_attributes_spec.rb
+++ b/spec/migrations/20241111092153_clean_trial_gitlab_subscriptions_date_attributes_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe CleanTrialGitlabSubscriptionsDateAttributes, migration: :gitlab_main, feature_category: :subscription_management do
+RSpec.describe CleanTrialGitlabSubscriptionsDateAttributes, migration: :gitlab_main_org, feature_category: :subscription_management do
   let(:migration) { described_class.new }
 
   let(:yesterday) { today - 1.day }
diff --git a/spec/migrations/20241118124301_requeue_backfill_security_policies_spec.rb b/spec/migrations/20241118124301_requeue_backfill_security_policies_spec.rb
index c229b10afa363d..1bb191d882704c 100644
--- a/spec/migrations/20241118124301_requeue_backfill_security_policies_spec.rb
+++ b/spec/migrations/20241118124301_requeue_backfill_security_policies_spec.rb
@@ -19,7 +19,7 @@
           interval: described_class::DELAY_INTERVAL,
           batch_size: described_class::BATCH_SIZE,
           sub_batch_size: described_class::SUB_BATCH_SIZE,
-          gitlab_schema: :gitlab_main
+          gitlab_schema: :gitlab_main_org
         )
       }
     end
diff --git a/spec/migrations/20241118145604_queue_create_missing_terraform_module_metadata_spec.rb b/spec/migrations/20241118145604_queue_create_missing_terraform_module_metadata_spec.rb
index 82cc5db465e918..0e7ec533d1b138 100644
--- a/spec/migrations/20241118145604_queue_create_missing_terraform_module_metadata_spec.rb
+++ b/spec/migrations/20241118145604_queue_create_missing_terraform_module_metadata_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueCreateMissingTerraformModuleMetadata, migration: :gitlab_main, feature_category: :package_registry do
+RSpec.describe QueueCreateMissingTerraformModuleMetadata, migration: :gitlab_main_org, feature_category: :package_registry do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
                         expect(batched_migration).to have_scheduled_batched_migration(
-                          gitlab_schema: :gitlab_main,
+                          gitlab_schema: :gitlab_main_org,
                           table_name: :packages_packages,
                           column_name: :id,
                           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20241122184608_queue_update_software_license_policies_with_custom_licenses_spec.rb b/spec/migrations/20241122184608_queue_update_software_license_policies_with_custom_licenses_spec.rb
index 51a17ee066370c..1d1ba8e5d369b4 100644
--- a/spec/migrations/20241122184608_queue_update_software_license_policies_with_custom_licenses_spec.rb
+++ b/spec/migrations/20241122184608_queue_update_software_license_policies_with_custom_licenses_spec.rb
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :software_license_policies,
           column_name: :id,
           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20241125145919_queue_delete_orphaned_project_namespaces_spec.rb b/spec/migrations/20241125145919_queue_delete_orphaned_project_namespaces_spec.rb
index 8100aa1373fdb9..8bfb2ea3e6d9fc 100644
--- a/spec/migrations/20241125145919_queue_delete_orphaned_project_namespaces_spec.rb
+++ b/spec/migrations/20241125145919_queue_delete_orphaned_project_namespaces_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueDeleteOrphanedProjectNamespaces, migration: :gitlab_main, feature_category: :groups_and_projects do
+RSpec.describe QueueDeleteOrphanedProjectNamespaces, migration: :gitlab_main_org, feature_category: :groups_and_projects do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'does not schedule a new batched migration' do
diff --git a/spec/migrations/20241127151803_queue_migrate_software_license_without_spdx_identifier_to_custom_licenses_spec.rb b/spec/migrations/20241127151803_queue_migrate_software_license_without_spdx_identifier_to_custom_licenses_spec.rb
index 5814ada5888721..fb83fe956d7872 100644
--- a/spec/migrations/20241127151803_queue_migrate_software_license_without_spdx_identifier_to_custom_licenses_spec.rb
+++ b/spec/migrations/20241127151803_queue_migrate_software_license_without_spdx_identifier_to_custom_licenses_spec.rb
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :software_license_policies,
           column_name: :id,
           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20241201164238_queue_update_status_for_deprecated_npm_packages_spec.rb b/spec/migrations/20241201164238_queue_update_status_for_deprecated_npm_packages_spec.rb
index deedf24b63f278..e6abc80cd9deb0 100644
--- a/spec/migrations/20241201164238_queue_update_status_for_deprecated_npm_packages_spec.rb
+++ b/spec/migrations/20241201164238_queue_update_status_for_deprecated_npm_packages_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueUpdateStatusForDeprecatedNpmPackages, migration: :gitlab_main, feature_category: :package_registry do
+RSpec.describe QueueUpdateStatusForDeprecatedNpmPackages, migration: :gitlab_main_org, feature_category: :package_registry do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :packages_npm_metadata,
           column_name: :package_id,
           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20241202170820_queue_backfill_issue_link_id_on_related_epic_links_spec.rb b/spec/migrations/20241202170820_queue_backfill_issue_link_id_on_related_epic_links_spec.rb
index 6d8e2abf0baf81..1be4a170b10ca7 100644
--- a/spec/migrations/20241202170820_queue_backfill_issue_link_id_on_related_epic_links_spec.rb
+++ b/spec/migrations/20241202170820_queue_backfill_issue_link_id_on_related_epic_links_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueBackfillIssueLinkIdOnRelatedEpicLinks, migration: :gitlab_main, feature_category: :team_planning do
+RSpec.describe QueueBackfillIssueLinkIdOnRelatedEpicLinks, migration: :gitlab_main_org, feature_category: :team_planning do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :related_epic_links,
           column_name: :id,
           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20241203172717_queue_backfill_subscription_add_on_purchases_started_at_spec.rb b/spec/migrations/20241203172717_queue_backfill_subscription_add_on_purchases_started_at_spec.rb
index f8e95a5c6d39df..6ab030a4ee3cec 100644
--- a/spec/migrations/20241203172717_queue_backfill_subscription_add_on_purchases_started_at_spec.rb
+++ b/spec/migrations/20241203172717_queue_backfill_subscription_add_on_purchases_started_at_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueBackfillSubscriptionAddOnPurchasesStartedAt, migration: :gitlab_main, feature_category: :subscription_management do
+RSpec.describe QueueBackfillSubscriptionAddOnPurchasesStartedAt, migration: :gitlab_main_org, feature_category: :subscription_management do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :subscription_add_on_purchases,
           column_name: :id,
           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20241204201518_queue_backfill_group_wiki_activity_events_spec.rb b/spec/migrations/20241204201518_queue_backfill_group_wiki_activity_events_spec.rb
index a8a783258078e9..3fc97258f8a7c3 100644
--- a/spec/migrations/20241204201518_queue_backfill_group_wiki_activity_events_spec.rb
+++ b/spec/migrations/20241204201518_queue_backfill_group_wiki_activity_events_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueBackfillGroupWikiActivityEvents, migration: :gitlab_main, feature_category: :wiki do
+RSpec.describe QueueBackfillGroupWikiActivityEvents, migration: :gitlab_main_org, feature_category: :wiki do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :events,
           column_name: :id,
           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20241209131010_queue_requeue_backfill_seat_assignments_table_spec.rb b/spec/migrations/20241209131010_queue_requeue_backfill_seat_assignments_table_spec.rb
index 85b8026f45f77d..2abeab183f0241 100644
--- a/spec/migrations/20241209131010_queue_requeue_backfill_seat_assignments_table_spec.rb
+++ b/spec/migrations/20241209131010_queue_requeue_backfill_seat_assignments_table_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueRequeueBackfillSeatAssignmentsTable, migration: :gitlab_main, feature_category: :seat_cost_management do
+RSpec.describe QueueRequeueBackfillSeatAssignmentsTable, migration: :gitlab_main_org, feature_category: :seat_cost_management do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'does nothing' do
diff --git a/spec/migrations/20241213085750_queue_mark_duplicate_maven_packages_for_destruction_spec.rb b/spec/migrations/20241213085750_queue_mark_duplicate_maven_packages_for_destruction_spec.rb
index 33ff27165e464c..21c105786ec79c 100644
--- a/spec/migrations/20241213085750_queue_mark_duplicate_maven_packages_for_destruction_spec.rb
+++ b/spec/migrations/20241213085750_queue_mark_duplicate_maven_packages_for_destruction_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueMarkDuplicateMavenPackagesForDestruction, migration: :gitlab_main, feature_category: :package_registry do
+RSpec.describe QueueMarkDuplicateMavenPackagesForDestruction, migration: :gitlab_main_org, feature_category: :package_registry do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :packages_packages,
           column_name: :project_id,
           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20241219144523_queue_skip_company_onboarding_step_spec.rb b/spec/migrations/20241219144523_queue_skip_company_onboarding_step_spec.rb
index 218fcee1f6218a..e16ce674997b92 100644
--- a/spec/migrations/20241219144523_queue_skip_company_onboarding_step_spec.rb
+++ b/spec/migrations/20241219144523_queue_skip_company_onboarding_step_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueSkipCompanyOnboardingStep, migration: :gitlab_main, feature_category: :onboarding do
+RSpec.describe QueueSkipCompanyOnboardingStep, migration: :gitlab_main_org, feature_category: :onboarding do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :users,
           column_name: :id,
           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20250106104021_queue_fix_usernamespace_audit_events_spec.rb b/spec/migrations/20250106104021_queue_fix_usernamespace_audit_events_spec.rb
index bbd7b90d08ea42..0a0f4cd0bf0301 100644
--- a/spec/migrations/20250106104021_queue_fix_usernamespace_audit_events_spec.rb
+++ b/spec/migrations/20250106104021_queue_fix_usernamespace_audit_events_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueFixUsernamespaceAuditEvents, migration: :gitlab_main, feature_category: :audit_events do
+RSpec.describe QueueFixUsernamespaceAuditEvents, migration: :gitlab_main_org, feature_category: :audit_events do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :audit_events,
           column_name: :id,
           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20250106173236_queue_fix_issues_work_item_type_id_values_spec.rb b/spec/migrations/20250106173236_queue_fix_issues_work_item_type_id_values_spec.rb
index 04bd0c276529da..c4cf55cfc7ca00 100644
--- a/spec/migrations/20250106173236_queue_fix_issues_work_item_type_id_values_spec.rb
+++ b/spec/migrations/20250106173236_queue_fix_issues_work_item_type_id_values_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueFixIssuesWorkItemTypeIdValues, migration: :gitlab_main, feature_category: :team_planning do
+RSpec.describe QueueFixIssuesWorkItemTypeIdValues, migration: :gitlab_main_org, feature_category: :team_planning do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
diff --git a/spec/migrations/20250106175246_queue_migrate_scim_identities_spec.rb b/spec/migrations/20250106175246_queue_migrate_scim_identities_spec.rb
index 3f78cb7ab9db59..e43b99b57a1684 100644
--- a/spec/migrations/20250106175246_queue_migrate_scim_identities_spec.rb
+++ b/spec/migrations/20250106175246_queue_migrate_scim_identities_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueMigrateScimIdentities, migration: :gitlab_main, feature_category: :system_access do
+RSpec.describe QueueMigrateScimIdentities, migration: :gitlab_main_org, feature_category: :system_access do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :scim_identities,
           column_name: :id,
           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20250107143450_queue_migrate_scim_tokens_spec.rb b/spec/migrations/20250107143450_queue_migrate_scim_tokens_spec.rb
index a76c844ada4618..caf95983dd52dd 100644
--- a/spec/migrations/20250107143450_queue_migrate_scim_tokens_spec.rb
+++ b/spec/migrations/20250107143450_queue_migrate_scim_tokens_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueMigrateScimTokens, migration: :gitlab_main, feature_category: :system_access do
+RSpec.describe QueueMigrateScimTokens, migration: :gitlab_main_org, feature_category: :system_access do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :scim_oauth_access_tokens,
           column_name: :id,
           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20250114123402_requeue_backfill_seat_assignments_table_spec.rb b/spec/migrations/20250114123402_requeue_backfill_seat_assignments_table_spec.rb
index 5982a2fcf49ec4..1ced80bba265d5 100644
--- a/spec/migrations/20250114123402_requeue_backfill_seat_assignments_table_spec.rb
+++ b/spec/migrations/20250114123402_requeue_backfill_seat_assignments_table_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe RequeueBackfillSeatAssignmentsTable, migration: :gitlab_main, feature_category: :seat_cost_management do
+RSpec.describe RequeueBackfillSeatAssignmentsTable, migration: :gitlab_main_org, feature_category: :seat_cost_management do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :members,
           column_name: :id,
           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20250115162840_queue_backfill_vs_code_settings_settings_context_hash_spec.rb b/spec/migrations/20250115162840_queue_backfill_vs_code_settings_settings_context_hash_spec.rb
index 6a823fbf876118..682ae8bae27455 100644
--- a/spec/migrations/20250115162840_queue_backfill_vs_code_settings_settings_context_hash_spec.rb
+++ b/spec/migrations/20250115162840_queue_backfill_vs_code_settings_settings_context_hash_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueBackfillVsCodeSettingsSettingsContextHash, migration: :gitlab_main, feature_category: :web_ide do
+RSpec.describe QueueBackfillVsCodeSettingsSettingsContextHash, migration: :gitlab_main_org, feature_category: :web_ide do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :vs_code_settings,
           column_name: :id,
           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20250123185100_delete_boards_without_project_and_group_spec.rb b/spec/migrations/20250123185100_delete_boards_without_project_and_group_spec.rb
index 236a7c8a530098..3d316db9ff4bb1 100644
--- a/spec/migrations/20250123185100_delete_boards_without_project_and_group_spec.rb
+++ b/spec/migrations/20250123185100_delete_boards_without_project_and_group_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe DeleteBoardsWithoutProjectAndGroup, migration: :gitlab_main, feature_category: :team_planning do
+RSpec.describe DeleteBoardsWithoutProjectAndGroup, migration: :gitlab_main_org, feature_category: :team_planning do
   let(:organization) { table(:organizations).create!(name: 'organization', path: 'organization') }
   let(:namespace) { table(:namespaces).create!(name: "namespace", path: "namespace", organization_id: organization.id) }
   let(:project) do
diff --git a/spec/migrations/20250123195100_fix_boards_with_project_and_group_spec.rb b/spec/migrations/20250123195100_fix_boards_with_project_and_group_spec.rb
index af69e2627bcb70..016aad12a04f2a 100644
--- a/spec/migrations/20250123195100_fix_boards_with_project_and_group_spec.rb
+++ b/spec/migrations/20250123195100_fix_boards_with_project_and_group_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe FixBoardsWithProjectAndGroup, migration: :gitlab_main, feature_category: :team_planning do
+RSpec.describe FixBoardsWithProjectAndGroup, migration: :gitlab_main_org, feature_category: :team_planning do
   let(:organization) { table(:organizations).create!(name: 'organization', path: 'organization') }
   let(:namespace) { table(:namespaces).create!(name: "namespace", path: "namespace", organization_id: organization.id) }
   let(:project) do
diff --git a/spec/migrations/20250123195300_backfill_sharding_key_on_board_assignees_spec.rb b/spec/migrations/20250123195300_backfill_sharding_key_on_board_assignees_spec.rb
index ce1848db7cfb97..8c338f5b6675ac 100644
--- a/spec/migrations/20250123195300_backfill_sharding_key_on_board_assignees_spec.rb
+++ b/spec/migrations/20250123195300_backfill_sharding_key_on_board_assignees_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe BackfillShardingKeyOnBoardAssignees, migration: :gitlab_main, feature_category: :team_planning do
+RSpec.describe BackfillShardingKeyOnBoardAssignees, migration: :gitlab_main_org, feature_category: :team_planning do
   let(:organization) { table(:organizations).create!(name: 'organization', path: 'organization') }
   let(:namespace) { table(:namespaces).create!(name: "namespace", path: "namespace", organization_id: organization.id) }
   let(:project) do
diff --git a/spec/migrations/20250127052138_queue_split_microsoft_applications_table_spec.rb b/spec/migrations/20250127052138_queue_split_microsoft_applications_table_spec.rb
index daa28677b3f18e..43b63b7933f5a6 100644
--- a/spec/migrations/20250127052138_queue_split_microsoft_applications_table_spec.rb
+++ b/spec/migrations/20250127052138_queue_split_microsoft_applications_table_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueSplitMicrosoftApplicationsTable, migration: :gitlab_main, feature_category: :system_access do
+RSpec.describe QueueSplitMicrosoftApplicationsTable, migration: :gitlab_main_org, feature_category: :system_access do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :system_access_microsoft_applications,
           column_name: :id,
           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20250129135025_seed_cloud_connector_keys_new_spec.rb b/spec/migrations/20250129135025_seed_cloud_connector_keys_new_spec.rb
index 96092e3044ecc3..d201822e4c7bde 100644
--- a/spec/migrations/20250129135025_seed_cloud_connector_keys_new_spec.rb
+++ b/spec/migrations/20250129135025_seed_cloud_connector_keys_new_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe SeedCloudConnectorKeysNew, migration: :gitlab_main, feature_category: :system_access do
+RSpec.describe SeedCloudConnectorKeysNew, migration: :gitlab_main_org, feature_category: :system_access do
   it 'seeds Cloud Connector keys' do
     keys_table = table(:cloud_connector_keys)
 
diff --git a/spec/migrations/20250130162000_remove_package_protection_rules_on_down_migration_spec.rb b/spec/migrations/20250130162000_remove_package_protection_rules_on_down_migration_spec.rb
index 73eb936c5a2b94..a94575e0d3ec4f 100644
--- a/spec/migrations/20250130162000_remove_package_protection_rules_on_down_migration_spec.rb
+++ b/spec/migrations/20250130162000_remove_package_protection_rules_on_down_migration_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe RemovePackageProtectionRulesOnDownMigration, migration: :gitlab_main, feature_category: :package_registry do
+RSpec.describe RemovePackageProtectionRulesOnDownMigration, migration: :gitlab_main_org, feature_category: :package_registry do
   let(:migration) { described_class.new }
 
   let(:organization) { table(:organizations).create!(name: 'organization', path: 'organization') }
diff --git a/spec/migrations/20250131004135_delete_milestones_without_project_or_group_spec.rb b/spec/migrations/20250131004135_delete_milestones_without_project_or_group_spec.rb
index 7fbe58123ddfb8..35fe83607d1759 100644
--- a/spec/migrations/20250131004135_delete_milestones_without_project_or_group_spec.rb
+++ b/spec/migrations/20250131004135_delete_milestones_without_project_or_group_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe DeleteMilestonesWithoutProjectOrGroup, migration: :gitlab_main, feature_category: :team_planning do
+RSpec.describe DeleteMilestonesWithoutProjectOrGroup, migration: :gitlab_main_org, feature_category: :team_planning do
   let(:organization) { table(:organizations).create!(name: 'organization', path: 'organization') }
   let(:namespace) { table(:namespaces).create!(name: "namespace", path: "namespace", organization_id: organization.id) }
   let(:project) do
diff --git a/spec/migrations/20250131004257_fix_milestones_with_with_project_and_group_spec.rb b/spec/migrations/20250131004257_fix_milestones_with_with_project_and_group_spec.rb
index bb209721b96c09..ef550e5b90e477 100644
--- a/spec/migrations/20250131004257_fix_milestones_with_with_project_and_group_spec.rb
+++ b/spec/migrations/20250131004257_fix_milestones_with_with_project_and_group_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe FixMilestonesWithWithProjectAndGroup, migration: :gitlab_main, feature_category: :team_planning do
+RSpec.describe FixMilestonesWithWithProjectAndGroup, migration: :gitlab_main_org, feature_category: :team_planning do
   let(:organization) { table(:organizations).create!(name: 'organization', path: 'organization') }
   let(:namespace) { table(:namespaces).create!(name: "namespace", path: "namespace", organization_id: organization.id) }
   let(:milestones) { table(:milestones) }
diff --git a/spec/migrations/20250203155647_requeue_backfill_compliance_violation_null_target_project_ids_migration_spec.rb b/spec/migrations/20250203155647_requeue_backfill_compliance_violation_null_target_project_ids_migration_spec.rb
index ce3d0086842522..c7aecdd40faaeb 100644
--- a/spec/migrations/20250203155647_requeue_backfill_compliance_violation_null_target_project_ids_migration_spec.rb
+++ b/spec/migrations/20250203155647_requeue_backfill_compliance_violation_null_target_project_ids_migration_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe RequeueBackfillComplianceViolationNullTargetProjectIdsMigration, migration: :gitlab_main, feature_category: :compliance_management do
+RSpec.describe RequeueBackfillComplianceViolationNullTargetProjectIdsMigration, migration: :gitlab_main_org, feature_category: :compliance_management do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -19,7 +19,7 @@
           interval: described_class::DELAY_INTERVAL,
           batch_size: described_class::BATCH_SIZE,
           sub_batch_size: described_class::SUB_BATCH_SIZE,
-          gitlab_schema: :gitlab_main
+          gitlab_schema: :gitlab_main_org
         )
       }
     end
diff --git a/spec/migrations/20250205125828_queue_create_missing_nuget_symbol_files_spec.rb b/spec/migrations/20250205125828_queue_create_missing_nuget_symbol_files_spec.rb
index ac9e12e84f7dd4..26317de4548117 100644
--- a/spec/migrations/20250205125828_queue_create_missing_nuget_symbol_files_spec.rb
+++ b/spec/migrations/20250205125828_queue_create_missing_nuget_symbol_files_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueCreateMissingNugetSymbolFiles, migration: :gitlab_main, feature_category: :package_registry do
+RSpec.describe QueueCreateMissingNugetSymbolFiles, migration: :gitlab_main_org, feature_category: :package_registry do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'does not schedule a new batched migration' do
@@ -31,7 +31,7 @@
 
         migration.after -> {
           expect(batched_migration).to have_scheduled_batched_migration(
-            gitlab_schema: :gitlab_main,
+            gitlab_schema: :gitlab_main_org,
             table_name: :packages_packages,
             column_name: :id,
             interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20250205175341_queue_backfill_pipeline_execution_policies_config_links_spec.rb b/spec/migrations/20250205175341_queue_backfill_pipeline_execution_policies_config_links_spec.rb
index 0d7b01f017079e..8c9b4b58a22190 100644
--- a/spec/migrations/20250205175341_queue_backfill_pipeline_execution_policies_config_links_spec.rb
+++ b/spec/migrations/20250205175341_queue_backfill_pipeline_execution_policies_config_links_spec.rb
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :security_policies,
           column_name: :id,
           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20250206223925_backfill_sharding_key_on_board_labels_spec.rb b/spec/migrations/20250206223925_backfill_sharding_key_on_board_labels_spec.rb
index e073a524e646cf..cee652d70a156c 100644
--- a/spec/migrations/20250206223925_backfill_sharding_key_on_board_labels_spec.rb
+++ b/spec/migrations/20250206223925_backfill_sharding_key_on_board_labels_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe BackfillShardingKeyOnBoardLabels, migration: :gitlab_main, feature_category: :team_planning do
+RSpec.describe BackfillShardingKeyOnBoardLabels, migration: :gitlab_main_org, feature_category: :team_planning do
   let(:organization) { table(:organizations).create!(name: 'organization', path: 'organization') }
   let(:namespace) { table(:namespaces).create!(name: "namespace", path: "namespace", organization_id: organization.id) }
   let(:project) do
diff --git a/spec/migrations/20250214214518_queue_backfill_software_license_policies_spec.rb b/spec/migrations/20250214214518_queue_backfill_software_license_policies_spec.rb
index 2cbe813d6f9f81..5ad5e61aa1eb22 100644
--- a/spec/migrations/20250214214518_queue_backfill_software_license_policies_spec.rb
+++ b/spec/migrations/20250214214518_queue_backfill_software_license_policies_spec.rb
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :software_license_policies,
           column_name: :id,
           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20250224155021_queue_backfill_external_group_audit_event_destinations_spec.rb b/spec/migrations/20250224155021_queue_backfill_external_group_audit_event_destinations_spec.rb
index 9214d154bdf4a4..1c9cf91a882a10 100644
--- a/spec/migrations/20250224155021_queue_backfill_external_group_audit_event_destinations_spec.rb
+++ b/spec/migrations/20250224155021_queue_backfill_external_group_audit_event_destinations_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueBackfillExternalGroupAuditEventDestinations, migration: :gitlab_main, feature_category: :audit_events do
+RSpec.describe QueueBackfillExternalGroupAuditEventDestinations, migration: :gitlab_main_org, feature_category: :audit_events do
   let(:batched_migration) { described_class::MIGRATION }
 
   it 'is a no-op migration' do
diff --git a/spec/migrations/20250224205632_queue_backfill_external_instance_audit_event_destinations_spec.rb b/spec/migrations/20250224205632_queue_backfill_external_instance_audit_event_destinations_spec.rb
index 01cd70f48c7c7f..f6bf6020bc9357 100644
--- a/spec/migrations/20250224205632_queue_backfill_external_instance_audit_event_destinations_spec.rb
+++ b/spec/migrations/20250224205632_queue_backfill_external_instance_audit_event_destinations_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueBackfillExternalInstanceAuditEventDestinations, migration: :gitlab_main, feature_category: :audit_events do
+RSpec.describe QueueBackfillExternalInstanceAuditEventDestinations, migration: :gitlab_main_org, feature_category: :audit_events do
   let(:batched_migration) { described_class::MIGRATION }
 
   it 'is a no-op migration' do
diff --git a/spec/migrations/20250224211819_queue_backfill_google_group_audit_event_destinations_spec.rb b/spec/migrations/20250224211819_queue_backfill_google_group_audit_event_destinations_spec.rb
index 2c54d9b2d45759..66cf0d3fe38f29 100644
--- a/spec/migrations/20250224211819_queue_backfill_google_group_audit_event_destinations_spec.rb
+++ b/spec/migrations/20250224211819_queue_backfill_google_group_audit_event_destinations_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueBackfillGoogleGroupAuditEventDestinations, migration: :gitlab_main, feature_category: :audit_events do
+RSpec.describe QueueBackfillGoogleGroupAuditEventDestinations, migration: :gitlab_main_org, feature_category: :audit_events do
   let(:batched_migration) { described_class::MIGRATION }
 
   it 'is a no-op migration' do
diff --git a/spec/migrations/20250224214021_queue_backfill_google_instance_audit_event_destinations_spec.rb b/spec/migrations/20250224214021_queue_backfill_google_instance_audit_event_destinations_spec.rb
index 996b86212c9500..e92ea9d487e80c 100644
--- a/spec/migrations/20250224214021_queue_backfill_google_instance_audit_event_destinations_spec.rb
+++ b/spec/migrations/20250224214021_queue_backfill_google_instance_audit_event_destinations_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueBackfillGoogleInstanceAuditEventDestinations, migration: :gitlab_main, feature_category: :audit_events do
+RSpec.describe QueueBackfillGoogleInstanceAuditEventDestinations, migration: :gitlab_main_org, feature_category: :audit_events do
   let(:batched_migration) { described_class::MIGRATION }
 
   it 'is a no-op migration' do
diff --git a/spec/migrations/20250224214935_queue_backfill_amazon_group_audit_event_destinations_spec.rb b/spec/migrations/20250224214935_queue_backfill_amazon_group_audit_event_destinations_spec.rb
index 5e39122a1010ae..57d0b38d0d471e 100644
--- a/spec/migrations/20250224214935_queue_backfill_amazon_group_audit_event_destinations_spec.rb
+++ b/spec/migrations/20250224214935_queue_backfill_amazon_group_audit_event_destinations_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueBackfillAmazonGroupAuditEventDestinations, migration: :gitlab_main, feature_category: :audit_events do
+RSpec.describe QueueBackfillAmazonGroupAuditEventDestinations, migration: :gitlab_main_org, feature_category: :audit_events do
   let(:batched_migration) { described_class::MIGRATION }
 
   it 'is a no-op migration' do
diff --git a/spec/migrations/20250224215131_queue_backfill_amazon_instance_audit_event_destinations_spec.rb b/spec/migrations/20250224215131_queue_backfill_amazon_instance_audit_event_destinations_spec.rb
index 50455059799f6b..5caf5d20b968e5 100644
--- a/spec/migrations/20250224215131_queue_backfill_amazon_instance_audit_event_destinations_spec.rb
+++ b/spec/migrations/20250224215131_queue_backfill_amazon_instance_audit_event_destinations_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueBackfillAmazonInstanceAuditEventDestinations, migration: :gitlab_main, feature_category: :audit_events do
+RSpec.describe QueueBackfillAmazonInstanceAuditEventDestinations, migration: :gitlab_main_org, feature_category: :audit_events do
   let(:batched_migration) { described_class::MIGRATION }
 
   it 'is a no-op migration' do
diff --git a/spec/migrations/20250225105520_queue_backfill_approval_policy_rule_ids_spec.rb b/spec/migrations/20250225105520_queue_backfill_approval_policy_rule_ids_spec.rb
index 073850613779c1..a4e1cc508a95d8 100644
--- a/spec/migrations/20250225105520_queue_backfill_approval_policy_rule_ids_spec.rb
+++ b/spec/migrations/20250225105520_queue_backfill_approval_policy_rule_ids_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueBackfillApprovalPolicyRuleIds, migration: :gitlab_main, feature_category: :security_policy_management do
+RSpec.describe QueueBackfillApprovalPolicyRuleIds, migration: :gitlab_main_org, feature_category: :security_policy_management do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :scan_result_policies,
           column_name: :id,
           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20250225235330_queue_backfill_resource_milestone_events_namespace_spec.rb b/spec/migrations/20250225235330_queue_backfill_resource_milestone_events_namespace_spec.rb
index 674d845a9bb3da..3879f7214f2483 100644
--- a/spec/migrations/20250225235330_queue_backfill_resource_milestone_events_namespace_spec.rb
+++ b/spec/migrations/20250225235330_queue_backfill_resource_milestone_events_namespace_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueBackfillResourceMilestoneEventsNamespace, migration: :gitlab_main, feature_category: :team_planning do
+RSpec.describe QueueBackfillResourceMilestoneEventsNamespace, migration: :gitlab_main_org, feature_category: :team_planning do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :resource_milestone_events,
           column_name: :id,
           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20250228143727_requeue_sync_unlinked_security_policy_project_links_spec.rb b/spec/migrations/20250228143727_requeue_sync_unlinked_security_policy_project_links_spec.rb
index 33e36cc6132b2c..6dc963489cfb45 100644
--- a/spec/migrations/20250228143727_requeue_sync_unlinked_security_policy_project_links_spec.rb
+++ b/spec/migrations/20250228143727_requeue_sync_unlinked_security_policy_project_links_spec.rb
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :security_policies,
           column_name: :id,
           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20250228155146_queue_backfill_onboarding_status_setup_for_company_spec.rb b/spec/migrations/20250228155146_queue_backfill_onboarding_status_setup_for_company_spec.rb
index 7eabfa4b7772a1..73d0ea0427319f 100644
--- a/spec/migrations/20250228155146_queue_backfill_onboarding_status_setup_for_company_spec.rb
+++ b/spec/migrations/20250228155146_queue_backfill_onboarding_status_setup_for_company_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueBackfillOnboardingStatusSetupForCompany, migration: :gitlab_main, feature_category: :onboarding do
+RSpec.describe QueueBackfillOnboardingStatusSetupForCompany, migration: :gitlab_main_org, feature_category: :onboarding do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
diff --git a/spec/migrations/20250304184254_queue_remove_orphaned_vulnerability_notes_batched_migration_spec.rb b/spec/migrations/20250304184254_queue_remove_orphaned_vulnerability_notes_batched_migration_spec.rb
index 607bd3179bdcbd..53b2ad86203e1f 100644
--- a/spec/migrations/20250304184254_queue_remove_orphaned_vulnerability_notes_batched_migration_spec.rb
+++ b/spec/migrations/20250304184254_queue_remove_orphaned_vulnerability_notes_batched_migration_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueRemoveOrphanedVulnerabilityNotesBatchedMigration, migration: :gitlab_main, feature_category: :vulnerability_management do
+RSpec.describe QueueRemoveOrphanedVulnerabilityNotesBatchedMigration, migration: :gitlab_main_org, feature_category: :vulnerability_management do
   let(:migration) { described_class.new }
   let(:batched_migration) { described_class::MIGRATION }
 
@@ -15,7 +15,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :notes,
           column_name: :id,
           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20250310143706_queue_backfill_organization_id_on_fork_networks_spec.rb b/spec/migrations/20250310143706_queue_backfill_organization_id_on_fork_networks_spec.rb
index 37497945ffc748..5d2549d358cfc9 100644
--- a/spec/migrations/20250310143706_queue_backfill_organization_id_on_fork_networks_spec.rb
+++ b/spec/migrations/20250310143706_queue_backfill_organization_id_on_fork_networks_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueBackfillOrganizationIdOnForkNetworks, migration: :gitlab_main, feature_category: :source_code_management do
+RSpec.describe QueueBackfillOrganizationIdOnForkNetworks, migration: :gitlab_main_org, feature_category: :source_code_management do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :fork_networks,
           column_name: :id,
           batch_size: described_class::BATCH_SIZE,
diff --git a/spec/migrations/20250310222744_queue_backfill_description_versions_namespace_spec.rb b/spec/migrations/20250310222744_queue_backfill_description_versions_namespace_spec.rb
index fee0d87735b26f..72f8695fbe8434 100644
--- a/spec/migrations/20250310222744_queue_backfill_description_versions_namespace_spec.rb
+++ b/spec/migrations/20250310222744_queue_backfill_description_versions_namespace_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueBackfillDescriptionVersionsNamespace, migration: :gitlab_main, feature_category: :team_planning do
+RSpec.describe QueueBackfillDescriptionVersionsNamespace, migration: :gitlab_main_org, feature_category: :team_planning do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :description_versions,
           column_name: :id,
           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20250324092854_cleanup_records_with_null_namespace_id_from_seat_assignments_spec.rb b/spec/migrations/20250324092854_cleanup_records_with_null_namespace_id_from_seat_assignments_spec.rb
index 0f8bef20359576..9c415472bcd472 100644
--- a/spec/migrations/20250324092854_cleanup_records_with_null_namespace_id_from_seat_assignments_spec.rb
+++ b/spec/migrations/20250324092854_cleanup_records_with_null_namespace_id_from_seat_assignments_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe CleanupRecordsWithNullNamespaceIdFromSeatAssignments, migration: :gitlab_main, feature_category: :seat_cost_management do
+RSpec.describe CleanupRecordsWithNullNamespaceIdFromSeatAssignments, migration: :gitlab_main_org, feature_category: :seat_cost_management do
   let(:migration) { described_class.new }
   let(:seat_assignments) { table(:subscription_seat_assignments) }
 
diff --git a/spec/migrations/20250326141100_remove_deployment_data_from_pages_metadatum_spec.rb b/spec/migrations/20250326141100_remove_deployment_data_from_pages_metadatum_spec.rb
index d50c5f1ba51d67..20863833a9d356 100644
--- a/spec/migrations/20250326141100_remove_deployment_data_from_pages_metadatum_spec.rb
+++ b/spec/migrations/20250326141100_remove_deployment_data_from_pages_metadatum_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe RemoveDeploymentDataFromPagesMetadatum, migration: :gitlab_main, feature_category: :pages do
+RSpec.describe RemoveDeploymentDataFromPagesMetadatum, migration: :gitlab_main_org, feature_category: :pages do
   let(:migration) { described_class.new }
   let(:organization) { table(:organizations).create!(name: 'organization', path: 'organization') }
   let(:namespace) { table(:namespaces).create!(name: "namespace", path: "namespace", organization_id: organization.id) }
diff --git a/spec/migrations/20250326225831_queue_backfill_compliance_framework_security_policy_id_spec.rb b/spec/migrations/20250326225831_queue_backfill_compliance_framework_security_policy_id_spec.rb
index 9fe7d701c14c1c..9ad8d046b48b53 100644
--- a/spec/migrations/20250326225831_queue_backfill_compliance_framework_security_policy_id_spec.rb
+++ b/spec/migrations/20250326225831_queue_backfill_compliance_framework_security_policy_id_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueBackfillComplianceFrameworkSecurityPolicyId, migration: :gitlab_main, feature_category: :security_policy_management do
+RSpec.describe QueueBackfillComplianceFrameworkSecurityPolicyId, migration: :gitlab_main_org, feature_category: :security_policy_management do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :compliance_framework_security_policies,
           column_name: :id,
           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20250403155636_queue_backfill_external_group_audit_event_destinations_fixed_spec.rb b/spec/migrations/20250403155636_queue_backfill_external_group_audit_event_destinations_fixed_spec.rb
index e4eee5024f00fe..e7ef05513fb2af 100644
--- a/spec/migrations/20250403155636_queue_backfill_external_group_audit_event_destinations_fixed_spec.rb
+++ b/spec/migrations/20250403155636_queue_backfill_external_group_audit_event_destinations_fixed_spec.rb
@@ -4,7 +4,7 @@
 require_migration!
 
 RSpec.describe QueueBackfillExternalGroupAuditEventDestinationsFixed,
-  migration: :gitlab_main,
+  migration: :gitlab_main_org,
   feature_category: :audit_events do
   let(:batched_migration) { described_class::MIGRATION }
 
diff --git a/spec/migrations/20250403155703_queue_backfill_external_instance_audit_event_destinations_fixed_spec.rb b/spec/migrations/20250403155703_queue_backfill_external_instance_audit_event_destinations_fixed_spec.rb
index 61d61b9f11095c..ddcd3a5634e8a7 100644
--- a/spec/migrations/20250403155703_queue_backfill_external_instance_audit_event_destinations_fixed_spec.rb
+++ b/spec/migrations/20250403155703_queue_backfill_external_instance_audit_event_destinations_fixed_spec.rb
@@ -4,7 +4,7 @@
 require_migration!
 
 RSpec.describe QueueBackfillExternalInstanceAuditEventDestinationsFixed,
-  migration: :gitlab_main,
+  migration: :gitlab_main_org,
   feature_category: :audit_events do
   let(:batched_migration) { described_class::MIGRATION }
 
diff --git a/spec/migrations/20250403155730_queue_backfill_amazon_group_audit_event_destinations_fixed_spec.rb b/spec/migrations/20250403155730_queue_backfill_amazon_group_audit_event_destinations_fixed_spec.rb
index b06c0deb0da13d..77f31d163b771c 100644
--- a/spec/migrations/20250403155730_queue_backfill_amazon_group_audit_event_destinations_fixed_spec.rb
+++ b/spec/migrations/20250403155730_queue_backfill_amazon_group_audit_event_destinations_fixed_spec.rb
@@ -4,7 +4,7 @@
 require_migration!
 
 RSpec.describe QueueBackfillAmazonGroupAuditEventDestinationsFixed,
-  migration: :gitlab_main,
+  migration: :gitlab_main_org,
   feature_category: :audit_events do
   let(:batched_migration) { described_class::MIGRATION }
 
@@ -20,7 +20,7 @@
           column_name: :id,
           batch_size: described_class::BATCH_SIZE,
           sub_batch_size: described_class::SUB_BATCH_SIZE,
-          gitlab_schema: :gitlab_main
+          gitlab_schema: :gitlab_main_org
         )
       }
     end
diff --git a/spec/migrations/20250403155743_queue_backfill_amazon_instance_audit_event_destinations_fixed_spec.rb b/spec/migrations/20250403155743_queue_backfill_amazon_instance_audit_event_destinations_fixed_spec.rb
index f558a017701cbc..ae99eb740b4729 100644
--- a/spec/migrations/20250403155743_queue_backfill_amazon_instance_audit_event_destinations_fixed_spec.rb
+++ b/spec/migrations/20250403155743_queue_backfill_amazon_instance_audit_event_destinations_fixed_spec.rb
@@ -4,7 +4,7 @@
 require_migration!
 
 RSpec.describe QueueBackfillAmazonInstanceAuditEventDestinationsFixed,
-  migration: :gitlab_main,
+  migration: :gitlab_main_org,
   feature_category: :audit_events do
   let(:batched_migration) { described_class::MIGRATION }
 
@@ -20,7 +20,7 @@
           column_name: :id,
           batch_size: described_class::BATCH_SIZE,
           sub_batch_size: described_class::SUB_BATCH_SIZE,
-          gitlab_schema: :gitlab_main
+          gitlab_schema: :gitlab_main_org
         )
       }
     end
diff --git a/spec/migrations/20250403155756_queue_backfill_google_group_audit_event_destinations_fixed_spec.rb b/spec/migrations/20250403155756_queue_backfill_google_group_audit_event_destinations_fixed_spec.rb
index e3b368d81d5541..f9cf1049d55b28 100644
--- a/spec/migrations/20250403155756_queue_backfill_google_group_audit_event_destinations_fixed_spec.rb
+++ b/spec/migrations/20250403155756_queue_backfill_google_group_audit_event_destinations_fixed_spec.rb
@@ -4,7 +4,7 @@
 require_migration!
 
 RSpec.describe QueueBackfillGoogleGroupAuditEventDestinationsFixed,
-  migration: :gitlab_main,
+  migration: :gitlab_main_org,
   feature_category: :audit_events do
   let(:batched_migration) { described_class::MIGRATION }
 
@@ -20,7 +20,7 @@
           column_name: :id,
           batch_size: described_class::BATCH_SIZE,
           sub_batch_size: described_class::SUB_BATCH_SIZE,
-          gitlab_schema: :gitlab_main
+          gitlab_schema: :gitlab_main_org
         )
       }
     end
diff --git a/spec/migrations/20250403155815_queue_backfill_google_instance_audit_event_destinations_fixed_spec.rb b/spec/migrations/20250403155815_queue_backfill_google_instance_audit_event_destinations_fixed_spec.rb
index 2c5a04a8f7b73b..0d8c6071bd0054 100644
--- a/spec/migrations/20250403155815_queue_backfill_google_instance_audit_event_destinations_fixed_spec.rb
+++ b/spec/migrations/20250403155815_queue_backfill_google_instance_audit_event_destinations_fixed_spec.rb
@@ -4,7 +4,7 @@
 require_migration!
 
 RSpec.describe QueueBackfillGoogleInstanceAuditEventDestinationsFixed,
-  migration: :gitlab_main,
+  migration: :gitlab_main_org,
   feature_category: :audit_events do
   let(:batched_migration) { described_class::MIGRATION }
 
@@ -20,7 +20,7 @@
           column_name: :id,
           batch_size: described_class::BATCH_SIZE,
           sub_batch_size: described_class::SUB_BATCH_SIZE,
-          gitlab_schema: :gitlab_main
+          gitlab_schema: :gitlab_main_org
         )
       }
     end
diff --git a/spec/migrations/20250404130722_queue_backfill_lists_sharding_key_spec.rb b/spec/migrations/20250404130722_queue_backfill_lists_sharding_key_spec.rb
index a39c8a16556375..66942da24dd5bd 100644
--- a/spec/migrations/20250404130722_queue_backfill_lists_sharding_key_spec.rb
+++ b/spec/migrations/20250404130722_queue_backfill_lists_sharding_key_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueBackfillListsShardingKey, migration: :gitlab_main, feature_category: :team_planning do
+RSpec.describe QueueBackfillListsShardingKey, migration: :gitlab_main_org, feature_category: :team_planning do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :lists,
           column_name: :id,
           batch_size: described_class::BATCH_SIZE,
diff --git a/spec/migrations/20250409141444_queue_fix_string_config_hashes_group_streaming_destinations_spec.rb b/spec/migrations/20250409141444_queue_fix_string_config_hashes_group_streaming_destinations_spec.rb
index 133aab625a914a..00e9f1dd842ed9 100644
--- a/spec/migrations/20250409141444_queue_fix_string_config_hashes_group_streaming_destinations_spec.rb
+++ b/spec/migrations/20250409141444_queue_fix_string_config_hashes_group_streaming_destinations_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueFixStringConfigHashesGroupStreamingDestinations, migration: :gitlab_main, feature_category: :audit_events do
+RSpec.describe QueueFixStringConfigHashesGroupStreamingDestinations, migration: :gitlab_main_org, feature_category: :audit_events do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :audit_events_group_external_streaming_destinations,
           column_name: :id,
           batch_size: described_class::BATCH_SIZE,
diff --git a/spec/migrations/20250409141503_queue_fix_string_config_hashes_instance_streaming_destinations_spec.rb b/spec/migrations/20250409141503_queue_fix_string_config_hashes_instance_streaming_destinations_spec.rb
index b9430776b53edc..ec307cf9d9021a 100644
--- a/spec/migrations/20250409141503_queue_fix_string_config_hashes_instance_streaming_destinations_spec.rb
+++ b/spec/migrations/20250409141503_queue_fix_string_config_hashes_instance_streaming_destinations_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueFixStringConfigHashesInstanceStreamingDestinations, migration: :gitlab_main, feature_category: :audit_events do
+RSpec.describe QueueFixStringConfigHashesInstanceStreamingDestinations, migration: :gitlab_main_org, feature_category: :audit_events do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :audit_events_instance_external_streaming_destinations,
           column_name: :id,
           batch_size: described_class::BATCH_SIZE,
diff --git a/spec/migrations/20250409161158_remove_sprints_without_group_spec.rb b/spec/migrations/20250409161158_remove_sprints_without_group_spec.rb
index 49a655e0df0175..9b2a8257dc2a39 100644
--- a/spec/migrations/20250409161158_remove_sprints_without_group_spec.rb
+++ b/spec/migrations/20250409161158_remove_sprints_without_group_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe RemoveSprintsWithoutGroup, migration: :gitlab_main, feature_category: :team_planning do
+RSpec.describe RemoveSprintsWithoutGroup, migration: :gitlab_main_org, feature_category: :team_planning do
   let(:organization) { table(:organizations).create!(name: 'organization', path: 'organization') }
   let(:namespace) { table(:namespaces).create!(name: "namespace", path: "namespace", organization_id: organization.id) }
   let(:iterations) { table(:sprints) }
diff --git a/spec/migrations/20250409163603_remove_resource_iteration_events_without_iteration_spec.rb b/spec/migrations/20250409163603_remove_resource_iteration_events_without_iteration_spec.rb
index d5524657bc0594..3f41c011a7e1ff 100644
--- a/spec/migrations/20250409163603_remove_resource_iteration_events_without_iteration_spec.rb
+++ b/spec/migrations/20250409163603_remove_resource_iteration_events_without_iteration_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe RemoveResourceIterationEventsWithoutIteration, migration: :gitlab_main, feature_category: :team_planning do
+RSpec.describe RemoveResourceIterationEventsWithoutIteration, migration: :gitlab_main_org, feature_category: :team_planning do
   let(:organization) { table(:organizations).create!(name: 'organization', path: 'organization') }
   let(:namespace) { table(:namespaces).create!(name: "namespace", path: "namespace", organization_id: organization.id) }
   let(:resource_iteration_events) { table(:resource_iteration_events) }
diff --git a/spec/migrations/20250409172701_queue_backfill_resource_iteration_events_namespace_id_spec.rb b/spec/migrations/20250409172701_queue_backfill_resource_iteration_events_namespace_id_spec.rb
index d61f878060e888..f8de2912533969 100644
--- a/spec/migrations/20250409172701_queue_backfill_resource_iteration_events_namespace_id_spec.rb
+++ b/spec/migrations/20250409172701_queue_backfill_resource_iteration_events_namespace_id_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueBackfillResourceIterationEventsNamespaceId, migration: :gitlab_main, feature_category: :team_planning do
+RSpec.describe QueueBackfillResourceIterationEventsNamespaceId, migration: :gitlab_main_org, feature_category: :team_planning do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :resource_iteration_events,
           column_name: :id,
           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20250415164706_queue_delete_twitter_identities_spec.rb b/spec/migrations/20250415164706_queue_delete_twitter_identities_spec.rb
index e1cf2b303287d7..a844b4cabb2989 100644
--- a/spec/migrations/20250415164706_queue_delete_twitter_identities_spec.rb
+++ b/spec/migrations/20250415164706_queue_delete_twitter_identities_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueDeleteTwitterIdentities, migration: :gitlab_main, feature_category: :system_access do
+RSpec.describe QueueDeleteTwitterIdentities, migration: :gitlab_main_org, feature_category: :system_access do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :identities,
           column_name: :id,
           batch_size: Gitlab::Database::Migrations::BatchedBackgroundMigrationHelpers::BATCH_SIZE
diff --git a/spec/migrations/20250415203448_queue_update_require_dpop_for_manage_api_endpoints_to_false_spec.rb b/spec/migrations/20250415203448_queue_update_require_dpop_for_manage_api_endpoints_to_false_spec.rb
index 764790fdd21f18..6e1f26205aab2a 100644
--- a/spec/migrations/20250415203448_queue_update_require_dpop_for_manage_api_endpoints_to_false_spec.rb
+++ b/spec/migrations/20250415203448_queue_update_require_dpop_for_manage_api_endpoints_to_false_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueUpdateRequireDpopForManageApiEndpointsToFalse, migration: :gitlab_main, feature_category: :system_access do
+RSpec.describe QueueUpdateRequireDpopForManageApiEndpointsToFalse, migration: :gitlab_main_org, feature_category: :system_access do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: described_class::TABLE_NAME,
           column_name: described_class::COLUMN_NAME,
           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20250429171748_queue_fix_incomplete_external_audit_destinations_spec.rb b/spec/migrations/20250429171748_queue_fix_incomplete_external_audit_destinations_spec.rb
index c43e401cfd6956..afd0da779498a5 100644
--- a/spec/migrations/20250429171748_queue_fix_incomplete_external_audit_destinations_spec.rb
+++ b/spec/migrations/20250429171748_queue_fix_incomplete_external_audit_destinations_spec.rb
@@ -4,7 +4,7 @@
 require_migration!
 
 RSpec.describe QueueFixIncompleteExternalAuditDestinations,
-  migration: :gitlab_main,
+  migration: :gitlab_main_org,
   feature_category: :audit_events do
   let(:batched_migration) { described_class::MIGRATION }
 
@@ -20,7 +20,7 @@
           column_name: :id,
           batch_size: described_class::BATCH_SIZE,
           sub_batch_size: described_class::SUB_BATCH_SIZE,
-          gitlab_schema: :gitlab_main
+          gitlab_schema: :gitlab_main_org
         )
       }
     end
diff --git a/spec/migrations/20250429171801_queue_fix_incomplete_instance_external_audit_destinations_spec.rb b/spec/migrations/20250429171801_queue_fix_incomplete_instance_external_audit_destinations_spec.rb
index 08d8d05bd7c2cd..79e8134a98dfeb 100644
--- a/spec/migrations/20250429171801_queue_fix_incomplete_instance_external_audit_destinations_spec.rb
+++ b/spec/migrations/20250429171801_queue_fix_incomplete_instance_external_audit_destinations_spec.rb
@@ -4,7 +4,7 @@
 require_migration!
 
 RSpec.describe QueueFixIncompleteInstanceExternalAuditDestinations,
-  migration: :gitlab_main,
+  migration: :gitlab_main_org,
   feature_category: :audit_events do
   let(:batched_migration) { described_class::MIGRATION }
 
@@ -20,7 +20,7 @@
           column_name: :id,
           batch_size: described_class::BATCH_SIZE,
           sub_batch_size: described_class::SUB_BATCH_SIZE,
-          gitlab_schema: :gitlab_main
+          gitlab_schema: :gitlab_main_org
         )
       }
     end
diff --git a/spec/migrations/20250505171359_queue_backfill_licenses_outside_spdx_catalogue_spec.rb b/spec/migrations/20250505171359_queue_backfill_licenses_outside_spdx_catalogue_spec.rb
index 1dc8dca82588e0..ae78926ae8c3ab 100644
--- a/spec/migrations/20250505171359_queue_backfill_licenses_outside_spdx_catalogue_spec.rb
+++ b/spec/migrations/20250505171359_queue_backfill_licenses_outside_spdx_catalogue_spec.rb
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :software_license_policies,
           column_name: :id,
           batch_size: described_class::BATCH_SIZE,
diff --git a/spec/migrations/20250517194243_queue_fix_non_existing_timelog_users_spec.rb b/spec/migrations/20250517194243_queue_fix_non_existing_timelog_users_spec.rb
index ab2033987b015d..6441ebdccf67bc 100644
--- a/spec/migrations/20250517194243_queue_fix_non_existing_timelog_users_spec.rb
+++ b/spec/migrations/20250517194243_queue_fix_non_existing_timelog_users_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueFixNonExistingTimelogUsers, migration: :gitlab_main, feature_category: :team_planning do
+RSpec.describe QueueFixNonExistingTimelogUsers, migration: :gitlab_main_org, feature_category: :team_planning do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :timelogs,
           column_name: :id,
           batch_size: described_class::BATCH_SIZE,
diff --git a/spec/migrations/20250526065102_queue_backfill_placeholder_users_details_from_source_users_spec.rb b/spec/migrations/20250526065102_queue_backfill_placeholder_users_details_from_source_users_spec.rb
index 3dc01ab7b9427e..6a42382b10472c 100644
--- a/spec/migrations/20250526065102_queue_backfill_placeholder_users_details_from_source_users_spec.rb
+++ b/spec/migrations/20250526065102_queue_backfill_placeholder_users_details_from_source_users_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueBackfillPlaceholderUsersDetailsFromSourceUsers, migration: :gitlab_main, feature_category: :importers do
+RSpec.describe QueueBackfillPlaceholderUsersDetailsFromSourceUsers, migration: :gitlab_main_org, feature_category: :importers do
   let(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :import_source_users,
           column_name: :id,
           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20250528130903_backfill_board_user_preferences_spec.rb b/spec/migrations/20250528130903_backfill_board_user_preferences_spec.rb
index 5928196eaa3420..0d36c08fa5761f 100644
--- a/spec/migrations/20250528130903_backfill_board_user_preferences_spec.rb
+++ b/spec/migrations/20250528130903_backfill_board_user_preferences_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe BackfillBoardUserPreferences, migration: :gitlab_main, feature_category: :team_planning do
+RSpec.describe BackfillBoardUserPreferences, migration: :gitlab_main_org, feature_category: :team_planning do
   let(:board_user_preferences) { table(:board_user_preferences) }
   let(:organization) { table(:organizations).create!(name: 'organization', path: 'organization') }
   let(:namespace) { table(:namespaces).create!(name: "namespace", path: "namespace", organization_id: organization.id) }
diff --git a/spec/migrations/20250530124922_remove_customer_relation_contacts_for_epic_type_spec.rb b/spec/migrations/20250530124922_remove_customer_relation_contacts_for_epic_type_spec.rb
index 991f915bd47d40..6544da23a20575 100644
--- a/spec/migrations/20250530124922_remove_customer_relation_contacts_for_epic_type_spec.rb
+++ b/spec/migrations/20250530124922_remove_customer_relation_contacts_for_epic_type_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe RemoveCustomerRelationContactsForEpicType, migration: :gitlab_main, feature_category: :service_desk do
+RSpec.describe RemoveCustomerRelationContactsForEpicType, migration: :gitlab_main_org, feature_category: :service_desk do
   let(:organizations) { table(:organizations) }
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }
diff --git a/spec/migrations/20250611064005_queue_backfill_packages_composer_packages_table_spec.rb b/spec/migrations/20250611064005_queue_backfill_packages_composer_packages_table_spec.rb
index 2fb7655455d157..0db15a6fb5ea64 100644
--- a/spec/migrations/20250611064005_queue_backfill_packages_composer_packages_table_spec.rb
+++ b/spec/migrations/20250611064005_queue_backfill_packages_composer_packages_table_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueBackfillPackagesComposerPackagesTable, migration: :gitlab_main, feature_category: :package_registry do
+RSpec.describe QueueBackfillPackagesComposerPackagesTable, migration: :gitlab_main_org, feature_category: :package_registry do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :packages_packages,
           column_name: :id,
           batch_size: described_class::BATCH_SIZE,
diff --git a/spec/migrations/20250623095532_queue_backfill_terraform_modules_metadata_with_semver_spec.rb b/spec/migrations/20250623095532_queue_backfill_terraform_modules_metadata_with_semver_spec.rb
index fc304cca03fd12..bca70934fdd390 100644
--- a/spec/migrations/20250623095532_queue_backfill_terraform_modules_metadata_with_semver_spec.rb
+++ b/spec/migrations/20250623095532_queue_backfill_terraform_modules_metadata_with_semver_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueBackfillTerraformModulesMetadataWithSemver, migration: :gitlab_main, feature_category: :package_registry do
+RSpec.describe QueueBackfillTerraformModulesMetadataWithSemver, migration: :gitlab_main_org, feature_category: :package_registry do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'does not schedule a new batched migration' do
diff --git a/spec/migrations/20250624002740_queue_backfill_user_detail_onboarding_url_spec.rb b/spec/migrations/20250624002740_queue_backfill_user_detail_onboarding_url_spec.rb
index a65a2bdedeaa85..27a17cf0e03983 100644
--- a/spec/migrations/20250624002740_queue_backfill_user_detail_onboarding_url_spec.rb
+++ b/spec/migrations/20250624002740_queue_backfill_user_detail_onboarding_url_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueBackfillUserDetailOnboardingUrl, migration: :gitlab_main, feature_category: :onboarding do
+RSpec.describe QueueBackfillUserDetailOnboardingUrl, migration: :gitlab_main_org, feature_category: :onboarding do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
diff --git a/spec/migrations/20250625170200_queue_backfill_epics_work_item_parent_link_id_spec.rb b/spec/migrations/20250625170200_queue_backfill_epics_work_item_parent_link_id_spec.rb
index 27690c9e82e902..7e6a44bb7d0510 100644
--- a/spec/migrations/20250625170200_queue_backfill_epics_work_item_parent_link_id_spec.rb
+++ b/spec/migrations/20250625170200_queue_backfill_epics_work_item_parent_link_id_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueBackfillEpicsWorkItemParentLinkId, migration: :gitlab_main, feature_category: :team_planning do
+RSpec.describe QueueBackfillEpicsWorkItemParentLinkId, migration: :gitlab_main_org, feature_category: :team_planning do
   let(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :epics,
           column_name: :id,
           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20250625184737_queue_backfill_analyzer_project_statuses_from_project_security_settings_spec.rb b/spec/migrations/20250625184737_queue_backfill_analyzer_project_statuses_from_project_security_settings_spec.rb
index 38a6a539f3dba1..9bd429d0b125c3 100644
--- a/spec/migrations/20250625184737_queue_backfill_analyzer_project_statuses_from_project_security_settings_spec.rb
+++ b/spec/migrations/20250625184737_queue_backfill_analyzer_project_statuses_from_project_security_settings_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueBackfillAnalyzerProjectStatusesFromProjectSecuritySettings, migration: :gitlab_main, feature_category: :security_asset_inventories do
+RSpec.describe QueueBackfillAnalyzerProjectStatusesFromProjectSecuritySettings, migration: :gitlab_main_org, feature_category: :security_asset_inventories do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :project_security_settings,
           column_name: :project_id,
           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20250625222131_queue_fix_secret_tokens_for_http_destinations_spec.rb b/spec/migrations/20250625222131_queue_fix_secret_tokens_for_http_destinations_spec.rb
index 510cea66e1ea37..7a1d65a7c7f1b1 100644
--- a/spec/migrations/20250625222131_queue_fix_secret_tokens_for_http_destinations_spec.rb
+++ b/spec/migrations/20250625222131_queue_fix_secret_tokens_for_http_destinations_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueFixSecretTokensForHttpDestinations, migration: :gitlab_main, feature_category: :audit_events do
+RSpec.describe QueueFixSecretTokensForHttpDestinations, migration: :gitlab_main_org, feature_category: :audit_events do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :audit_events_group_external_streaming_destinations,
           column_name: :id,
           batch_size: described_class::BATCH_SIZE,
diff --git a/spec/migrations/20250626150904_queue_backfill_epic_issues_work_item_parent_link_id_spec.rb b/spec/migrations/20250626150904_queue_backfill_epic_issues_work_item_parent_link_id_spec.rb
index 61a30702e5ebcc..198fd320718a1c 100644
--- a/spec/migrations/20250626150904_queue_backfill_epic_issues_work_item_parent_link_id_spec.rb
+++ b/spec/migrations/20250626150904_queue_backfill_epic_issues_work_item_parent_link_id_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueBackfillEpicIssuesWorkItemParentLinkId, migration: :gitlab_main, feature_category: :team_planning do
+RSpec.describe QueueBackfillEpicIssuesWorkItemParentLinkId, migration: :gitlab_main_org, feature_category: :team_planning do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :epic_issues,
           column_name: :id,
           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20250627220610_queue_backfill_resource_state_events_namespace_id_spec.rb b/spec/migrations/20250627220610_queue_backfill_resource_state_events_namespace_id_spec.rb
index ac61650b9a2219..b19a3396a41e96 100644
--- a/spec/migrations/20250627220610_queue_backfill_resource_state_events_namespace_id_spec.rb
+++ b/spec/migrations/20250627220610_queue_backfill_resource_state_events_namespace_id_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueBackfillResourceStateEventsNamespaceId, migration: :gitlab_main, feature_category: :team_planning do
+RSpec.describe QueueBackfillResourceStateEventsNamespaceId, migration: :gitlab_main_org, feature_category: :team_planning do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :resource_state_events,
           column_name: :id,
           batch_size: described_class::BATCH_SIZE,
diff --git a/spec/migrations/20250701112428_queue_backfill_subscription_user_add_on_assignment_versions_spec.rb b/spec/migrations/20250701112428_queue_backfill_subscription_user_add_on_assignment_versions_spec.rb
index 9cffb371f2ea31..5a78ff4a719881 100644
--- a/spec/migrations/20250701112428_queue_backfill_subscription_user_add_on_assignment_versions_spec.rb
+++ b/spec/migrations/20250701112428_queue_backfill_subscription_user_add_on_assignment_versions_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueBackfillSubscriptionUserAddOnAssignmentVersions, migration: :gitlab_main, feature_category: :value_stream_management do
+RSpec.describe QueueBackfillSubscriptionUserAddOnAssignmentVersions, migration: :gitlab_main_org, feature_category: :value_stream_management do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'does nothing' do
diff --git a/spec/migrations/20250708101955_requeue_backfill_terraform_modules_metadata_with_semver_spec.rb b/spec/migrations/20250708101955_requeue_backfill_terraform_modules_metadata_with_semver_spec.rb
index 6c4c47428d773e..2d553660a6a80b 100644
--- a/spec/migrations/20250708101955_requeue_backfill_terraform_modules_metadata_with_semver_spec.rb
+++ b/spec/migrations/20250708101955_requeue_backfill_terraform_modules_metadata_with_semver_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe RequeueBackfillTerraformModulesMetadataWithSemver, migration: :gitlab_main, feature_category: :package_registry do
+RSpec.describe RequeueBackfillTerraformModulesMetadataWithSemver, migration: :gitlab_main_org, feature_category: :package_registry do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :packages_packages,
           column_name: :id,
           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20250714214345_queue_backfill_resource_label_events_namespace_id_and_clean_invalid_spec.rb b/spec/migrations/20250714214345_queue_backfill_resource_label_events_namespace_id_and_clean_invalid_spec.rb
index 62b09cfad8dd61..858934fd55d650 100644
--- a/spec/migrations/20250714214345_queue_backfill_resource_label_events_namespace_id_and_clean_invalid_spec.rb
+++ b/spec/migrations/20250714214345_queue_backfill_resource_label_events_namespace_id_and_clean_invalid_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueBackfillResourceLabelEventsNamespaceIdAndCleanInvalid, migration: :gitlab_main, feature_category: :team_planning do
+RSpec.describe QueueBackfillResourceLabelEventsNamespaceIdAndCleanInvalid, migration: :gitlab_main_org, feature_category: :team_planning do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :resource_label_events,
           column_name: :id,
           batch_size: described_class::BATCH_SIZE,
diff --git a/spec/migrations/20250718183474_backfill_labels_with_group_project_missing_spec.rb b/spec/migrations/20250718183474_backfill_labels_with_group_project_missing_spec.rb
index 6402308f73ebb8..dd3ece5a309569 100644
--- a/spec/migrations/20250718183474_backfill_labels_with_group_project_missing_spec.rb
+++ b/spec/migrations/20250718183474_backfill_labels_with_group_project_missing_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe BackfillLabelsWithGroupProjectMissing, :migration_with_transaction, migration: :gitlab_main, feature_category: :team_planning do
+RSpec.describe BackfillLabelsWithGroupProjectMissing, :migration_with_transaction, migration: :gitlab_main_org, feature_category: :team_planning do
   let(:labels) { table(:labels) }
   let(:organization) { table(:organizations).create!(id: 1, name: 'organization', path: 'organization') }
   let(:group) { table(:namespaces).create!(name: "group", path: "group", organization_id: organization.id) }
diff --git a/spec/migrations/20250720210423_queue_backfill_clusters_sharding_key_spec.rb b/spec/migrations/20250720210423_queue_backfill_clusters_sharding_key_spec.rb
index fc935363e813a9..6890027fdf0ebc 100644
--- a/spec/migrations/20250720210423_queue_backfill_clusters_sharding_key_spec.rb
+++ b/spec/migrations/20250720210423_queue_backfill_clusters_sharding_key_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueBackfillClustersShardingKey, migration: :gitlab_main, feature_category: :deployment_management do
+RSpec.describe QueueBackfillClustersShardingKey, migration: :gitlab_main_org, feature_category: :deployment_management do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :clusters,
           column_name: :id,
           batch_size: described_class::BATCH_SIZE,
diff --git a/spec/migrations/20250723235100_queue_backfill_group_push_rules_from_push_rules_with_ids_spec.rb b/spec/migrations/20250723235100_queue_backfill_group_push_rules_from_push_rules_with_ids_spec.rb
index 6d21c6f97f7e00..d6399c5e4040da 100644
--- a/spec/migrations/20250723235100_queue_backfill_group_push_rules_from_push_rules_with_ids_spec.rb
+++ b/spec/migrations/20250723235100_queue_backfill_group_push_rules_from_push_rules_with_ids_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueBackfillGroupPushRulesFromPushRulesWithIds, migration: :gitlab_main, feature_category: :source_code_management do
+RSpec.describe QueueBackfillGroupPushRulesFromPushRulesWithIds, migration: :gitlab_main_org, feature_category: :source_code_management do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :push_rules,
           column_name: :id,
           batch_size: described_class::BATCH_SIZE,
diff --git a/spec/migrations/20250729134439_queue_backfill_licenses_outside_spdx_spec.rb b/spec/migrations/20250729134439_queue_backfill_licenses_outside_spdx_spec.rb
index 755c7211fd4848..7b09b9f9cd0aa3 100644
--- a/spec/migrations/20250729134439_queue_backfill_licenses_outside_spdx_spec.rb
+++ b/spec/migrations/20250729134439_queue_backfill_licenses_outside_spdx_spec.rb
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :software_license_policies,
           column_name: :id,
           batch_size: described_class::BATCH_SIZE,
diff --git a/spec/migrations/20250804140846_queue_fix_out_of_range_epic_dates_spec.rb b/spec/migrations/20250804140846_queue_fix_out_of_range_epic_dates_spec.rb
index 104634cec6f553..121ec0b7e43b84 100644
--- a/spec/migrations/20250804140846_queue_fix_out_of_range_epic_dates_spec.rb
+++ b/spec/migrations/20250804140846_queue_fix_out_of_range_epic_dates_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueFixOutOfRangeEpicDates, migration: :gitlab_main, feature_category: :team_planning do
+RSpec.describe QueueFixOutOfRangeEpicDates, migration: :gitlab_main_org, feature_category: :team_planning do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :epics,
           column_name: :id,
           batch_size: described_class::BATCH_SIZE,
diff --git a/spec/migrations/20250807190123_queue_backfill_rolled_up_weight_for_work_items_v3_spec.rb b/spec/migrations/20250807190123_queue_backfill_rolled_up_weight_for_work_items_v3_spec.rb
index a23f9570890fbe..df54a90311466f 100644
--- a/spec/migrations/20250807190123_queue_backfill_rolled_up_weight_for_work_items_v3_spec.rb
+++ b/spec/migrations/20250807190123_queue_backfill_rolled_up_weight_for_work_items_v3_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueBackfillRolledUpWeightForWorkItemsV3, migration: :gitlab_main, feature_category: :team_planning do
+RSpec.describe QueueBackfillRolledUpWeightForWorkItemsV3, migration: :gitlab_main_org, feature_category: :team_planning do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
diff --git a/spec/migrations/20250813200545_reschedule_sent_notifications_backfill_spec.rb b/spec/migrations/20250813200545_reschedule_sent_notifications_backfill_spec.rb
index 4fd4f327a12ef0..93e89c076e9616 100644
--- a/spec/migrations/20250813200545_reschedule_sent_notifications_backfill_spec.rb
+++ b/spec/migrations/20250813200545_reschedule_sent_notifications_backfill_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe RescheduleSentNotificationsBackfill, migration: :gitlab_main, feature_category: :team_planning do
+RSpec.describe RescheduleSentNotificationsBackfill, migration: :gitlab_main_org, feature_category: :team_planning do
   let!(:batched_migration) { described_class::MIGRATION }
   let(:sent_notifications) { table(:sent_notifications) }
   let!(:p_sent_notifications) do
@@ -24,7 +24,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :sent_notifications,
           column_name: :id,
           batch_size: described_class::BATCH_SIZE,
@@ -64,7 +64,7 @@
       migrate!
 
       expect(batched_migration).to have_scheduled_batched_migration(
-        gitlab_schema: :gitlab_main,
+        gitlab_schema: :gitlab_main_org,
         table_name: :sent_notifications,
         column_name: :id,
         batch_size: described_class::GITLAB_OPTIMIZED_BATCH_SIZE,
diff --git a/spec/migrations/20250819150000_queue_backfill_work_item_transitions_spec.rb b/spec/migrations/20250819150000_queue_backfill_work_item_transitions_spec.rb
index 66ff3b7f66c7dd..410e91fa956ec7 100644
--- a/spec/migrations/20250819150000_queue_backfill_work_item_transitions_spec.rb
+++ b/spec/migrations/20250819150000_queue_backfill_work_item_transitions_spec.rb
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :issues,
           column_name: :id,
           batch_size: described_class::BATCH_SIZE,
diff --git a/spec/migrations/20250821040052_queue_backfill_design_management_designs_project_namespace_id_spec.rb b/spec/migrations/20250821040052_queue_backfill_design_management_designs_project_namespace_id_spec.rb
index e41f1852c631cc..ef03c8f1249286 100644
--- a/spec/migrations/20250821040052_queue_backfill_design_management_designs_project_namespace_id_spec.rb
+++ b/spec/migrations/20250821040052_queue_backfill_design_management_designs_project_namespace_id_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueBackfillDesignManagementDesignsProjectNamespaceId, migration: :gitlab_main, feature_category: :team_planning do
+RSpec.describe QueueBackfillDesignManagementDesignsProjectNamespaceId, migration: :gitlab_main_org, feature_category: :team_planning do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :design_management_designs,
           column_name: :id,
           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20250822065348_queue_backfill_design_management_repositories_project_namespace_id_spec.rb b/spec/migrations/20250822065348_queue_backfill_design_management_repositories_project_namespace_id_spec.rb
index 7f75b260fcb1fa..88f3cc0a1075e7 100644
--- a/spec/migrations/20250822065348_queue_backfill_design_management_repositories_project_namespace_id_spec.rb
+++ b/spec/migrations/20250822065348_queue_backfill_design_management_repositories_project_namespace_id_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueBackfillDesignManagementRepositoriesProjectNamespaceId, migration: :gitlab_main, feature_category: :team_planning do
+RSpec.describe QueueBackfillDesignManagementRepositoriesProjectNamespaceId, migration: :gitlab_main_org, feature_category: :team_planning do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :design_management_repositories,
           column_name: :id,
           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20250826193504_queue_archive_authentication_events_spec.rb b/spec/migrations/20250826193504_queue_archive_authentication_events_spec.rb
index 61b5486d914e7e..dd585738e5979e 100644
--- a/spec/migrations/20250826193504_queue_archive_authentication_events_spec.rb
+++ b/spec/migrations/20250826193504_queue_archive_authentication_events_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueArchiveAuthenticationEvents, migration: :gitlab_main, feature_category: :system_access do
+RSpec.describe QueueArchiveAuthenticationEvents, migration: :gitlab_main_org, feature_category: :system_access do
   let!(:batched_migration) { described_class::MIGRATION }
 
   context "when running on GitLab.com", :saas do
@@ -15,7 +15,7 @@
 
         migration.after -> {
           expect(batched_migration).to have_scheduled_batched_migration(
-            gitlab_schema: :gitlab_main,
+            gitlab_schema: :gitlab_main_org,
             table_name: :authentication_events,
             column_name: :id,
             interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20250829141659_queue_mark_packages_helm_metadata_caches_pending_destruction_spec.rb b/spec/migrations/20250829141659_queue_mark_packages_helm_metadata_caches_pending_destruction_spec.rb
index 5a730dcd72a2e0..a1a0503e9d837f 100644
--- a/spec/migrations/20250829141659_queue_mark_packages_helm_metadata_caches_pending_destruction_spec.rb
+++ b/spec/migrations/20250829141659_queue_mark_packages_helm_metadata_caches_pending_destruction_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueMarkPackagesHelmMetadataCachesPendingDestruction, migration: :gitlab_main, feature_category: :package_registry do
+RSpec.describe QueueMarkPackagesHelmMetadataCachesPendingDestruction, migration: :gitlab_main_org, feature_category: :package_registry do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :packages_helm_metadata_caches,
           column_name: :id
         )
diff --git a/spec/migrations/20250829203803_requeue_backfill_subscription_user_add_on_assignment_versions_spec.rb b/spec/migrations/20250829203803_requeue_backfill_subscription_user_add_on_assignment_versions_spec.rb
index 2844b7fcdcb74d..1b013f0d260119 100644
--- a/spec/migrations/20250829203803_requeue_backfill_subscription_user_add_on_assignment_versions_spec.rb
+++ b/spec/migrations/20250829203803_requeue_backfill_subscription_user_add_on_assignment_versions_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe RequeueBackfillSubscriptionUserAddOnAssignmentVersions, migration: :gitlab_main, feature_category: :value_stream_management do
+RSpec.describe RequeueBackfillSubscriptionUserAddOnAssignmentVersions, migration: :gitlab_main_org, feature_category: :value_stream_management do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :subscription_user_add_on_assignments,
           column_name: :id,
           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20250903105632_queue_reset_duo_remote_flows_enabled_false_values_spec.rb b/spec/migrations/20250903105632_queue_reset_duo_remote_flows_enabled_false_values_spec.rb
index 649fe0f3961858..02b639a454318b 100644
--- a/spec/migrations/20250903105632_queue_reset_duo_remote_flows_enabled_false_values_spec.rb
+++ b/spec/migrations/20250903105632_queue_reset_duo_remote_flows_enabled_false_values_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueResetDuoRemoteFlowsEnabledFalseValues, migration: :gitlab_main, feature_category: :duo_agent_platform do
+RSpec.describe QueueResetDuoRemoteFlowsEnabledFalseValues, migration: :gitlab_main_org, feature_category: :duo_agent_platform do
   let(:migration) { described_class.new }
 
   describe '#up' do
diff --git a/spec/migrations/20250903213220_queue_cleanup_terminated_bulk_import_configs_spec.rb b/spec/migrations/20250903213220_queue_cleanup_terminated_bulk_import_configs_spec.rb
index 5e50c2db16e526..87b079c6a1e18b 100644
--- a/spec/migrations/20250903213220_queue_cleanup_terminated_bulk_import_configs_spec.rb
+++ b/spec/migrations/20250903213220_queue_cleanup_terminated_bulk_import_configs_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueCleanupTerminatedBulkImportConfigs, migration: :gitlab_main, feature_category: :importers do
+RSpec.describe QueueCleanupTerminatedBulkImportConfigs, migration: :gitlab_main_org, feature_category: :importers do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
diff --git a/spec/migrations/20250905085632_queue_recalculate_two_factor_enforcement_on_users_spec.rb b/spec/migrations/20250905085632_queue_recalculate_two_factor_enforcement_on_users_spec.rb
index f26d3847a026d0..aca6a2f1d8838a 100644
--- a/spec/migrations/20250905085632_queue_recalculate_two_factor_enforcement_on_users_spec.rb
+++ b/spec/migrations/20250905085632_queue_recalculate_two_factor_enforcement_on_users_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueRecalculateTwoFactorEnforcementOnUsers, migration: :gitlab_main, feature_category: :system_access do
+RSpec.describe QueueRecalculateTwoFactorEnforcementOnUsers, migration: :gitlab_main_org, feature_category: :system_access do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :users,
           column_name: :id,
           batch_size: described_class::BATCH_SIZE,
diff --git a/spec/migrations/20250905203101_queue_backfill_group_id_and_user_type_for_nonhuman_access_tokens_spec.rb b/spec/migrations/20250905203101_queue_backfill_group_id_and_user_type_for_nonhuman_access_tokens_spec.rb
index 8d91098183bdcf..10dac366c63787 100644
--- a/spec/migrations/20250905203101_queue_backfill_group_id_and_user_type_for_nonhuman_access_tokens_spec.rb
+++ b/spec/migrations/20250905203101_queue_backfill_group_id_and_user_type_for_nonhuman_access_tokens_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueBackfillGroupIdAndUserTypeForNonhumanAccessTokens, migration: :gitlab_main, feature_category: :system_access do
+RSpec.describe QueueBackfillGroupIdAndUserTypeForNonhumanAccessTokens, migration: :gitlab_main_org, feature_category: :system_access do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :personal_access_tokens,
           column_name: :id,
           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20250918155823_queue_backfill_group_id_and_user_type_for_human_users_personal_access_tokens_spec.rb b/spec/migrations/20250918155823_queue_backfill_group_id_and_user_type_for_human_users_personal_access_tokens_spec.rb
index 22c1f1ede840bd..d300347519bf8e 100644
--- a/spec/migrations/20250918155823_queue_backfill_group_id_and_user_type_for_human_users_personal_access_tokens_spec.rb
+++ b/spec/migrations/20250918155823_queue_backfill_group_id_and_user_type_for_human_users_personal_access_tokens_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe RequeueBackfillGroupIdAndUserTypeForHumanUsersPersonalAccessTokens, migration: :gitlab_main, feature_category: :system_access do # rubocop:disable RSpec/SpecFilePathFormat -- 20250918155823_requeue_backfill_group_id_and_user_type_for_human_users_personal_access_tokens_spec.rb is too long
+RSpec.describe RequeueBackfillGroupIdAndUserTypeForHumanUsersPersonalAccessTokens, migration: :gitlab_main_org, feature_category: :system_access do # rubocop:disable RSpec/SpecFilePathFormat -- 20250918155823_requeue_backfill_group_id_and_user_type_for_human_users_personal_access_tokens_spec.rb is too long
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
@@ -14,7 +14,7 @@
 
       migration.after -> {
         expect(batched_migration).to have_scheduled_batched_migration(
-          gitlab_schema: :gitlab_main,
+          gitlab_schema: :gitlab_main_org,
           table_name: :personal_access_tokens,
           column_name: :id,
           interval: described_class::DELAY_INTERVAL,
diff --git a/spec/migrations/20250923000001_create_namespace_isolations_spec.rb b/spec/migrations/20250923000001_create_namespace_isolations_spec.rb
index 0ab65d99812772..4ad691b83d2a40 100644
--- a/spec/migrations/20250923000001_create_namespace_isolations_spec.rb
+++ b/spec/migrations/20250923000001_create_namespace_isolations_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe CreateNamespaceIsolations, migration: :gitlab_main, feature_category: :organization do
+RSpec.describe CreateNamespaceIsolations, migration: :gitlab_main_org, feature_category: :organization do
   let(:migration) { described_class.new }
   let(:namespace_isolations) { table(:namespace_isolations) }
 
diff --git a/spec/migrations/20250923000002_create_organization_isolations_spec.rb b/spec/migrations/20250923000002_create_organization_isolations_spec.rb
index 27345b4f140b42..72613c92e0bf38 100644
--- a/spec/migrations/20250923000002_create_organization_isolations_spec.rb
+++ b/spec/migrations/20250923000002_create_organization_isolations_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe CreateOrganizationIsolations, migration: :gitlab_main, feature_category: :organization do
+RSpec.describe CreateOrganizationIsolations, migration: :gitlab_main_org, feature_category: :organization do
   let(:migration) { described_class.new }
   let(:organization_isolations) { table(:organization_isolations) }
 
diff --git a/spec/migrations/20251002061931_backfill_partitioned_project_daily_statistics_spec.rb b/spec/migrations/20251002061931_backfill_partitioned_project_daily_statistics_spec.rb
index ed8b42d89ab4e5..457921701fd5d7 100644
--- a/spec/migrations/20251002061931_backfill_partitioned_project_daily_statistics_spec.rb
+++ b/spec/migrations/20251002061931_backfill_partitioned_project_daily_statistics_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe BackfillPartitionedProjectDailyStatistics, migration: :gitlab_main, feature_category: :source_code_management do
+RSpec.describe BackfillPartitionedProjectDailyStatistics, migration: :gitlab_main_org, feature_category: :source_code_management do
   let(:migration) { described_class.new }
   let(:connection) { migration.connection }
   let(:organization) { table(:organizations).create!(name: 'organization', path: 'organization') }
diff --git a/spec/migrations/db/migrate/20240806100120_remove_records_without_project_from_project_saved_replies_table_spec.rb b/spec/migrations/db/migrate/20240806100120_remove_records_without_project_from_project_saved_replies_table_spec.rb
index 58140797046dad..45a57b0522bcc9 100644
--- a/spec/migrations/db/migrate/20240806100120_remove_records_without_project_from_project_saved_replies_table_spec.rb
+++ b/spec/migrations/db/migrate/20240806100120_remove_records_without_project_from_project_saved_replies_table_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe RemoveRecordsWithoutProjectFromProjectSavedRepliesTable, feature_category: :code_review_workflow, migration: :gitlab_main, schema: 20240802194749 do
+RSpec.describe RemoveRecordsWithoutProjectFromProjectSavedRepliesTable, feature_category: :code_review_workflow, migration: :gitlab_main_org, schema: 20240802194749 do
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }
   let(:project_saved_replies) { table(:project_saved_replies) }
diff --git a/spec/migrations/db/migrate/20250414125030_update_application_setting_default_scan_execution_policies_action_limit_spec.rb b/spec/migrations/db/migrate/20250414125030_update_application_setting_default_scan_execution_policies_action_limit_spec.rb
index 159de0fba26edc..5b3de4db861f9e 100644
--- a/spec/migrations/db/migrate/20250414125030_update_application_setting_default_scan_execution_policies_action_limit_spec.rb
+++ b/spec/migrations/db/migrate/20250414125030_update_application_setting_default_scan_execution_policies_action_limit_spec.rb
@@ -5,7 +5,7 @@
 
 RSpec.describe UpdateApplicationSettingDefaultScanExecutionPoliciesActionLimit, '#up',
   feature_category: :security_policy_management,
-  migration: :gitlab_main do
+  migration: :gitlab_main_org do
   let(:connection) { ApplicationRecord.connection }
 
   context 'without application setting' do
diff --git a/spec/migrations/db/migrate/20250507102834_create_trigger_on_project_authorizations_spec.rb b/spec/migrations/db/migrate/20250507102834_create_trigger_on_project_authorizations_spec.rb
index fde45423b9abba..c68566c70da58c 100644
--- a/spec/migrations/db/migrate/20250507102834_create_trigger_on_project_authorizations_spec.rb
+++ b/spec/migrations/db/migrate/20250507102834_create_trigger_on_project_authorizations_spec.rb
@@ -5,7 +5,7 @@
 
 RSpec.describe CreateTriggerOnProjectAuthorizations, 'write duplication',
   feature_category: :permissions,
-  migration: :gitlab_main do
+  migration: :gitlab_main_org do
   let(:src_table) { table(:project_authorizations) }
   let(:dest_table) { table(:project_authorizations_for_migration) }
 
diff --git a/spec/migrations/db/post_migrate/20240815172551_remove_visual_review_bot_spec.rb b/spec/migrations/db/post_migrate/20240815172551_remove_visual_review_bot_spec.rb
index 6dcd6ff85cba86..c5e88ab1e35825 100644
--- a/spec/migrations/db/post_migrate/20240815172551_remove_visual_review_bot_spec.rb
+++ b/spec/migrations/db/post_migrate/20240815172551_remove_visual_review_bot_spec.rb
@@ -4,7 +4,7 @@
 require_migration!
 
 RSpec.describe RemoveVisualReviewBot,
-  migration: :gitlab_main, feature_category: :user_profile do
+  migration: :gitlab_main_org, feature_category: :user_profile do
   let(:migration) { described_class.new }
   let(:ghost_user_migrations_table) { table(:ghost_user_migrations) }
   let(:users_table) { table(:users) }
diff --git a/spec/migrations/db/post_migrate/20240820085247_backfill_catalog_resource_versions_published_by_id_spec.rb b/spec/migrations/db/post_migrate/20240820085247_backfill_catalog_resource_versions_published_by_id_spec.rb
index ad1261dd168e83..9d7ede4d6a2b9f 100644
--- a/spec/migrations/db/post_migrate/20240820085247_backfill_catalog_resource_versions_published_by_id_spec.rb
+++ b/spec/migrations/db/post_migrate/20240820085247_backfill_catalog_resource_versions_published_by_id_spec.rb
@@ -4,7 +4,7 @@
 require_migration!
 
 RSpec.describe BackfillCatalogResourceVersionsPublishedById,
-  migration: :gitlab_main,
+  migration: :gitlab_main_org,
   feature_category: :pipeline_composition do
   let(:catalog_resource_versions) { table(:catalog_resource_versions) }
   let(:releases) { table(:releases) }
diff --git a/spec/migrations/db/post_migrate/20240906133040_fix_non_nullable_snippets_spec.rb b/spec/migrations/db/post_migrate/20240906133040_fix_non_nullable_snippets_spec.rb
index 3d8212714d25e6..7ce42e26dab1e6 100644
--- a/spec/migrations/db/post_migrate/20240906133040_fix_non_nullable_snippets_spec.rb
+++ b/spec/migrations/db/post_migrate/20240906133040_fix_non_nullable_snippets_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe FixNonNullableSnippets, migration: :gitlab_main, feature_category: :source_code_management do
+RSpec.describe FixNonNullableSnippets, migration: :gitlab_main_org, feature_category: :source_code_management do
   let(:migration) { described_class.new }
   let(:snippets) { table(:snippets) }
   let(:projects) { table(:projects) }
diff --git a/spec/migrations/db/post_migrate/20240923090549_fix_inconsistent_organization_id_spec.rb b/spec/migrations/db/post_migrate/20240923090549_fix_inconsistent_organization_id_spec.rb
index 92758071b61e8b..c833c01b19e365 100644
--- a/spec/migrations/db/post_migrate/20240923090549_fix_inconsistent_organization_id_spec.rb
+++ b/spec/migrations/db/post_migrate/20240923090549_fix_inconsistent_organization_id_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe FixInconsistentOrganizationId, migration: :gitlab_main, feature_category: :organization do
+RSpec.describe FixInconsistentOrganizationId, migration: :gitlab_main_org, feature_category: :organization do
   let(:organization_2) { table(:organizations).create!(path: 'organization_2') }
   let(:organization_3) { table(:organizations).create!(path: 'organization_3') }
   let(:organization_4) { table(:organizations).create!(path: 'organization_4') }
diff --git a/spec/migrations/db/post_migrate/20241030125718_update_namespaces_organization_id_spec.rb b/spec/migrations/db/post_migrate/20241030125718_update_namespaces_organization_id_spec.rb
index bb948b82b40a1e..c0f224f7a0307a 100644
--- a/spec/migrations/db/post_migrate/20241030125718_update_namespaces_organization_id_spec.rb
+++ b/spec/migrations/db/post_migrate/20241030125718_update_namespaces_organization_id_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe UpdateNamespacesOrganizationId, migration: :gitlab_main, feature_category: :organization do
+RSpec.describe UpdateNamespacesOrganizationId, migration: :gitlab_main_org, feature_category: :organization do
   let(:namespaces) { table(:namespaces) }
 
   let!(:group_with_organization) { namespaces.create!(name: 'my_org', path: 'my-org-1', organization_id: 10) }
diff --git a/spec/migrations/db/post_migrate/20241103164158_migrate_software_license_without_spdx_identifier_to_custom_licenses_table_spec.rb b/spec/migrations/db/post_migrate/20241103164158_migrate_software_license_without_spdx_identifier_to_custom_licenses_table_spec.rb
index 3b19a150b49948..c3aa2d8dee1f1c 100644
--- a/spec/migrations/db/post_migrate/20241103164158_migrate_software_license_without_spdx_identifier_to_custom_licenses_table_spec.rb
+++ b/spec/migrations/db/post_migrate/20241103164158_migrate_software_license_without_spdx_identifier_to_custom_licenses_table_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe MigrateSoftwareLicenseWithoutSpdxIdentifierToCustomLicensesTable, migration: :gitlab_main, feature_category: :security_policy_management do
+RSpec.describe MigrateSoftwareLicenseWithoutSpdxIdentifierToCustomLicensesTable, migration: :gitlab_main_org, feature_category: :security_policy_management do
   let(:software_licenses_table) { table(:software_licenses) }
   let(:custom_software_licenses_table) { table(:custom_software_licenses) }
   let(:software_license_policies_table) { table(:software_license_policies) }
diff --git a/spec/migrations/db/post_migrate/20241127210044_backfill_user_details_spec.rb b/spec/migrations/db/post_migrate/20241127210044_backfill_user_details_spec.rb
index 8ad6bb4136fd33..390479fdb149e3 100644
--- a/spec/migrations/db/post_migrate/20241127210044_backfill_user_details_spec.rb
+++ b/spec/migrations/db/post_migrate/20241127210044_backfill_user_details_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe BackfillUserDetails, migration: :gitlab_main, feature_category: :acquisition, migration_version: 20241127210044 do
+RSpec.describe BackfillUserDetails, migration: :gitlab_main_org, feature_category: :acquisition, migration_version: 20241127210044 do
   let(:connection) { ActiveRecord::Base.connection }
   let(:users) { table(:users) }
   let(:user_details) { table(:user_details) }
diff --git a/spec/migrations/db/post_migrate/20241128114137_set_organization_id_for_bulk_import_entities_spec.rb b/spec/migrations/db/post_migrate/20241128114137_set_organization_id_for_bulk_import_entities_spec.rb
index f8d8700483d25d..fa8d76d608046e 100644
--- a/spec/migrations/db/post_migrate/20241128114137_set_organization_id_for_bulk_import_entities_spec.rb
+++ b/spec/migrations/db/post_migrate/20241128114137_set_organization_id_for_bulk_import_entities_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe SetOrganizationIdForBulkImportEntities, migration: :gitlab_main, feature_category: :importers do
+RSpec.describe SetOrganizationIdForBulkImportEntities, migration: :gitlab_main_org, feature_category: :importers do
   let(:migration) { described_class.new }
 
   let(:bulk_import_entities) { table(:bulk_import_entities) }
diff --git a/spec/migrations/db/post_migrate/20241217183436_update_import_failures_organization_id_spec.rb b/spec/migrations/db/post_migrate/20241217183436_update_import_failures_organization_id_spec.rb
index 140f8a98d3a864..d08f2da69eec3e 100644
--- a/spec/migrations/db/post_migrate/20241217183436_update_import_failures_organization_id_spec.rb
+++ b/spec/migrations/db/post_migrate/20241217183436_update_import_failures_organization_id_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe UpdateImportFailuresOrganizationId, migration: :gitlab_main, feature_category: :organization do
+RSpec.describe UpdateImportFailuresOrganizationId, migration: :gitlab_main_org, feature_category: :organization do
   let(:import_failures) { table(:import_failures) }
   let(:projects) { table(:projects) }
   let(:organizations) { table(:organizations) }
diff --git a/spec/migrations/db/post_migrate/20250314113948_remove_replicas_with_evicted_indices_spec.rb b/spec/migrations/db/post_migrate/20250314113948_remove_replicas_with_evicted_indices_spec.rb
index b2df5dc50c4aa1..4da6710a8945f6 100644
--- a/spec/migrations/db/post_migrate/20250314113948_remove_replicas_with_evicted_indices_spec.rb
+++ b/spec/migrations/db/post_migrate/20250314113948_remove_replicas_with_evicted_indices_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe RemoveReplicasWithEvictedIndices, migration: :gitlab_main, feature_category: :global_search do
+RSpec.describe RemoveReplicasWithEvictedIndices, migration: :gitlab_main_org, feature_category: :global_search do
   let(:zoekt_nodes) { table(:zoekt_nodes) }
   let(:zoekt_node) { zoekt_nodes.create!(uuid: SecureRandom.uuid, index_base_url: 'i_url', search_base_url: 's_url') }
   let(:organizations) { table(:organizations) }
diff --git a/spec/migrations/db/post_migrate/20250320143527_set_organization_id_for_bulk_imports_spec.rb b/spec/migrations/db/post_migrate/20250320143527_set_organization_id_for_bulk_imports_spec.rb
index faf1bc61edc065..17cbaef192729e 100644
--- a/spec/migrations/db/post_migrate/20250320143527_set_organization_id_for_bulk_imports_spec.rb
+++ b/spec/migrations/db/post_migrate/20250320143527_set_organization_id_for_bulk_imports_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe SetOrganizationIdForBulkImports, migration: :gitlab_main, feature_category: :importers do
+RSpec.describe SetOrganizationIdForBulkImports, migration: :gitlab_main_org, feature_category: :importers do
   let(:migration) { described_class.new }
 
   let(:bulk_imports) { table(:bulk_imports) }
diff --git a/spec/migrations/db/post_migrate/20250422093734_outdate_namespace_descendants_cache_spec.rb b/spec/migrations/db/post_migrate/20250422093734_outdate_namespace_descendants_cache_spec.rb
index 4ca08d60c47cbd..8fab5b1f61c12b 100644
--- a/spec/migrations/db/post_migrate/20250422093734_outdate_namespace_descendants_cache_spec.rb
+++ b/spec/migrations/db/post_migrate/20250422093734_outdate_namespace_descendants_cache_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe OutdateNamespaceDescendantsCache, migration: :gitlab_main, feature_category: :database do
+RSpec.describe OutdateNamespaceDescendantsCache, migration: :gitlab_main_org, feature_category: :database do
   let(:migration) { described_class.new }
 
   let(:namespace_descendants) { table(:namespace_descendants) }
diff --git a/spec/migrations/db/post_migrate/20250527064756_migrate_asset_proxy_secret_key_to_new_encryption_framework_spec.rb b/spec/migrations/db/post_migrate/20250527064756_migrate_asset_proxy_secret_key_to_new_encryption_framework_spec.rb
index 6073a054b475b1..3f7a448b54b67f 100644
--- a/spec/migrations/db/post_migrate/20250527064756_migrate_asset_proxy_secret_key_to_new_encryption_framework_spec.rb
+++ b/spec/migrations/db/post_migrate/20250527064756_migrate_asset_proxy_secret_key_to_new_encryption_framework_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe MigrateAssetProxySecretKeyToNewEncryptionFramework, migration: :gitlab_main, feature_category: :cell do
+RSpec.describe MigrateAssetProxySecretKeyToNewEncryptionFramework, migration: :gitlab_main_org, feature_category: :cell do
   let(:table_name) { :application_settings }
   let(:batch_column) { :id }
   let(:sub_batch_size) { 1 }
diff --git a/spec/migrations/db/post_migrate/20250617092550_expire_namespace_descendants_cache_spec.rb b/spec/migrations/db/post_migrate/20250617092550_expire_namespace_descendants_cache_spec.rb
index e78b457777d9cd..4616f98d415dc9 100644
--- a/spec/migrations/db/post_migrate/20250617092550_expire_namespace_descendants_cache_spec.rb
+++ b/spec/migrations/db/post_migrate/20250617092550_expire_namespace_descendants_cache_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe ExpireNamespaceDescendantsCache, migration: :gitlab_main, feature_category: :database do
+RSpec.describe ExpireNamespaceDescendantsCache, migration: :gitlab_main_org, feature_category: :database do
   let(:migration) { described_class.new }
 
   let(:namespace_descendants) { table(:namespace_descendants) }
diff --git a/spec/migrations/db/post_migrate/20250721096253_migrate_ai_duo_chat_events_to_ai_usage_events_spec.rb b/spec/migrations/db/post_migrate/20250721096253_migrate_ai_duo_chat_events_to_ai_usage_events_spec.rb
index 85ef3ea9afa96c..2aa151d06f5775 100644
--- a/spec/migrations/db/post_migrate/20250721096253_migrate_ai_duo_chat_events_to_ai_usage_events_spec.rb
+++ b/spec/migrations/db/post_migrate/20250721096253_migrate_ai_duo_chat_events_to_ai_usage_events_spec.rb
@@ -4,7 +4,7 @@
 require_migration!
 
 # rubocop: disable Migration/Datetime -- wrong offense detection for the timestamp attribute
-RSpec.describe MigrateAiDuoChatEventsToAiUsageEvents, migration: :gitlab_main, feature_category: :value_stream_management, migration_version: 20250721095854 do
+RSpec.describe MigrateAiDuoChatEventsToAiUsageEvents, migration: :gitlab_main_org, feature_category: :value_stream_management, migration_version: 20250721095854 do
   let(:migration) { described_class.new }
   let(:users) { table(:users) }
   let(:namespaces) { table(:namespaces) }
diff --git a/spec/migrations/db/post_migrate/20250721098621_migrate_ai_troubleshoot_job_events_to_ai_usage_events_spec.rb b/spec/migrations/db/post_migrate/20250721098621_migrate_ai_troubleshoot_job_events_to_ai_usage_events_spec.rb
index ebcff3111c508c..e282abc0a46f84 100644
--- a/spec/migrations/db/post_migrate/20250721098621_migrate_ai_troubleshoot_job_events_to_ai_usage_events_spec.rb
+++ b/spec/migrations/db/post_migrate/20250721098621_migrate_ai_troubleshoot_job_events_to_ai_usage_events_spec.rb
@@ -4,7 +4,7 @@
 require_migration!
 
 # rubocop: disable Migration/Datetime -- wrong offense detection for the timestamp attribute
-RSpec.describe MigrateAiTroubleshootJobEventsToAiUsageEvents, migration: :gitlab_main, feature_category: :value_stream_management, migration_version: 20250721095854 do
+RSpec.describe MigrateAiTroubleshootJobEventsToAiUsageEvents, migration: :gitlab_main_org, feature_category: :value_stream_management, migration_version: 20250721095854 do
   let(:migration) { described_class.new }
   let(:users) { table(:users) }
   let(:namespaces) { table(:namespaces) }
diff --git a/spec/migrations/queue_backfill_partitioned_uploads_spec.rb b/spec/migrations/queue_backfill_partitioned_uploads_spec.rb
index 5b916d76a7422a..e268ce2c14f60c 100644
--- a/spec/migrations/queue_backfill_partitioned_uploads_spec.rb
+++ b/spec/migrations/queue_backfill_partitioned_uploads_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueBackfillPartitionedUploads, migration: :gitlab_main, feature_category: :database do
+RSpec.describe QueueBackfillPartitionedUploads, migration: :gitlab_main_org, feature_category: :database do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
diff --git a/spec/migrations/queue_reset_auto_duo_code_review_false_values_spec.rb b/spec/migrations/queue_reset_auto_duo_code_review_false_values_spec.rb
index e3cd799ca66b48..9228c327472278 100644
--- a/spec/migrations/queue_reset_auto_duo_code_review_false_values_spec.rb
+++ b/spec/migrations/queue_reset_auto_duo_code_review_false_values_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueResetAutoDuoCodeReviewFalseValues, migration: :gitlab_main, feature_category: :code_review_workflow do
+RSpec.describe QueueResetAutoDuoCodeReviewFalseValues, migration: :gitlab_main_org, feature_category: :code_review_workflow do
   let(:migration) { described_class.new }
 
   describe '#up' do
-- 
GitLab