diff --git a/awx/main/models/unified_jobs.py b/awx/main/models/unified_jobs.py
index dd5ea06933..157b46a3bb 100644
--- a/awx/main/models/unified_jobs.py
+++ b/awx/main/models/unified_jobs.py
@@ -295,6 +295,10 @@ class UnifiedJobTemplate(PolymorphicModel, CommonModelNameNotUnique):
         kwargs.pop('%s_id' % parent_field_name, None)
         kwargs[parent_field_name] = self
         for field_name in self._get_unified_job_field_names():
+            if hasattr(self, '%s_id' % field_name) and field_name in kwargs:
+                kwargs['%s_id' % field_name] = kwargs[field_name]
+                kwargs.pop(field_name)
+                continue
             if field_name in kwargs:
                 continue
             # Foreign keys can be specified as field_name or field_name_id.