[CLC-1224] Update-build script fixes