HAL-345: Improve deployment wizard