1 files changed, 5 insertions, 7 deletions
diff --git a/lib/api/ci/helpers/runner.rb b/lib/api/ci/helpers/runner.rb
index 738c5bb3789..4b1d9a25444 100644
--- a/lib/api/ci/helpers/runner.rb
+++ b/lib/api/ci/helpers/runner.rb
@@ -18,7 +18,7 @@ module API
 
           runner_details = get_runner_details_from_request
           current_runner.heartbeat(runner_details, update_contacted_at: update_contacted_at)
-          current_runner_machine&.heartbeat(runner_details, update_contacted_at: update_contacted_at)
+          current_runner_manager&.heartbeat(runner_details, update_contacted_at: update_contacted_at)
         end
 
         def get_runner_details_from_request
@@ -52,12 +52,10 @@ module API
           end
         end
 
-        def current_runner_machine
-          return if Feature.disabled?(:create_runner_machine)
-
-          strong_memoize(:current_runner_machine) do
+        def current_runner_manager
+          strong_memoize(:current_runner_manager) do
             system_xid = params.fetch(:system_id, LEGACY_SYSTEM_XID)
-            current_runner&.ensure_machine(system_xid) { |m| m.contacted_at = Time.current }
+            current_runner&.ensure_manager(system_xid) { |m| m.contacted_at = Time.current }
           end
         end
 
@@ -96,7 +94,7 @@ module API
           # the heartbeat should be triggered.
           if heartbeat_runner
             job.runner&.heartbeat(get_runner_ip)
-            job.runner_machine&.heartbeat(get_runner_ip) if Feature.enabled?(:runner_machine_heartbeat)
+            job.runner_manager&.heartbeat(get_runner_ip)
           end
 
           job