Handle yaml files updates

Change-Id: I3ab4bc8eae5a29a39f0bbef862d84bee0e4fe6a5