A method of enhancing an incomplete cloud infrastructure template may include receiving a template defining a cloud infrastructure stack associated with a customer account, wherein the template comprises at least one resource definition specifying a first cloud infrastructure resource. The method may further include performing a dependency check of the template. The method may further include identifying, in the resource definition, an unresolved reference to a second cloud infrastructure resource. The method may further include resolving the reference by producing, based on a plurality of templates associated with the customer account, a definition of the second cloud infrastructure resource. The method may further include modifying the template to include the definition of the second cloud infrastructure resource and causing the cloud infrastructure stack to be provisioned based on the template.