Fix EZP-21963: create separate "promise-based" build
small fixes according to review