[task] Improve the make step