diff --git a/db/docs/batched_background_migrations/backfill_organization_id_on_ci_runners.yml b/db/docs/batched_background_migrations/backfill_organization_id_on_ci_runners.yml
index 3dd8d5a048d6acc51c6a3be229107b7b26551b2a..6f50572aa910353b48571c8d50e92ce3b1de4150 100644
--- a/db/docs/batched_background_migrations/backfill_organization_id_on_ci_runners.yml
+++ b/db/docs/batched_background_migrations/backfill_organization_id_on_ci_runners.yml
@@ -1,9 +1,11 @@
 ---
 migration_job_name: BackfillOrganizationIdOnCiRunners
-description: >
-  Backfill organization_id column for non-instance type runners with default organization id
+description: 'Backfill organization_id column for non-instance type runners with default
+  organization id
+
+  '
 feature_category: runner
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/193195
 milestone: '18.2'
 queued_migration_version: 20250602183865
-finalized_by: # version of the migration that finalized this BBM
+finalized_by: '20250717233252'
diff --git a/db/post_migrate/20250717233252_finalize_hk_backfill_organization_id_on_ci_runners.rb b/db/post_migrate/20250717233252_finalize_hk_backfill_organization_id_on_ci_runners.rb
new file mode 100644
index 0000000000000000000000000000000000000000..e076cbe577735ca59c05a000499366000bcba398
--- /dev/null
+++ b/db/post_migrate/20250717233252_finalize_hk_backfill_organization_id_on_ci_runners.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class FinalizeHkBackfillOrganizationIdOnCiRunners < Gitlab::Database::Migration[2.3]
+  milestone '18.3'
+
+  disable_ddl_transaction!
+
+  restrict_gitlab_migration gitlab_schema: :gitlab_ci
+
+  def up
+    ensure_batched_background_migration_is_finished(
+      job_class_name: 'BackfillOrganizationIdOnCiRunners',
+      table_name: :ci_runners,
+      column_name: :id,
+      job_arguments: [],
+      finalize: true
+    )
+  end
+
+  def down; end
+end
diff --git a/db/schema_migrations/20250717233252 b/db/schema_migrations/20250717233252
new file mode 100644
index 0000000000000000000000000000000000000000..0e0e82b7f382170fa93c0c81bc6cac675dfe8a0c
--- /dev/null
+++ b/db/schema_migrations/20250717233252
@@ -0,0 +1 @@
+4345d85c5e0889e2a14820233a85384aebf7d5e0b31648d644052fbfe5fdc627
\ No newline at end of file