diff --git a/db/docs/batched_background_migrations/backfill_organization_id_on_ci_runner_taggings.yml b/db/docs/batched_background_migrations/backfill_organization_id_on_ci_runner_taggings.yml
index 7e8b57f01d211523d102dd3e6b6e91ce4578c6e9..32233273963437ff53eabccb38ba3c6896518ff6 100644
--- a/db/docs/batched_background_migrations/backfill_organization_id_on_ci_runner_taggings.yml
+++ b/db/docs/batched_background_migrations/backfill_organization_id_on_ci_runner_taggings.yml
@@ -1,9 +1,11 @@
 ---
 migration_job_name: BackfillOrganizationIdOnCiRunnerTaggings
-description: >
-  Backfill organization_id column in taggings associated with non-instance type runners with default organization id
+description: 'Backfill organization_id column in taggings associated with 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: 20250602183875
-finalized_by: # version of the migration that finalized this BBM
+finalized_by: '20250717233215'
diff --git a/db/post_migrate/20250717233215_finalize_hk_backfill_organization_id_on_ci_runner_taggings.rb b/db/post_migrate/20250717233215_finalize_hk_backfill_organization_id_on_ci_runner_taggings.rb
new file mode 100644
index 0000000000000000000000000000000000000000..b33fcec7ca299c85c0f3816903a3b592e8e11005
--- /dev/null
+++ b/db/post_migrate/20250717233215_finalize_hk_backfill_organization_id_on_ci_runner_taggings.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class FinalizeHkBackfillOrganizationIdOnCiRunnerTaggings < 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: 'BackfillOrganizationIdOnCiRunnerTaggings',
+      table_name: :ci_runner_taggings,
+      column_name: :id,
+      job_arguments: [],
+      finalize: true
+    )
+  end
+
+  def down; end
+end
diff --git a/db/schema_migrations/20250717233215 b/db/schema_migrations/20250717233215
new file mode 100644
index 0000000000000000000000000000000000000000..4aaf2ac01094077051e0ff468dd30b5f0a044594
--- /dev/null
+++ b/db/schema_migrations/20250717233215
@@ -0,0 +1 @@
+ed7ffd7443a68a6ed1acdc7bd12ecc6b2eb566c9a149e22c39e7e27d7138d876
\ No newline at end of file