preparation for final services migration to new workspace concept