Disclosed are techniques for two-way synchronization of infrastructure-as-code templates and instances, including a method comprising detecting changes to a run-time state of a system and, in response to detecting a change, triggering an update of a current run-time state model. The method may further comprise, in response to updating the run-time state model, comparing the updated model to a current model using a template in a local repository instantiated as the current model. The method may further comprise, in response to the comparison determining a structural difference between the updated model and the current model, merging the updated model and the current model into a new model; and updating a local clone of a repository of the template with the new model. The method may further comprise, in response to the comparison determining no structural difference between the updated model and the current model, pushing changes to a remote repository.