MANTA-17 Tweaking of assembly params