Granular deployment

Change-Id: Id2d51049a79095c1dd92599dd360218ee9926e69