SCAL-450: build refactor