diff --git a/app/models/ci/build_metadata.rb b/app/models/ci/build_metadata.rb
index 4c723bb7c0cd6074c02ca4b3fc22a3e7dd3ccd48..4b2be446fe351b347e980aee4c8cbafa2ff76f7a 100644
--- a/app/models/ci/build_metadata.rb
+++ b/app/models/ci/build_metadata.rb
@@ -10,12 +10,15 @@ class BuildMetadata < Ci::ApplicationRecord
     include Presentable
     include ChronicDurationAttribute
     include Gitlab::Utils::StrongMemoize
+    include IgnorableColumns
 
     self.table_name = 'p_ci_builds_metadata'
     self.primary_key = 'id'
 
     partitionable scope: :build
 
+    ignore_column :runner_machine_id, remove_with: '16.0', remove_after: '2023-04-22'
+
     belongs_to :build, class_name: 'CommitStatus'
     belongs_to :project