Revert "Revert "update build config""

This reverts commit 79ef9856b0f663a560c6dadcedbd4a3b708aad49.