diff --git a/app/models/miq_retire_task.rb b/app/models/miq_retire_task.rb
index 5b044b09a5e..08d32270892 100644
--- a/app/models/miq_retire_task.rb
+++ b/app/models/miq_retire_task.rb
@@ -34,7 +34,7 @@ def deliver_to_automate(req_type = request_type, zone = nil)
         :tenant_id     => 1,
       }
 
-      args[:attrs].merge!(MiqAeEngine.create_automation_attributes(source.class.base_model.name => source))
+      MiqAeEngine::set_automation_attributes_from_objects(source, args[:attrs])
 
       zone ||= source.respond_to?(:my_zone) ? source.my_zone : MiqServer.my_zone
       MiqQueue.put(