improve build to support a ci property