bring services inline with cm