Change strategy to one VDB per service, combined DS and VDB services