Revert "Revert "update build config""

This reverts commit 575dd8fe29028f2cee09052dc06ff15a2aced00e.