Improve deploy system SCF-6295